Selaa lähdekoodia

增加主机基础数据/磁盘数据/索引数据主动获取 代码修改

jingyuanchao 1 vuosi sitten
vanhempi
commit
bfa3b69d45

+ 4 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/host/remote/DiskInfoGetReq.java

@@ -20,4 +20,8 @@ public class DiskInfoGetReq {
     @ApiModelProperty("设备名称")
     private String deviceName;
 
+
+    @ApiModelProperty("token")
+    private String iotCode;
+
 }

+ 3 - 0
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/host/remote/VideoIntegrityGetReq.java

@@ -26,4 +26,7 @@ public class VideoIntegrityGetReq {
     @ApiModelProperty("设备名称")
     private String deviceName;
 
+    @ApiModelProperty("token")
+    private String iotCode;
+
 }

+ 4 - 2
soc-modules/soc-modules-host/src/main/java/com/xunmei/host/video/service/impl/IotDvrHardDiskDetectionServiceImpl.java

@@ -247,8 +247,10 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
     @Override
     public void getDiskInfos(DiskInfoGetReq req) {
         final String topic = TopicTypeEnums.formatUrl(TopicTypeEnums.PRODUCT_SERVICE_INVOKE.getUrl(), req.getProductName(), req.getDeviceName());
-        final WebsocketResult result = IotServerUtils.invokeHostServer(topic, new JSONObject(), WebSocketConstants.GET_DISK_INFOS, req);
-        WebSocketUtils.sendAll(JacksonUtils.toJSONString(result));
+        final JSONObject object = new JSONObject();
+        object.put("dvsCode", req.getDvsCode());
+        final WebsocketResult result = IotServerUtils.invokeHostServer(topic, new JSONObject(), WebSocketConstants.GET_DISK_INFOS, object);
+        WebSocketUtils.sendMessage(req.getIotCode(),JacksonUtils.toJSONString(result));
     }
 
     @Override

+ 6 - 2
soc-modules/soc-modules-host/src/main/java/com/xunmei/host/video/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -138,8 +138,12 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
     @Override
     public void getRecordInfo(VideoIntegrityGetReq req) {
         final String topic = TopicTypeEnums.formatUrl(TopicTypeEnums.PRODUCT_SERVICE_INVOKE.getUrl(), req.getProductName(), req.getDeviceName());
-        final WebsocketResult result = IotServerUtils.invokeHostServer(topic, new JSONObject(), WebSocketConstants.GET_RECORD_INFOS_SERVICES, req);
-        WebSocketUtils.sendAll(JacksonUtils.toJSONString(result));
+        final JSONObject object = new JSONObject();
+        object.put("dvsCode", req.getDvsCode());
+        object.put("index", req.getIndex());
+        object.put("recordDate", req.getRecordDate());
+        final WebsocketResult result = IotServerUtils.invokeHostServer(topic, new JSONObject(), WebSocketConstants.GET_RECORD_INFOS_SERVICES, object);
+        WebSocketUtils.sendMessage(req.getIotCode(),JacksonUtils.toJSONString(result));
     }
 
     @Override