添加是否解除报警

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

@@ -372,12 +372,21 @@ public class BaseCameraManagementController extends BaseController {
         if (ObjectUtils.isEmpty(baseRailwayManagement)) {
             return error("设备动态管理表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
         }
+        LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper1);
+        if (ObjectUtils.isEmpty(msgAlarm)) {
+            return error("报警信息表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
+        }
         List<Object> list = new ArrayList<>();
         list.add(baseRailwayManagement.getRailwayName());
         list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
         list.add(baseCameraManagement.getLineDir());
         list.add(baseCameraManagement.getCameraCode());
         list.add(baseDeviceDynamicManagement.getElectricity());
+        list.add(msgAlarm.getIsLock());
         SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format1 = dateFormat1.format(new Date());
         list.add(format1);
@@ -544,7 +553,7 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("视频服务设备数量")
     @GetMapping("/totalNumberOfDevices")
     public AjaxResult totalNumberOfDevices() {
-        long count = baseDeviceDynamicManagementService.count();
+        long count = baseCameraManagementService.count();
         return success(count);
     }