报警病害属性添加

business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -91,6 +91,12 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @Excel(name = "报警病害属性")
     private String alarmAttr;
+    
+    /**
+     * 报警病害属性文档格式
+     */
+    @TableField(exist = false)
+    private String alarmAttrName;
 
     /**
      * 报警图片地址

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -141,4 +141,6 @@ public class MsgAlarmResp implements Serializable {
      * 报警置信度（百分比）
      */
     private Integer alarmConfidence;
+
+    private String alarmAttrName;
 }

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

@@ -800,6 +800,11 @@ public class BaseCameraManagementController extends BaseController {
                 msgAlarmResp.setContent(msgAlarm.getContent());
                 msgAlarmResp.setReleasedByName(msgAlarm.getReleasedByName());
                 msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
+                String[] split1 = msgAlarm.getAlarmAttr().split(",");
+                String stringBuilder = "画面大小为" + split1[0] + "×" + split1[1] + "," +
+                        "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+                        "大小" + split1[4] + "×" + split1[5];
+                msgAlarmResp.setAlarmAttrName(stringBuilder);
                 if (!ObjectUtils.isEmpty(msgAlarmResp.getReleasedType())) {
                     msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "真实报警" : "误报警");
                 }
@@ -870,7 +875,7 @@ public class BaseCameraManagementController extends BaseController {
                 }
                 return new AjaxResult(200, "ok", serverConfig.getUrl() + url);
             } else {
-                return error("参数错误");
+                return error("报警ID为:【"+alarmId+"】的相机信息不存在");
             }
 
         } else {

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

@@ -38,6 +38,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -93,6 +94,8 @@ public class MsgAlarmController extends BaseController {
     private BaseUserService baseUserService;
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private MsgAppPushService msgAppPushService;
 
     /**
      * web更多消息-总数，已读数
@@ -366,6 +369,11 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());
+            String[] split1 = msgAlarm.getAlarmAttr().split(",");
+            String stringBuilder = "画面大小为" + split1[0] + "×" + split1[1] + "," +
+                    "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+                    "大小" + split1[4] + "×" + split1[5];
+            msgAlarmResp.setAlarmAttrName(stringBuilder);
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");
@@ -375,6 +383,7 @@ public class MsgAlarmController extends BaseController {
     @PutMapping(value = "/updateIsLock")
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
+    @Transactional
     public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
                                    @RequestParam(value = "releasedType", required = false) Integer releasedType,
                                    @RequestParam(value = "releasedReason", required = false) String releasedReason) {
@@ -389,7 +398,18 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(releasedType)) {
             msgAlarm.setReleasedType(releasedType);
         }
-        return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
+        boolean b = msgAlarmService.updateById(msgAlarm);
+        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
+        boolean update = msgAppPushService.update(wrapper);
+        LambdaQueryWrapper<MsgWebPush> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
+        boolean update1 = msgWebPushService.update(queryWrapper);
+        if (b && update && update1) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
     }
 
     @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")