ソースを参照

修复iot缺陷

jiawuxian 1 年間 前
コミット
9fa059397b

+ 3 - 3
soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDvrDiskServiceImpl.java

@@ -119,10 +119,10 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
                 r.setState(null);
             } else if (r.getDiskInfos().stream().filter(c -> ObjectUtil.equal(c.getState(), 1)).findAny().isPresent()) {
                 r.setState(1);
-            } else if (r.getDiskInfos().stream().filter(c -> ObjectUtil.equal(c.getState(), 2)).findAny().isPresent()) {
-                r.setState(2);
-            } else {
+            } else if (r.getDiskInfos().stream().allMatch(c -> ObjectUtil.equal(c.getState(), 0))) {
                 r.setState(0);
+            } else {
+                r.setState(2);
             }
         });
         return TableDataInfo.success(page);

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

@@ -99,7 +99,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
             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);
+                earliestDate = DateUtil.beginOfDay(DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, vo.getStorage().getPlanDays() * -1 - 1));
             }
             LambdaQueryWrapper<MediatorVideoIntegrityCheckLog> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(MediatorVideoIntegrityCheckLog::getEquipmentCode, hostCode)