异物侵限报警修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -245,6 +245,8 @@ public class MsgAlarmController extends BaseController {
                     cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
                 }
                 BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+                SysDept sysDept = deptService.selectDeptById(cameraManagement.getDeptId());
+                o.setDeptName(sysDept.getDeptName());
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                 if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
@@ -314,6 +316,16 @@ public class MsgAlarmController extends BaseController {
             }
             BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
             msgAlarm.setCameraSn(cameraManagement.getCameraSn());
+            if (!StringUtils.isEmpty(cameraManagement.getVersionName())) {
+                msgAlarm.setVersionName(cameraManagement.getVersionName());
+            } else {
+                msgAlarm.setVersionName(" ");
+            }
+            if (!StringUtils.isEmpty(cameraManagement.getVersionNum())) {
+                msgAlarm.setVersionNum(cameraManagement.getVersionNum());
+            } else {
+                msgAlarm.setVersionNum(" ");
+            }
             SysDept sysDept = deptService.selectDeptById(cameraManagement.getDeptId());
             msgAlarm.setDeptName(sysDept.getDeptName());
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();

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

@@ -1018,10 +1018,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         // 找出未记录日志的设备
         Set<String> inactiveCameraCodes = new HashSet<>(allCameraCodes);
         inactiveCameraCodes.removeAll(loggedCameraCodes);
-
         // 保存设备状态变更记录
         saveDeviceResume(loggedCameraCodes, 1);
         saveDeviceResume(inactiveCameraCodes, 2);
+
         // 更新设备状态
         updateDeviceStatus(loggedCameraCodes, 1); // 启用设备
         updateDeviceStatus(inactiveCameraCodes, 2); // 禁用设备
@@ -1055,7 +1055,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                             .eq(BaseDeviceResume::getCameraCode, cameraCode)
                             .eq(BaseDeviceResume::getIsDisable, status));
 
-            boolean shouldDisable = (status == 1) || (deviceDynamicManagement != null && (status == 2 && deviceDynamicManagement.getIsDisable().equals(1)));
+            boolean shouldDisable = (status == 1) || (!ObjectUtils.isEmpty(deviceDynamicManagement) && (status == 2 && deviceDynamicManagement.getIsDisable().equals(1)));
 
             BaseDeviceResume resume = new BaseDeviceResume();
             resume.setCameraCode(cameraCode);