看板增加使用状态

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

@@ -170,7 +170,6 @@ public class BoxKanbanController {
                 continue;
             }
 
-            dtos.add(boxTaskMapper.toDto(datalog));
             boolean blurryOk = false;
             // 如果是多字段
             String blurry = criteria.getBlurry();
@@ -234,6 +233,16 @@ public class BoxKanbanController {
 
     }
 
+    @ApiOperation("料仓详情")
+    @GetMapping("/boxView")
+    @PreAuthorize("@el.check('boxkanban:boxView')")
+    public BoxStatusDto boxView(String storageId) {
+        List<DataLog> allTasks=taskService.getAllTasks();
+        Storage storage=dataCache.getStorageById(storageId);
+        BoxStatusDto dto=getBoxDto(storage,allTasks);
+        return dto;
+    }
+
 
     private BoxKanbanDto getKanBan(List<DataLog> allTasks) {
 
@@ -277,7 +286,7 @@ public class BoxKanbanController {
         int allCount = inTask + outTask;
         BoxStatusDto boxDto = new BoxStatusDto(storage.getId(), storage.getCid(), storage.getName(), false, 0,
                 "0", "0", "", allCount, inTask, outTask,
-                0, "", "", "", "", "",storage.getType());
+                0, "", "", "", "", "",storage.getType(),storage.getUsageMap(),new HashMap<>());
 
         //获取设备状态，设置状态和当前任务信息
         StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
@@ -299,6 +308,8 @@ public class BoxKanbanController {
                 boxDto.setMsg(bean.getMsg());
                 boxDto.setBarcode(bean.getCode());
                 boxDto.setPosName(bean.getPosId());
+                boxDto.setData(bean.getData());
+
 
                 if(!StringUtils.isEmpty(bean.getPosId())) {
                     DataLog task = taskService.findExecutingTask(storage.getCid(), bean.getPosId());

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

 package com.neotel.smfcore.core.kanban.rest.bean.dto;
 
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.storage.bean.UsageItem;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -70,4 +75,10 @@ public class BoxStatusDto {
 
     @ApiModelProperty("料仓类型")
     private String type = DeviceType.AUTO.name();
+
+    @ApiModelProperty("使用情况")
+    private Map<String, UsageItem> usageMap = new ConcurrentHashMap<>();
+    @ApiModelProperty("操作信息")
+    private Map<String, String> data = new HashMap<>();
+
 }