录像诊断缺陷

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/VideoDiagnosisServiceImpl.java

@@ -42,6 +42,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
 
     @Autowired
     VideoIntegrityCheckLogMapper videoIntegrityCheckLogMapper;
+
     @Override
     public TableDataInfo<VideoDiagnosisWebPageVo> getPageData(VideoDiagnosisWebPageDto request) {
         String orgPath = "";
@@ -93,11 +94,17 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
             vo.getQuality().summaryQuality();
         }
 
-        if (ObjectUtil.isNotNull(vo) && ObjectUtil.isNotNull(vo.getStorage()) && ObjectUtil.isNotNull(vo.getStorage().getEarliestTime())) {
+        if (ObjectUtil.isNotNull(vo) && ObjectUtil.isNotNull(vo.getStorage())) {
+            Date earliestDate = null;
+            if (ObjectUtil.isNotNull(vo.getStorage().getEarliestTime())) {
+                earliestDate = DateUtil.beginOfDay(vo.getStorage().getEarliestTime());
+            } else {
+                earliestDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, vo.getStorage().getPlanDays() * -1 - 1);
+            }
             LambdaQueryWrapper<MediatorVideoIntegrityCheckLog> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(MediatorVideoIntegrityCheckLog::getEquipmentCode, hostCode)
                     .eq(MediatorVideoIntegrityCheckLog::getChannelCode, channelCode)
-                    .ge(MediatorVideoIntegrityCheckLog::getRecordDate,DateUtil.beginOfDay(vo.getStorage().getEarliestTime()) )
+                    .ge(MediatorVideoIntegrityCheckLog::getRecordDate, earliestDate)
                     .select(MediatorVideoIntegrityCheckLog::getRecordDate, MediatorVideoIntegrityCheckLog::getStatus);
             Map<Integer, List<MediatorVideoIntegrityCheckLog>> days = videoIntegrityCheckLogMapper.selectList(wrapper)
                     .stream().collect(Collectors.groupingBy(d -> d.getStatus()));
@@ -127,7 +134,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
                 vo.getStorage().setAllLostDates(new ArrayList<>());
             }
 
-            setUnknownDate(vo.getStorage(), vo.getStorage().getEarliestTime());
+            setUnknownDate(vo.getStorage(), earliestDate);
         }
 
         return vo;
@@ -142,7 +149,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
     private void setUnknownDate(VideoDiagnosisStorageVo storage, Date earliest) {
         storage.setUnknownDates(new ArrayList<>());
         Date start = DateUtil.beginOfDay(earliest);
-        Date end=DateUtil.offset(new Date(),DateField.DAY_OF_YEAR,-1);
+        Date end = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         for (; !start.after(end); ) {
             String str = format.format(start);
@@ -150,7 +157,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
                 storage.getUnknownDates().add(str);
             }
 
-            start=DateUtil.offset(start, DateField.DAY_OF_YEAR,1);
+            start = DateUtil.offset(start, DateField.DAY_OF_YEAR, 1);
         }
     }