看板展示数据修改

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

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
@@ -26,6 +27,7 @@ import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.Humiture;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
 import com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl;
@@ -78,6 +80,7 @@ public class BoxKanbanController {
     @ApiOperation("获取看板数据")
     @GetMapping
     @PreAuthorize("@el.check('boxkanban:info')")
+    @AnonymousAccess
     public BoxKanbanDto info(HttpServletRequest servletRequest) {
 
         List<DataLog> allTasks=taskService.getAllTasks();
@@ -434,7 +437,7 @@ public class BoxKanbanController {
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getName(), storage.getCid(), false, 0,
                 "0", "0", "", allCount, inTask, outTask,
-                0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName());
+                0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>(),storage.getInListName(),null);
 
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
@@ -453,6 +456,16 @@ public class BoxKanbanController {
 //                    boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setBarcode(bean.getCode());
                     boxDto.setPosName(bean.getPosId());
+
+                    //温湿度列表
+                    Map<String, String> data = boxStatus.getData();
+                    if (data != null){
+                        String humiAndtempListStr = data.get("humiAndtempList");
+                        if (StringUtils.isNotBlank(humiAndtempListStr)){
+                            boxDto.setHumiAndtempList(JsonUtil.toList(humiAndtempListStr,Map.class));
+                        }
+                    }
+
                     break;
                 }
             } else {
@@ -479,6 +492,15 @@ public class BoxKanbanController {
                         }
                     }
 
+                    //温湿度列表
+                    Map<String, String> data = boxStatus.getData();
+                    if (data != null){
+                        String humiAndtempListStr = data.get("humiAndtempList");
+                        if (StringUtils.isNotBlank(humiAndtempListStr)){
+                            boxDto.setHumiAndtempList(JsonUtil.toList(humiAndtempListStr,Map.class));
+                        }
+                    }
+
                     break;
 
                 }

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -80,4 +81,6 @@ public class BoxStatusDto {
     @ApiModelProperty("当前绑定的入库单名称")
     private String inListName="";
 
+    @ApiModelProperty("温湿度列表")
+    private List<Map> humiAndtempList;
 }