调试代码提交

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/service/impl/VideoDiagnosisRecordServiceImpl.java

@@ -23,6 +23,7 @@ import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisUtil;
 import com.xunmei.mediator.websocket.constant.WebSocketConstants;
 import com.xunmei.mediator.websocket.dto.WebsocketExecuteReq;
+import com.xunmei.mediator.websocket.dto.WebsocketResult;
 import com.xunmei.mediator.websocket.enums.DeviceTypeEnum;
 import com.xunmei.mediator.websocket.enums.ProductEnums;
 import com.xunmei.mediator.websocket.service.RouterService;
@@ -85,11 +86,8 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
     @Transactional(rollbackFor = Exception.class)
     public Object execute(WebsocketExecuteReq obj) {
         try {
-
             JSONObject data = (JSONObject) obj.getData();
             VideoDiagnosisReq req = data.toJavaObject(VideoDiagnosisReq.class);
-            req.setToken(obj.getToken());
-            req.setDeviceName(obj.getDeviceName());
             VideoDiagnosisDto dto = new VideoDiagnosisDto();
             dto.setEquipmentCode(req.getDvsCode());
             dto.setChannelCode(req.getIndex());
@@ -99,10 +97,10 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
             dto.setDetailInfo(req.getDetailInfo());
             SysOrg sysOrg = iotServerInfoService.selectOrgByToken(obj.getToken());
             dto.setOrganizationGuid(sysOrg.getCode());
-            dto.setProductName(req.getProductName());
-            dto.setDeviceName(req.getDeviceName());
-            dto.setToken(req.getToken());
-            return saveData(dto, obj.getId());
+            dto.setProductName(obj.getProductName());
+            dto.setDeviceName(obj.getDeviceName());
+            dto.setToken(obj.getToken());
+            return WebsocketResult.of(saveData(dto, obj.getId()), obj.getTopic(), obj.getId());
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.error(e.getMessage());
@@ -116,11 +114,11 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
         ReceiveErrorDto error = new ReceiveErrorDto();
         //与上次接收到的数据进行比较，如果相同则不进行处理
         //这里要返回true，不然接口调用端会重复发送
-        if (redisUtil.compareWithCache(videoDiagnosisDto)) {
+        /*if (redisUtil.compareWithCache(videoDiagnosisDto)) {
             error.setErrorMsg(RedisKey.REPORT_DATA_REFUSE_MSG);
             error.setSuccess(true);
             return error;
-        }
+        }*/
         Map<String, Object> map = this.checkVideoDiagnosisDto(videoDiagnosisDto);
         error = (ReceiveErrorDto) map.get("error");
         //参数验证通过
@@ -159,7 +157,7 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
                 map.put("error", error);
                 return map;
             }
-            IotDeviceInfo channel = iotDeviceInfoService.selectByTypeAndHostAndCode(videoDiagnosisDto.getToken(), videoDiagnosisDto.getEquipmentCode(), videoDiagnosisDto.getProductName(),videoDiagnosisDto.getChannelCode());
+            IotDeviceInfo channel = iotDeviceInfoService.selectByTypeAndHostAndCode(videoDiagnosisDto.getToken(), videoDiagnosisDto.getEquipmentCode(), videoDiagnosisDto.getProductName(), videoDiagnosisDto.getChannelCode());
             if (ObjectUtil.isNull(channel)) {
                 error.setSuccess(false);
                 error.setErrorMsg("通道/设备不存在!");

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -94,10 +94,10 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
     public Object execute(WebsocketExecuteReq req) {
         JSONObject data = (JSONObject) req.getData();
         VideoIntegrityCheckReq checkReq = data.toJavaObject(VideoIntegrityCheckReq.class);
-        checkReq.setToken(req.getToken());
-        checkReq.setDeviceName(req.getDeviceName());
-        checkReq.setProductName(req.getProductName());
         VideoIntegrityCheckDto checkDto = transform(checkReq);
+        checkDto.setToken(req.getToken());
+        checkDto.setDeviceName(req.getDeviceName());
+        checkDto.setProductName(req.getProductName());
         SysOrg sysOrg = iotServerInfoService.selectOrgByToken(req.getToken());
         checkDto.setOrganizationGuid(sysOrg.getCode());
         final ReceiveErrorDto dto = this.saveData(checkDto, req.getId());
@@ -133,9 +133,6 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
         dst.setLoseSpan(req.getLoseSpan());
         dst.setRecordSpan(req.getRecordSpan());
         dst.setCheckSpan(req.getCheckSpan());
-        dst.setProductName(req.getProductName());
-        dst.setDeviceName(req.getDeviceName());
-        dst.setToken(req.getToken());
         return dst;
     }
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/videoDiagnosis/VideoDiagnosisReq.java

@@ -32,11 +32,4 @@ public class VideoDiagnosisReq{
     @ApiModelProperty(value = "详情")
     private List<String> detailInfo;
 
-
-    @ApiModelProperty(value = "唯一编码")
-    private String token;
-    @ApiModelProperty(value = "设备产品名称",notes = "topic中的productName")
-    private String productName;
-    @ApiModelProperty(value = "设备名称",notes = "topic中的deviceName")
-    private String deviceName;
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/domain/dto/videoIntegrityCheck/VideoIntegrityCheckReq.java

@@ -12,12 +12,6 @@ import java.util.List;
 @AllArgsConstructor
 public class VideoIntegrityCheckReq {
 
-    @ApiModelProperty(value = "产品名称")
-    private String productName;
-
-    @ApiModelProperty(value = "设备名称")
-    private String deviceName;
-
     @ApiModelProperty(value = "录像机编号")
     private String dvsCode;
 
@@ -38,12 +32,4 @@ public class VideoIntegrityCheckReq {
 
     @ApiModelProperty(value = "录像丢失内容")
     private List<String> loseSpan;
-
-
-    private String token;
-
-
-
-
-
 }