报警状态 501 报警已解除

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

@@ -290,9 +290,9 @@ public class MsgAlarmController extends BaseController {
             }
             msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
             msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
-            LambdaQueryWrapper<SysDictData> dict=new LambdaQueryWrapper<>();
-            dict.eq(SysDictData::getDictType,"sys_alarm_type");
-            dict.eq(SysDictData::getDictValue,msgAlarm.getAlarmType());
+            LambdaQueryWrapper<SysDictData> dict = new LambdaQueryWrapper<>();
+            dict.eq(SysDictData::getDictType, "sys_alarm_type");
+            dict.eq(SysDictData::getDictValue, msgAlarm.getAlarmType());
             SysDictData one = dictDataService.getOne(dict);
             msgAlarm.setAlarmTypeName(one.getDictLabel());
             String[] split1 = msgAlarm.getAlarmAttr().split(",");
@@ -407,8 +407,8 @@ public class MsgAlarmController extends BaseController {
                                    @RequestParam(value = "releasedType", required = false) Integer releasedType,
                                    @RequestParam(value = "releasedReason", required = false) String releasedReason) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
-        if (msgAlarm.getIsLock()==1){
-            return AjaxResult.error("报警已解除");
+        if (msgAlarm.getIsLock() == 1) {
+            return AjaxResult.error("501", "报警已解除");
         }
         msgAlarm.setIsLock(1);
         msgAlarm.setUpdateBy(getUserId());
@@ -433,9 +433,9 @@ public class MsgAlarmController extends BaseController {
         } catch (Exception exception) {
             log.error(exception.getMessage());
         }
-        log.info("updateIsLock-------url"+url);
+        log.info("updateIsLock-------url" + url);
         msgAlarm.setReleasedUrl(url);
-        log.info("updateIsLock----------msgAlarm"+msgAlarm);
+        log.info("updateIsLock----------msgAlarm" + msgAlarm);
         boolean b = msgAlarmService.updateById(msgAlarm);
 //        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
@@ -462,14 +462,14 @@ public class MsgAlarmController extends BaseController {
         QueryWrapper<MsgAlarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("alarm_id", alarmId);
         MsgAlarm one = msgAlarmService.getOne(queryWrapper);
-        if (ObjectUtils.isEmpty(one)){
-            return error("报警表没有此报警唯一标识的报警数据"); 
+        if (ObjectUtils.isEmpty(one)) {
+            return error("报警表没有此报警唯一标识的报警数据");
         }
         QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_id", alarmId);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
-        if (list.size()>0) {
+        if (list.size() > 0) {
             if (one.getIsLock() == 1) {
                 for (int i = 0; i < list.size(); i++) {
                     if (i == 0) {
@@ -478,13 +478,13 @@ public class MsgAlarmController extends BaseController {
                         list.get(i).setIsLock(2);
                     }
                 }
-            }else {
+            } else {
                 for (MsgAlarmFrequency msgAlarmFrequency : list) {
                     msgAlarmFrequency.setIsLock(2);
                 }
             }
             return AjaxResult.success(list);
-        }else {
+        } else {
             return error("报警频次表没有此报警唯一标识的报警数据");
         }
     }
@@ -497,13 +497,13 @@ public class MsgAlarmController extends BaseController {
         wrapper.eq("camera_code", cameraCode);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarm> list = msgAlarmService.list(wrapper);
-        if (list.size()>0) {
+        if (list.size() > 0) {
             for (MsgAlarm msgAlarm : list) {
                 msgAlarm.setFailureToAlarm(1);
             }
             return AjaxResult.success(list);
-        }else {
-            List<MsgAlarm> msgAlarmList=new ArrayList<>();
+        } else {
+            List<MsgAlarm> msgAlarmList = new ArrayList<>();
             MsgAlarm msgAlarm = new MsgAlarm();
             msgAlarm.setFailureToAlarm(2);
             msgAlarmList.add(msgAlarm);