报警页面增加筛选条件

business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml

@@ -405,6 +405,9 @@
             <if test="endMile != null and endMile != 0">
                 and b.end_mile &lt;=#{endMile}
             </if>
+            <if test="releasedType != null and releasedType != 0">
+                and a.released_type =#{releasedType}
+            </if>
             <if test="ids != null and ids.size>0">
                 and a.id in
                 <foreach item="items" collection="ids" separator="," open="(" close=")" index="">

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -1188,51 +1188,51 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     /**
      * 修改相机状态
      */
-    public void updateCameraManagementState() {
-        //离线的
-        ArrayList<String> offLine = new ArrayList<>();
-        List<BaseDeviceDynamicManagement> list = baseDeviceDynamicManagementService.list();
-        for (BaseDeviceDynamicManagement baseDeviceDynamicManagement : list) {
-            // 格式化输入时间
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            Instant instant = baseDeviceDynamicManagement.getUpdateTime().toInstant();
-            // 将Instant对象转换为LocalDateTime对象
-            LocalDateTime localDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
-
-
-            // 获取当前时间
-            LocalDateTime currentTime = LocalDateTime.now();
-
-            // 计算时间差
-            Duration duration = Duration.between(localDateTime, currentTime);
-
-            // 检查时间差是否大于3小时
-            if (duration.toHours() >= 3) {
-                offLine.add(baseDeviceDynamicManagement.getCameraCode());
-            }
-        }
-        //修改离线相机
-        if (!ObjectUtils.isEmpty(offLine)) {
-            LambdaUpdateWrapper<BaseDeviceDynamicManagement> updateWrapper = Wrappers.lambdaUpdate();
-            updateWrapper.in(BaseDeviceDynamicManagement::getCameraCode, offLine);
-
-            // 执行批量修改操作
-            BaseDeviceDynamicManagement update = new BaseDeviceDynamicManagement();
-            update.setIsDisable(2);
-            baseDeviceDynamicManagementService.update(update, updateWrapper);
-        }
-
-        //修改在线相机
-        LambdaUpdateWrapper<BaseDeviceDynamicManagement> wrapper = Wrappers.lambdaUpdate();
-        if (!ObjectUtils.isEmpty(offLine)) {
-            wrapper.notIn(BaseDeviceDynamicManagement::getCameraCode, offLine);
-        }
-
-        // 执行批量修改操作
-        BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
-        baseDeviceDynamicManagement.setIsDisable(1);
-        baseDeviceDynamicManagementService.update(baseDeviceDynamicManagement, wrapper);
-    }
+//    public void updateCameraManagementState() {
+//        //离线的
+//        ArrayList<String> offLine = new ArrayList<>();
+//        List<BaseDeviceDynamicManagement> list = baseDeviceDynamicManagementService.list();
+//        for (BaseDeviceDynamicManagement baseDeviceDynamicManagement : list) {
+//            // 格式化输入时间
+//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//            Instant instant = baseDeviceDynamicManagement.getUpdateTime().toInstant();
+//            // 将Instant对象转换为LocalDateTime对象
+//            LocalDateTime localDateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
+//
+//
+//            // 获取当前时间
+//            LocalDateTime currentTime = LocalDateTime.now();
+//
+//            // 计算时间差
+//            Duration duration = Duration.between(localDateTime, currentTime);
+//
+//            // 检查时间差是否大于3小时
+//            if (duration.toHours() >= 3) {
+//                offLine.add(baseDeviceDynamicManagement.getCameraCode());
+//            }
+//        }
+//        //修改离线相机
+//        if (!ObjectUtils.isEmpty(offLine)) {
+//            LambdaUpdateWrapper<BaseDeviceDynamicManagement> updateWrapper = Wrappers.lambdaUpdate();
+//            updateWrapper.in(BaseDeviceDynamicManagement::getCameraCode, offLine);
+//
+//            // 执行批量修改操作
+//            BaseDeviceDynamicManagement update = new BaseDeviceDynamicManagement();
+//            update.setIsDisable(2);
+//            baseDeviceDynamicManagementService.update(update, updateWrapper);
+//        }
+//
+//        //修改在线相机
+//        LambdaUpdateWrapper<BaseDeviceDynamicManagement> wrapper = Wrappers.lambdaUpdate();
+//        if (!ObjectUtils.isEmpty(offLine)) {
+//            wrapper.notIn(BaseDeviceDynamicManagement::getCameraCode, offLine);
+//        }
+//
+//        // 执行批量修改操作
+//        BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+//        baseDeviceDynamicManagement.setIsDisable(1);
+//        baseDeviceDynamicManagementService.update(baseDeviceDynamicManagement, wrapper);
+//    }
 
     /**
      * 删除录制视频的零时文件