Skip to content

T
TDLCloud
Commit a39f3b50 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

6.6--修改图片上传的bug，修改仓库的返回值说明

parent 4e5958fe
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 112 deletions
src/main/java/com/example/tdl/util/AliyunOSSClientUtil.java
View file @ a39f3b50
...@@ -249,9 +249,9 @@ public class AliyunOSSClientUtil { ...@@ -249,9 +249,9 @@ public class AliyunOSSClientUtil {
key = FOLDER1+key; key = FOLDER1+key;
}else if("company".equals(imageType)){ }else if("company".equals(imageType)){
key = FOLDER2+key; key = FOLDER2+key;
}else if("palte".equals(imageType)){ }else if("truck".equals(imageType)){
key = FOLDER3+key; key = FOLDER3+key;
}else if ("wareHouse".equals(imageType)){ }else if ("warehouse".equals(imageType)){
key = FOLDER4+key; key = FOLDER4+key;
}else if("circuit".equals(imageType)){ }else if("circuit".equals(imageType)){
key = FOLDER4+key; key = FOLDER4+key;
......
src/main/java/com/example/tdl/web/GatewayController.java
View file @ a39f3b50
...@@ -18,10 +18,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -18,10 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -460,4 +457,5 @@ public class GatewayController { ...@@ -460,4 +457,5 @@ public class GatewayController {
return gson.toJson(fb); return gson.toJson(fb);
} }
} }
src/main/java/com/example/tdl/web/PicUploadController.java
View file @ a39f3b50
...@@ -84,7 +84,7 @@ public class PicUploadController { ...@@ -84,7 +84,7 @@ public class PicUploadController {
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/userImage/" + url); fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/userImage/" + url);
}else if("company".equals(imageType)){ }else if("company".equals(imageType)){
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/companyLog/" + url); fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/companyLog/" + url);
}else if("palte".equals(imageType)){ }else if("truck".equals(imageType)){
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/palteImage/" + url); fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/palteImage/" + url);
}else if ("warehouse".equals(imageType)){ }else if ("warehouse".equals(imageType)){
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/wareHouseImage/" + url); fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/wareHouseImage/" + url);
...@@ -148,13 +148,12 @@ public class PicUploadController { ...@@ -148,13 +148,12 @@ public class PicUploadController {
// i = userService.updateImg(number,img); // i = userService.updateImg(number,img);
img = img +"userImage/" +url; img = img +"userImage/" +url;
}else if("company".equals(imageType)){ }else if("company".equals(imageType)){
// i = companyService.updateImg(number,img); i = companyService.updateImg(number,img);
img = img +"companyLog/" +url; img = img +"companyLog/" +url;
fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/companyLog/" + url); fb.setMessage("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/companyLog/" + url);
}else if("palte".equals(imageType)){ }else if("truck".equals(imageType)){
// i = carService.updateImg(number,img);
img = img +"palteImage/" +url; img = img +"palteImage/" +url;
i = carService.updateImg(img,number);
}else if ("warehouse".equals(imageType)) { }else if ("warehouse".equals(imageType)) {
img = img + "wareHouseImage/" + url; img = img + "wareHouseImage/" + url;
i = warehouseService.updateImg(number, img,System.currentTimeMillis()); i = warehouseService.updateImg(number, img,System.currentTimeMillis());
......
src/main/java/com/example/tdl/web/WarehouseController.java
View file @ a39f3b50
...@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import javax.print.attribute.standard.RequestingUserName; import javax.print.attribute.standard.RequestingUserName;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.awt.geom.AffineTransform;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -218,7 +219,7 @@ public class WarehouseController { ...@@ -218,7 +219,7 @@ public class WarehouseController {
for(int j = 0,len=list.size();j<len;j++){ for(int j = 0,len=list.size();j<len;j++){
if( StringUtils.isEmpty(list.get(i).getTdl())){ if( StringUtils.isEmpty(list.get(i).getTdl())){
simpleWarehouseVos.get(i).setTemp("~"); simpleWarehouseVos.get(i).setTemp("~");
simpleWarehouseVos.get(i).setTemp("~"); simpleWarehouseVos.get(i).setHumidity("~");
continue; continue;
} }
Long time = (System.currentTimeMillis()-10*60*1000)*1000000l; Long time = (System.currentTimeMillis()-10*60*1000)*1000000l;
...@@ -337,6 +338,32 @@ public class WarehouseController { ...@@ -337,6 +338,32 @@ public class WarehouseController {
return warehouseDetailVo; return warehouseDetailVo;
} }
//根据仓库获取用户
@ApiOperation(value="获取报警联系人",notes = "获取报警联系人，传值:仓库编号")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@PostMapping("/getAlarmContacts")
public Object getAlarmContacts(@RequestBody String warehouseNo ,HttpServletRequest request){
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(warehouseNo)){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(warehouseNo);
warehouseNo=(String)jsonObject.get("warehouseNo");
if(warehouseService.getWarehouseNo(warehouseNo) ==0){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb);
}
return warehouseService.getAlarmContacts(warehouseNo);
}
//获取某个仓库的网关 //获取某个仓库的网关
@ApiOperation(value="获取某个仓库的网关",notes = "获取某个仓库的网关，传值:warehouseNo:仓库编号，" + @ApiOperation(value="获取某个仓库的网关",notes = "获取某个仓库的网关，传值:warehouseNo:仓库编号，" +
" 返回值：[" + " 返回值：[" +
...@@ -354,14 +381,14 @@ public class WarehouseController { ...@@ -354,14 +381,14 @@ public class WarehouseController {
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(warehouseNo)){ if (StringUtils.isEmpty(warehouseNo)){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb); return gson.toJson(fb);
} }
JSONObject jsonObject= JSON.parseObject(warehouseNo); JSONObject jsonObject= JSON.parseObject(warehouseNo);
warehouseNo=(String)jsonObject.get("warehouseNo"); warehouseNo=(String)jsonObject.get("warehouseNo");
if(warehouseService.getWarehouseNo(warehouseNo) ==0){ if(warehouseService.getWarehouseNo(warehouseNo) ==0){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不存在"); fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb); return gson.toJson(fb);
} }
//获取网关编号 //获取网关编号
...@@ -397,13 +424,11 @@ public class WarehouseController { ...@@ -397,13 +424,11 @@ public class WarehouseController {
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
String warehouseNo = getWarehouseNo(); String warehouseNo = getWarehouseNo();
if(StringUtils.isEmpty(addWarehouseVo.getImg())){ if(StringUtils.isEmpty(addWarehouseVo.getImg())){
fb.setCode(0); addWarehouseVo.setImg("https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/wareHouseImage/1527562358242TM.jpg");
fb.setMessage("仓库图片不能为空");
return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseVo.getWarehouseName())){ if (StringUtils.isEmpty(addWarehouseVo.getWarehouseName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库名不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseVo.getCountry())){ if (StringUtils.isEmpty(addWarehouseVo.getCountry())){
...@@ -423,7 +448,7 @@ public class WarehouseController { ...@@ -423,7 +448,7 @@ public class WarehouseController {
} }
if (StringUtils.isEmpty(addWarehouseVo.getRegionName())) { if (StringUtils.isEmpty(addWarehouseVo.getRegionName())) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("区域不能为空"); fb.setMessage(i18n.getMessage(request,"regionName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseVo.getLat())){ if (StringUtils.isEmpty(addWarehouseVo.getLat())){
...@@ -448,69 +473,69 @@ public class WarehouseController { ...@@ -448,69 +473,69 @@ public class WarehouseController {
} }
if (StringUtils.isEmpty(addWarehouseVo.getProperty())){ if (StringUtils.isEmpty(addWarehouseVo.getProperty())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库属性不能为空"); fb.setMessage(i18n.getMessage(request,"property"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!"供应中心".equals(addWarehouseVo.getProperty())&&!"项目仓".equals(addWarehouseVo.getProperty())&& if (!"供应中心".equals(addWarehouseVo.getProperty())&&!"项目仓".equals(addWarehouseVo.getProperty())&&
!"中心仓".equals(addWarehouseVo.getProperty())&&!"X-dock".equals(addWarehouseVo.getProperty())){ !"中心仓".equals(addWarehouseVo.getProperty())&&!"X-dock".equals(addWarehouseVo.getProperty())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请输入正确的属性"); fb.setMessage(i18n.getMessage(request,"wrongProperty"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseVo.getType())){ if (StringUtils.isEmpty(addWarehouseVo.getType())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库类型不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!addWarehouseVo.getType().equals("平面仓")&&!addWarehouseVo.getType().equals("立体仓")){ if (!addWarehouseVo.getType().equals("平面仓")&&!addWarehouseVo.getType().equals("立体仓")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请输入正确的仓库类型"); fb.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseVo.getHardwareLevel())){ if (StringUtils.isEmpty(addWarehouseVo.getHardwareLevel())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("硬件等级不能为空"); fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!addWarehouseVo.getHardwareLevel().equals("好")&&!addWarehouseVo.getHardwareLevel().equals("一般")&& if (!addWarehouseVo.getHardwareLevel().equals("好")&&!addWarehouseVo.getHardwareLevel().equals("一般")&&
!addWarehouseVo.getHardwareLevel().equals("较差")&&!addWarehouseVo.getHardwareLevel().equals("极差")){ !addWarehouseVo.getHardwareLevel().equals("较差")&&!addWarehouseVo.getHardwareLevel().equals("极差")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请选择正确的硬件等级"); fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (addWarehouseVo.getAreaIndoor()==null){ if (addWarehouseVo.getAreaIndoor()==null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("室内平面面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaIndoor"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (addWarehouseVo.getAreaRack()==null){ if (addWarehouseVo.getAreaRack()==null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("货架面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaRack"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (addWarehouseVo.getAreaOutdoor()==null){ if (addWarehouseVo.getAreaOutdoor()==null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("室外面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaOutdoor"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (addWarehouseVo.getAreaPlanIndoor() == null){ if (addWarehouseVo.getAreaPlanIndoor() == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("实际室内总面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaPlanIndoor"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseVo.getOffice())){ if (StringUtils.isEmpty(addWarehouseVo.getOffice())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("办事处不能为空"); fb.setMessage(i18n.getMessage(request,"office"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (addWarehouseVo.getTimeZone()==null){ if (addWarehouseVo.getTimeZone()==null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("时区不能为空"); fb.setMessage(i18n.getMessage(request,"timeZone"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (warehouseService.getByWarehouseName(addWarehouseVo.getWarehouseName(),user.getCompanyName())!=null){ if (warehouseService.getByWarehouseName(addWarehouseVo.getWarehouseName(),user.getCompanyName())!=null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库名不能重复"); fb.setMessage(i18n.getMessage(request,"repeateWarehouseName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
Map<Object,Object> map=new HashMap<>(); Map<Object,Object> map=new HashMap<>();
...@@ -542,10 +567,10 @@ public class WarehouseController { ...@@ -542,10 +567,10 @@ public class WarehouseController {
msg.put("msg",map.get("msg")); msg.put("msg",map.get("msg"));
if(msg.get("msg").equals("添加仓库成功")){ if(msg.get("msg").equals("添加仓库成功")){
fb.setCode(1); fb.setCode(1);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"addWarehouseSuccess"));
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"addWarehouseFailure"));
} }
return gson.toJson(fb); return gson.toJson(fb);
...@@ -587,121 +612,121 @@ public class WarehouseController { ...@@ -587,121 +612,121 @@ public class WarehouseController {
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseNo())){ if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseNo())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("需要修改的仓库编号不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseName())){ if (StringUtils.isEmpty(updateWarehouseVo.getWarehouseName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库名不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getCountry())){ if (StringUtils.isEmpty(updateWarehouseVo.getCountry())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("国家不能为空"); fb.setMessage(i18n.getMessage(request,"country"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getCity())){ if (StringUtils.isEmpty(updateWarehouseVo.getCity())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("市不能为空"); fb.setMessage(i18n.getMessage(request,"city"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getAddressDetail())){ if (StringUtils.isEmpty(updateWarehouseVo.getAddressDetail())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("具体地址不能为空"); fb.setMessage(i18n.getMessage(request,"addressDetail"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getRegionName())){ if (StringUtils.isEmpty(updateWarehouseVo.getRegionName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("区域不能为空"); fb.setMessage(i18n.getMessage(request,"regionName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getLat())){ if (StringUtils.isEmpty(updateWarehouseVo.getLat())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("纬度不能为空"); fb.setMessage(i18n.getMessage(request,"lat"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getLng())){ if (StringUtils.isEmpty(updateWarehouseVo.getLng())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("经度不能为空"); fb.setMessage(i18n.getMessage(request,"lng"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(!updateWarehouseVo.getLat().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){ if(!updateWarehouseVo.getLat().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("纬度的范围为-90~90"); fb.setMessage(i18n.getMessage(request,"wrongLat"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(!updateWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) { if(!updateWarehouseVo.getLng().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("经度的范围为-180~180"); fb.setMessage(i18n.getMessage(request,"wrongLng"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getProperty())){ if (StringUtils.isEmpty(updateWarehouseVo.getProperty())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库属性不能为空"); fb.setMessage(i18n.getMessage(request,"property"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!updateWarehouseVo.getProperty().equals("供应中心")&&!updateWarehouseVo.getProperty().equals("项目仓")&& if (!updateWarehouseVo.getProperty().equals("供应中心")&&!updateWarehouseVo.getProperty().equals("项目仓")&&
!updateWarehouseVo.getProperty().equals("中心仓")&&!updateWarehouseVo.getProperty().equals("X-dock")){ !updateWarehouseVo.getProperty().equals("中心仓")&&!updateWarehouseVo.getProperty().equals("X-dock")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请输入正确的仓库属性"); fb.setMessage(i18n.getMessage(request,"wrongProperty"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getType())){ if (StringUtils.isEmpty(updateWarehouseVo.getType())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库类型不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!"平面仓".equals(updateWarehouseVo.getType())&&!"立体仓".equals(updateWarehouseVo.getType())){ if (!"平面仓".equals(updateWarehouseVo.getType())&&!"立体仓".equals(updateWarehouseVo.getType())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请输入正确的仓库仓库类型"); fb.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getHardwareLevel())){ if (StringUtils.isEmpty(updateWarehouseVo.getHardwareLevel())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("硬件等级不能为空"); fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!updateWarehouseVo.getHardwareLevel().equals("好")&&!updateWarehouseVo.getHardwareLevel().equals("一般")&& if (!updateWarehouseVo.getHardwareLevel().equals("好")&&!updateWarehouseVo.getHardwareLevel().equals("一般")&&
!updateWarehouseVo.getHardwareLevel().equals("较差")&&!updateWarehouseVo.getHardwareLevel().equals("极差")){ !updateWarehouseVo.getHardwareLevel().equals("较差")&&!updateWarehouseVo.getHardwareLevel().equals("极差")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请选择正确的硬件等级"); fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (updateWarehouseVo.getAreaIndoor() == null){ if (updateWarehouseVo.getAreaIndoor() == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("室内平面面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaIndoor"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (updateWarehouseVo.getAreaRack()== null){ if (updateWarehouseVo.getAreaRack()== null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("货架面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaRack"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (updateWarehouseVo.getAreaOutdoor()== null){ if (updateWarehouseVo.getAreaOutdoor()== null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("室外面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaOutdoor"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (updateWarehouseVo.getAreaPlanIndoor()== null){ if (updateWarehouseVo.getAreaPlanIndoor()== null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("实际室内总面积不能为空"); fb.setMessage(i18n.getMessage(request,"areaPlanIndoor"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateWarehouseVo.getOffice())){ if (StringUtils.isEmpty(updateWarehouseVo.getOffice())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("办事处不能为空"); fb.setMessage(i18n.getMessage(request,"office"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (updateWarehouseVo.getTimeZone()== null){ if (updateWarehouseVo.getTimeZone()== null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("时区不能为空"); fb.setMessage(i18n.getMessage(request,"timeZone"));
return gson.toJson(fb); return gson.toJson(fb);
} }
ResultWarehouseVo resultWarehouseVo=warehouseService.getByWarehouseName(updateWarehouseVo.getWarehouseName(),user.getCompanyName()); ResultWarehouseVo resultWarehouseVo=warehouseService.getByWarehouseName(updateWarehouseVo.getWarehouseName(),user.getCompanyName());
if (resultWarehouseVo!=null&&!resultWarehouseVo.getWarehouseNo().equals(updateWarehouseVo.getWarehouseNo())){ if (resultWarehouseVo!=null&&!resultWarehouseVo.getWarehouseNo().equals(updateWarehouseVo.getWarehouseNo())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("修改的仓库名已存在"); fb.setMessage(i18n.getMessage(request,"repeateWarehouseName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
Map<Object,Object> map=new HashMap<>(); Map<Object,Object> map=new HashMap<>();
...@@ -731,10 +756,10 @@ public class WarehouseController { ...@@ -731,10 +756,10 @@ public class WarehouseController {
msg.put("msg",map.get("msg")); msg.put("msg",map.get("msg"));
if(msg.get("msg").equals("修改仓库成功")){ if(msg.get("msg").equals("修改仓库成功")){
fb.setCode(1); fb.setCode(1);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"modifiedWarehouseSuccess"));
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"modifiedWarehouseFailure"));
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
...@@ -751,14 +776,14 @@ public class WarehouseController { ...@@ -751,14 +776,14 @@ public class WarehouseController {
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(warehouseNo)){ if (StringUtils.isEmpty(warehouseNo)){
fb.setCode(0); fb.setCode(0);
fb.setMessage("需要删除的仓库编号不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb); return gson.toJson(fb);
} }
JSONObject jsonObject= JSON.parseObject(warehouseNo); JSONObject jsonObject= JSON.parseObject(warehouseNo);
warehouseNo=(String)jsonObject.get("warehouseNo"); warehouseNo=(String)jsonObject.get("warehouseNo");
if(warehouseService.getWarehouseNo(warehouseNo) ==0){ if(warehouseService.getWarehouseNo(warehouseNo) ==0){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不存在"); fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb); return gson.toJson(fb);
} }
Map<Object,Object> map=new HashMap<>(); Map<Object,Object> map=new HashMap<>();
...@@ -770,14 +795,16 @@ public class WarehouseController { ...@@ -770,14 +795,16 @@ public class WarehouseController {
msg.put("msg",map.get("msg")); msg.put("msg",map.get("msg"));
if(msg.get("msg").equals("仓库删除成功")){ if(msg.get("msg").equals("仓库删除成功")){
fb.setCode(1); fb.setCode(1);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"deleteWarehouseSuccess"));
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"deleteWarehouseFailure"));
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
@ApiOperation(value="添加网关",notes = "添加网关，传值:" + @ApiOperation(value="添加网关",notes = "添加网关，传值:" +
"warehouseNo:仓库编号" + "warehouseNo:仓库编号" +
"SN:网关编号") "SN:网关编号")
...@@ -791,22 +818,22 @@ public class WarehouseController { ...@@ -791,22 +818,22 @@ public class WarehouseController {
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(addWarehouseGatewayVo.getWarehouseNo())){ if (StringUtils.isEmpty(addWarehouseGatewayVo.getWarehouseNo())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(warehouseService.getWarehouseNo(addWarehouseGatewayVo.getWarehouseNo()) ==0){ if(warehouseService.getWarehouseNo(addWarehouseGatewayVo.getWarehouseNo()) ==0){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不存在"); fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addWarehouseGatewayVo.getSN())){ if (StringUtils.isEmpty(addWarehouseGatewayVo.getSN())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("网关编号不能为空"); fb.setMessage(i18n.getMessage(request,"gatewaySN"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if( gatewayService.getBySN(addWarehouseGatewayVo.getSN(),user.getCompanyNo())==null){ if( gatewayService.getBySN(addWarehouseGatewayVo.getSN(),user.getCompanyNo())==null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("该网关不存在"); fb.setMessage(i18n.getMessage(request,"existGateway"));
return gson.toJson(fb); return gson.toJson(fb);
} }
//判断当前网关是否已经被使用 //判断当前网关是否已经被使用
...@@ -820,14 +847,15 @@ public class WarehouseController { ...@@ -820,14 +847,15 @@ public class WarehouseController {
msg.put("msg",map.get("msg")); msg.put("msg",map.get("msg"));
if(msg.get("msg").equals("添加网关成功")){ if(msg.get("msg").equals("添加网关成功")){
fb.setCode(1); fb.setCode(1);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"bindingGatewaySuccess"));
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"bindingGatewayFailure"));
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
//绑定报警联系人 //绑定报警联系人
@ApiOperation(value="绑定报警联系人",notes = "绑定报警联系人，传值:" + @ApiOperation(value="绑定报警联系人",notes = "绑定报警联系人，传值:" +
"warehouseNo:仓库编号" + "warehouseNo:仓库编号" +
...@@ -842,24 +870,24 @@ public class WarehouseController { ...@@ -842,24 +870,24 @@ public class WarehouseController {
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(warehouseUserVo.getWarehouseNo())){ if (StringUtils.isEmpty(warehouseUserVo.getWarehouseNo())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(warehouseService.getWarehouseNo(warehouseUserVo.getWarehouseNo()) ==0){ if(warehouseService.getWarehouseNo(warehouseUserVo.getWarehouseNo()) ==0){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不存在"); fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (warehouseUserVo.getUserNameList().size() == 0){ if (warehouseUserVo.getUserNameList().size() == 0){
fb.setCode(0); fb.setCode(0);
fb.setMessage("用户不能为空"); fb.setMessage(i18n.getMessage(request,"userName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
String userNameVar = ""; String userNameVar = "";
for(int i = 0,length=warehouseUserVo.getUserNameList().size();i<length;i++){ for(int i = 0,length=warehouseUserVo.getUserNameList().size();i<length;i++){
if(userService.getByUserName(warehouseUserVo.getUserNameList().get(i).getUserName()) == null){ if(userService.getByUserName(warehouseUserVo.getUserNameList().get(i).getUserName()) == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("用户名不存在"); fb.setMessage(i18n.getMessage(request,"NonexistentUser"));
return gson.toJson(fb); return gson.toJson(fb);
} }
userNameVar = userNameVar +warehouseUserVo.getUserNameList().get(i).getUserName() +" "; userNameVar = userNameVar +warehouseUserVo.getUserNameList().get(i).getUserName() +" ";
...@@ -873,14 +901,15 @@ public class WarehouseController { ...@@ -873,14 +901,15 @@ public class WarehouseController {
msg.put("msg",map.get("msg")); msg.put("msg",map.get("msg"));
if(msg.get("msg").equals("添加紧急联系人成功")){ if(msg.get("msg").equals("添加紧急联系人成功")){
fb.setCode(1); fb.setCode(1);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"addAlarmContactsSuccess"));
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage(msg.get("msg").toString()); fb.setMessage(i18n.getMessage(request,"addAlarmContactsFailure"));
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
//根据仓库编号获取仓库实时数据 //根据仓库编号获取仓库实时数据
@ApiOperation(value = "根据仓库编号获取仓库信息",notes = "根据仓库编号获取仓库信息,传值说明：" + @ApiOperation(value = "根据仓库编号获取仓库信息",notes = "根据仓库编号获取仓库信息,传值说明：" +
" warehouseNo:仓库编号，" + " warehouseNo:仓库编号，" +
...@@ -960,6 +989,8 @@ public class WarehouseController { ...@@ -960,6 +989,8 @@ public class WarehouseController {
return warehouseGatewayDateVoList; return warehouseGatewayDateVoList;
} }
//货物仓库某一tdl的温湿度 //货物仓库某一tdl的温湿度
@ApiOperation(value="货物仓库某一tdl的温湿度",notes = "货物仓库某一tdl的温湿度，传值:" + @ApiOperation(value="货物仓库某一tdl的温湿度",notes = "货物仓库某一tdl的温湿度，传值:" +
" warehouseNo:仓库编号，" + " warehouseNo:仓库编号，" +
...@@ -994,23 +1025,23 @@ public class WarehouseController { ...@@ -994,23 +1025,23 @@ public class WarehouseController {
public Object getTdlData(@RequestBody SearchTdlVo searchTdlVo ,HttpServletRequest request){ public Object getTdlData(@RequestBody SearchTdlVo searchTdlVo ,HttpServletRequest request){
if (StringUtils.isEmpty(searchTdlVo.getWarehouseNo())){ if (StringUtils.isEmpty(searchTdlVo.getWarehouseNo())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不能为空"); fb.setMessage(i18n.getMessage(request,"warehouseNo"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(warehouseService.getWarehouseNo(searchTdlVo.getWarehouseNo()) ==0){ if(warehouseService.getWarehouseNo(searchTdlVo.getWarehouseNo()) ==0){
fb.setCode(0); fb.setCode(0);
fb.setMessage("仓库编号不存在"); fb.setMessage(i18n.getMessage(request,"Nonexistent"));
return gson.toJson(fb); return gson.toJson(fb);
} }
//判断网关和tdl是否存在 //判断网关和tdl是否存在
if (StringUtils.isEmpty(searchTdlVo.getSN())) { if (StringUtils.isEmpty(searchTdlVo.getSN())) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("网关编号不能为空"); fb.setMessage(i18n.getMessage(request,"gatewaySN"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(StringUtils.isEmpty(searchTdlVo.getTDLSN())) { if(StringUtils.isEmpty(searchTdlVo.getTDLSN())) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("传感器编号不能为空"); fb.setMessage(i18n.getMessage(request,"TDLSN"));
return gson.toJson(fb); return gson.toJson(fb);
} }
//获取tdl的信息 //获取tdl的信息
...@@ -1036,37 +1067,6 @@ public class WarehouseController { ...@@ -1036,37 +1067,6 @@ public class WarehouseController {
return tdlDataVo; return tdlDataVo;
} }
//根据仓库获取报警联系人
@ApiOperation(value="根据仓库获取报警联系人",notes = "根据仓库获取报警联系人，传值:仓库编号，" +
" 返回值说明：" +
" [" +
" {" +
" userName: 用户名" +
" }" +
" ]")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@PostMapping("/getAlarmContacts")
public Object getAlarmContacts(@RequestBody String warehouseNo ,HttpServletRequest request){
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (StringUtils.isEmpty(warehouseNo)){
fb.setCode(0);
fb.setMessage("仓库编号不能为空");
return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(warehouseNo);
warehouseNo=(String)jsonObject.get("warehouseNo");
if(warehouseService.getWarehouseNo(warehouseNo) ==0){
fb.setCode(0);
fb.setMessage("仓库编号不存在");
return gson.toJson(fb);
}
return warehouseService.getAlarmContacts(warehouseNo);
}
//生成仓库编号 //生成仓库编号
public String getWarehouseNo(){ public String getWarehouseNo(){
String warehouseNo = "WH" +System.currentTimeMillis() ; String warehouseNo = "WH" +System.currentTimeMillis() ;
......
src/main/resources/application.properties
View file @ a39f3b50
...@@ -7,7 +7,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver ...@@ -7,7 +7,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
threadpool.corepoolsize = 30 threadpool.corepoolsize = 30
threadpool.maxpoolsize = 50 threadpool.maxpoolsize = 50
server.port=8092 server.port=8099
management.security.enabled=false management.security.enabled=false
......
src/main/resources/i18n/messages_zh_CN.properties
View file @ a39f3b50
...@@ -217,6 +217,34 @@ deleteTDLSuccess=\u5220\u9664\u7F51\u5173\u6210\u529F ...@@ -217,6 +217,34 @@ deleteTDLSuccess=\u5220\u9664\u7F51\u5173\u6210\u529F
deleteTDLFailure=\u5220\u9664\u7F51\u5173\u5931\u8D25 deleteTDLFailure=\u5220\u9664\u7F51\u5173\u5931\u8D25
updateTDLCompanySuccess=\u7F51\u5173\u5206\u914D\u516C\u53F8\u6210\u529F updateTDLCompanySuccess=\u7F51\u5173\u5206\u914D\u516C\u53F8\u6210\u529F
updateTDLCompanyFailure=\u7F51\u5173\u5206\u914D\u516C\u53F8\u5931\u8D25 updateTDLCompanyFailure=\u7F51\u5173\u5206\u914D\u516C\u53F8\u5931\u8D25
#\u4ED3\u5E93
warehouseName = \u4ED3\u5E93\u540D\u4E0D\u80FD\u4E3A\u7A7A
property =\u4ED3\u5E93\u5C5E\u6027\u4E0D\u80FD\u4E3A\u7A7A
wrongProperty = \u8BF7\u8F93\u5165\u6B63\u786E\u7684\u5C5E\u6027
warehouseType = \u4ED3\u5E93\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
wrongWarehouseType=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u4ED3\u5E93\u7C7B\u578B
hardwareLevel=\u786C\u4EF6\u7B49\u7EA7\u4E0D\u80FD\u4E3A\u7A7A
wrongHardwareLevel=\u8BF7\u9009\u62E9\u6B63\u786E\u7684\u786C\u4EF6\u7B49\u7EA7
areaIndoor=\u5BA4\u5185\u5E73\u9762\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
areaRack=\u8D27\u67B6\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
areaOutdoor=\u5BA4\u5916\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
areaPlanIndoor=\u5B9E\u9645\u5BA4\u5185\u603B\u9762\u79EF\u4E0D\u80FD\u4E3A\u7A7A
office=\u529E\u4E8B\u5904\u4E0D\u80FD\u4E3A\u7A7A
timeZone=\u65F6\u533A\u4E0D\u80FD\u4E3A\u7A7A
repeateWarehouseName=\u4ED3\u5E93\u540D\u4E0D\u80FD\u91CD\u590D
addWarehouseSuccess = \u6DFB\u52A0\u4ED3\u5E93\u6210\u529F
addWarehouseFailure = \u6DFB\u52A0\u4ED3\u5E93\u5931\u8D25
warehouseNo=\u4ED3\u5E93\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
modifiedWarehouseSuccess=\u4FEE\u6539\u4ED3\u5E93\u6210\u529F
modifiedWarehouseFailure=\u4FEE\u6539\u4ED3\u5E93\u5931\u8D25
Nonexistent = \u8BE5\u4ED3\u5E93\u4E0D\u5B58\u5728
deleteWarehouseSuccess=\u4FEE\u6539\u4ED3\u5E93\u6210\u529F
deleteWarehouseFailure=\u4FEE\u6539\u4ED3\u5E93\u5931\u8D25
bindingGatewaySuccess = \u7ED1\u5B9A\u7F51\u5173\u6210\u529F
bindingGatewayFailure = \u7ED1\u5B9A\u7F51\u5173\u5931\u8D25
addAlarmContactsSuccess=\u6DFB\u52A0\u7D27\u6025\u8054\u7CFB\u4EBA\u6210\u529F
addAlarmContactsFailure=\u6DFB\u52A0\u7D27\u6025\u8054\u7CFB\u4EBA\u5931\u8D25
NonexistentUser = \u7528\u6237\u4E0D\u5B58\u5728
#\u89D2\u8272 #\u89D2\u8272
repeatedRole=\u89D2\u8272\u5DF2\u5B58\u5728 repeatedRole=\u89D2\u8272\u5DF2\u5B58\u5728
usedRole=\u8BE5\u89D2\u8272\u6B63\u5728\u88AB\u4F7F\u7528 usedRole=\u8BE5\u89D2\u8272\u6B63\u5728\u88AB\u4F7F\u7528
......
src/main/resources/mapper/GatewayMapper.xml
View file @ a39f3b50
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<!--根据仓库编号查询网关信息--> <!--根据仓库编号查询网关信息-->
<select id="getByWarehouseNo" parameterType="String" resultType="com.example.tdl.domain.vo.GatewayOnLineVo"> <select id="getByWarehouseNo" parameterType="String" resultType="com.example.tdl.domain.vo.GatewayOnLineVo">
SELECT gatewaySN SN, gatewayType type from tdl_gateway_log where warehouseNo=#{warehouseNo,jdbcType=VARCHAR} SELECT DISTINCT gatewaySN SN, gatewayType type from tdl_gateway_log where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment