北向录像质量代码提交代码修改提交

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

@@ -18,6 +18,7 @@ import com.xunmei.mediator.api.service.IIotDeviceService;
 import com.xunmei.mediator.api.service.IIotDvrChannelService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisLogService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisRecordService;
+import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDetailInfoVo;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
@@ -64,9 +65,9 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
         //与上次接收到的数据进行比较，如果相同则不进行处理
         //这里要返回true，不然接口调用端会重复发送
         if (redisUtil.compareWithCache(videoDiagnosisDto)) {
-          /*  error.setErrorMsg(RedisKey.REPORT_DATA_REFUSE_MSG);
+            error.setErrorMsg(RedisKey.REPORT_DATA_REFUSE_MSG);
             error.setSuccess(true);
-            return error;*/
+            return error;
         }
         Map<String, Object> map = this.checkVideoDiagnosisDto(videoDiagnosisDto);
         error = (ReceiveErrorDto) map.get("error");
@@ -124,12 +125,9 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
             map.put("device", channel);
             map.put("org", org);
            // map.put("category", category);
-            map.put("error", error);
-            return map;
-        } else {
-            map.put("error", error);
-            return map;
         }
+        map.put("error", error);
+        return map;
     }
 
     private Boolean checkDetailInfo(String detailInfo) {
@@ -217,54 +215,6 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
         videoDiagnosis.setDeviceId(String.valueOf(channel.getId()));
         this.dealDetailInfo(videoDiagnosis);
         objectMap.put("videoDiagnosis", videoDiagnosis);
-
-        QueryWrapper<IotAlarmCode> qw = new QueryWrapper<>();
-        qw.lambda().eq(IotAlarmCode::getParentId, 6);
-        qw.lambda().eq(IotAlarmCode::getDeleted, 0);
-        List<IotAlarmCode> codes = alarmCodeMapper.selectList(qw);
-        objectMap.put("codes", codes);
-
-       /* List<HostAlarmRecord> alarmRecords = this.buildHostAlarmRecord(videoDiagnosis, org, category, device, videoDiagnosisDto, codes);
-        if (alarmRecords != null && alarmRecords.size() > 0) {
-            QueryWrapper<HostAlarmRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(HostAlarmRecord::getDeviceId, device.getId());
-            queryWrapper.lambda().eq(HostAlarmRecord::getOrgId, org.getId());
-            queryWrapper.lambda().eq(HostAlarmRecord::getAlarmStatus, 1);
-            List<HostAlarmRecord> alarmRecordList = hostAlarmRecordDao.list(queryWrapper);
-            //传过来的数据（告警未结束，需要插入的数据）
-            List<HostAlarmRecord> alarmRecordsa = alarmRecords.stream().filter(r -> r.getAlarmStatus() == 1).collect(Collectors.toList());
-            //传过来的数据（告警结束，需要修改的数据）
-            List<HostAlarmRecord> alarmRecordsb = alarmRecords.stream().filter(r -> r.getAlarmStatus() == 0).collect(Collectors.toList());
-            List<HostAlarmRecord> alarmRecordsInsert = new ArrayList<>();
-            List<HostAlarmRecord> alarmRecordsUpdate = new ArrayList<>();
-            if (alarmRecordsa != null && alarmRecordsa.size() > 0) {
-                for (HostAlarmRecord record : alarmRecordsa) {
-                    if (alarmRecordList.stream().filter(r -> r.getDeviceId().equals(record.getDeviceId()) && r.getOrgId().equals(record.getOrgId()) && r.getAlarmCode().equals(record.getAlarmCode())).count() > 0) {
-                        continue;
-                    } else {
-                        record.setId(IDHelper.id());
-                        alarmRecordsInsert.add(record);
-
-                    }
-                }
-                objectMap.put("alarmRecordsInsert", alarmRecordsInsert);
-            }
-            if (alarmRecordsb != null && alarmRecordsb.size() > 0) {
-                for (HostAlarmRecord record : alarmRecordsb) {
-                    if (alarmRecordList.stream().filter(r -> r.getDeviceId().equals(record.getDeviceId()) && r.getOrgId().equals(record.getOrgId()) && r.getAlarmCode().equals(record.getAlarmCode())).count() > 0) {
-                        List<HostAlarmRecord> recordaa = alarmRecordList.stream().filter(r -> r.getDeviceId().equals(record.getDeviceId()) && r.getOrgId().equals(record.getOrgId()) && r.getAlarmCode().equals(record.getAlarmCode())).collect(Collectors.toList());
-                        if (recordaa != null && recordaa.size() > 0) {
-                            HostAlarmRecord recorda = recordaa.get(0); //alarmRecordList.stream().filter(r -> r.getDeviceId().equals(record.getDeviceId()) && r.getOrgId().equals(record.getOrgId())).collect(Collectors.toList()).get(0);
-                            BeanHelper.copyProperties(recorda, record);
-                            alarmRecordsUpdate.add(recorda);
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-                objectMap.put("alarmRecordsUpdate", alarmRecordsUpdate);
-            }
-        }*/
         return objectMap;
     }
     private void  dealDetailInfo(MediatorVideoDiagnosisRecord record){