设备监控接口调整

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/WarehouseReq.java

@@ -16,7 +16,6 @@ public class WarehouseReq extends BaseRequest {
     @NotBlank(message = "仓库主键不能为空", groups = {updateStatus.class, delete.class, detail.class})
     private String id;
     //查询仓库设备时使用
-    private String warehouseId;
     private String name;
 
     private String location;

jyzb-api/src/main/java/com/junmp/jyzb/api/util/WsWarehouseReq.java

@@ -10,20 +10,30 @@ import java.util.List;
 public class WsWarehouseReq {
     @JsonProperty("deviceId")
     private String deviceId;
-    @JsonProperty("orgId")
-    private String orgId;
     @JsonProperty("onlineState")
     private String onlineState;
-    @JsonProperty("warehouseId")
-    private String warehouseId;
+    @JsonProperty("orgId")
+    private String orgId;
+    @JsonProperty("warehouse")
+    private List<warehouse> warehouse;
 
-    @JsonProperty("warehouseDevs")
-    private List<warehouseDevs> warehouseDevs;
 
+    @Data
+    // 内部类表示box
+    public static class warehouse {
+        @JsonProperty("warehouseId")
+        private String warehouseId;
+
+        @JsonProperty("warehouseName")
+        private String warehouseName;
+
+        @JsonProperty("warehouseDev")
+        private List<warehouseDev> warehouseDev;
+    }
 
     @Data
     // 内部类表示box
-    public static class warehouseDevs {
+    public static class warehouseDev {
         @JsonProperty("devId")
         private String devId;
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java

@@ -78,10 +78,10 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
     public WsWarehouseReq CheckState(WarehouseReq req) {
         WsWarehouseReq warehouseReq=new WsWarehouseReq();
 
-       String deviceData= redisCache.get(req.getWarehouseId());
+       String deviceData= redisCache.get(req.getOrgId().toString());
        if (ObjectUtil.isNull(deviceData))
        {
-           warehouseReq.setWarehouseId(req.getWarehouseId());
+           warehouseReq.setOrgId(req.getOrgId().toString());
            warehouseReq.setOnlineState("false");
        }
        else

jyzb-biz/src/main/java/com/junmp/jyzb/websocket/WarehouseWebSocketServer.java

@@ -73,22 +73,21 @@ public class WarehouseWebSocketServer implements WebSocketServerListener {
             String text = protocol.readText();
             ObjectMapper objectMapper = new ObjectMapper();
             WsWarehouseReq deviceData = objectMapper.readValue(text, WsWarehouseReq.class);
-            String warehouseId = deviceData.getWarehouseId();
-            String redisExist= redisCache.get(warehouseId);
-            deviceData.getOrgId();
+            String orgId = deviceData.getOrgId();
+            String redisExist= redisCache.get(orgId);
 
             if(redisExist!=null)//已有存在数据
             {
 
                 String jsonData = objectMapper.writeValueAsString(deviceData);
-                redisCache.put(warehouseId, jsonData);
+                redisCache.put(orgId, jsonData);
             }
             else
             {
                 String channel =  protocol.requestMessage().getChannelId();
                 String jsonData = objectMapper.writeValueAsString(deviceData);
-                redisCache.put(warehouseId, jsonData);
-                redisCache.put(channel, warehouseId);
+                redisCache.put(orgId, jsonData);
+                redisCache.put(channel, orgId);
             }
             protocol.response("true");
         }
@@ -101,9 +100,9 @@ public class WarehouseWebSocketServer implements WebSocketServerListener {
     public void onClose(DefaultWebSocketServerProtocol protocol) {
 
         String channel= protocol.requestMessage().getChannelId();
-        String warehouseId= redisCache.get(channel);
+        String orgId= redisCache.get(channel);
         redisCache.remove(channel);
-        redisCache.remove(warehouseId);
+        redisCache.remove(orgId);
         WebSocketServerListener.super.onClose(protocol);
     }