锡膏料仓增加冷藏区温湿度3

src/main/java/com/neotel/smfcore/core/dashboard/mimo/SmdBoxMimoController.java

@@ -351,7 +351,7 @@ public class SmdBoxMimoController {
         int allCount = inTask + outTask;
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
                 "0", "0","0","", "", allCount, inTask, outTask,
                 "0", "0","0","", "", allCount, inTask, outTask,
-                0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName(),"","","","");
+                0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName(),"","","","","","");
 
 
         //获取设备状态，设置状态和当前任务信息
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());

src/main/java/com/neotel/smfcore/core/device/bean/BoxStatusBean.java

@@ -73,6 +73,14 @@ public class BoxStatusBean {
      * 冷藏区湿度
      * 冷藏区湿度
      */
      */
     public String humidity2  ;
     public String humidity2  ;
+    /**
+     * 冷藏区温度3
+     */
+    public String temperature3 ;
+    /**
+     * 冷藏区湿度3
+     */
+    public String humidity3  ;
 
 
     /**
     /**
      * 回温区温度
      * 回温区温度

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -973,6 +973,13 @@ public class BaseDeviceHandler implements IDeviceHandler {
                         if(ObjectUtil.isNotEmpty(boxStatus.getHumidity2())){
                         if(ObjectUtil.isNotEmpty(boxStatus.getHumidity2())){
                             humiture.setHumidity2(boxStatus.getHumidity2());
                             humiture.setHumidity2(boxStatus.getHumidity2());
                         }
                         }
+
+                        if(ObjectUtil.isNotEmpty(boxStatus.getTemperature3())){
+                            humiture.setTemperature3(boxStatus.getTemperature3());
+                        }
+                        if(ObjectUtil.isNotEmpty(boxStatus.getHumidity3())){
+                            humiture.setHumidity3(boxStatus.getHumidity3());
+                        }
                         try {
                         try {
                             humitureManager.save(humiture);
                             humitureManager.save(humiture);
                             statusBean.setLastSaveTime(System.currentTimeMillis());
                             statusBean.setLastSaveTime(System.currentTimeMillis());

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -424,7 +424,7 @@ public class BoxKanbanController {
         int allCount = inTask + outTask;
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
                 "0", "0", "0","", "", allCount, inTask, outTask,
                 "0", "0", "0","", "", allCount, inTask, outTask,
-                0, "", "", "", "", "", storage.getType(), storage.getUsageMap(), new HashMap<>(), storage.getInListName(),"","","","");
+                0, "", "", "", "", "", storage.getType(), storage.getUsageMap(), new HashMap<>(), storage.getInListName(),"","","","","","");
 
 
         //获取设备状态，设置状态和当前任务信息
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());

src/main/java/com/neotel/smfcore/core/kanban/rest/bean/dto/BoxStatusDto.java

@@ -89,8 +89,12 @@ public class BoxStatusDto {
 
 
     @ApiModelProperty("冷藏区温度2")
     @ApiModelProperty("冷藏区温度2")
     public String temperature2 ;
     public String temperature2 ;
-    @ApiModelProperty("冷藏区湿度")
+    @ApiModelProperty("冷藏区湿度2")
     public String humidity2  ;
     public String humidity2  ;
+    @ApiModelProperty("冷藏区温度3")
+    public String temperature3 ;
+    @ApiModelProperty("冷藏区湿度3")
+    public String humidity3  ;
     @ApiModelProperty("回温区温度")
     @ApiModelProperty("回温区温度")
     public String wTemp ;
     public String wTemp ;
     @ApiModelProperty("回温区湿度")
     @ApiModelProperty("回温区湿度")
@@ -108,5 +112,8 @@ public class BoxStatusDto {
 
 
         setTemperature2(boxStatus.getTemperature2());
         setTemperature2(boxStatus.getTemperature2());
         setHumidity2(boxStatus.getHumidity2());
         setHumidity2(boxStatus.getHumidity2());
+
+        setTemperature3(boxStatus.getTemperature3());
+        setHumidity3(boxStatus.getHumidity3());
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/core/system/service/po/Humiture.java

@@ -45,6 +45,14 @@ public class Humiture extends BasePo implements Serializable {
     public String humidity2="" ;
     public String humidity2="" ;
 
 
     /**
     /**
+     * 冷藏区温度3
+     */
+    public String temperature3="" ;
+    /**
+     * 冷藏区湿度3
+     */
+    public String humidity3="" ;
+    /**
      * 回温区温度
      * 回温区温度
      */
      */
     public String wTemp="";
     public String wTemp="";