解除报警修改

business-service/src/main/java/com/ozs/service/mapper/MsgAppPushMapper.java

@@ -34,7 +34,7 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      * @param updateBy
      * @return
      */
-    int update(MsgAppPush msgAppPush);
+    int updates(MsgAppPush msgAppPush);
 
     List<MsgAlarm> messageMoreApp(MsgAlarmVo msgAlarmVo);
 }

business-service/src/main/java/com/ozs/service/service/MsgAppPushService.java

@@ -33,6 +33,6 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
      * @param updateBy
      * @return
      */
-    int update(MsgAppPush msgAppPush);
+    int updates(MsgAppPush msgAppPush);
 
 }

business-service/src/main/java/com/ozs/service/service/impl/MsgAppPushServiceImpl.java

@@ -76,8 +76,8 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
     }
 
     @Override
-    public int update(MsgAppPush msgAppPush) {
-        int num = msgAppPushMapper.update(msgAppPush);
+    public int updates(MsgAppPush msgAppPush) {
+        int num = msgAppPushMapper.updates(msgAppPush);
         return num;
     }
 }

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

@@ -68,7 +68,7 @@
         </where>
     </select>
 
-    <update id="update" parameterType="com.ozs.service.entity.MsgAppPush">
+    <update id="updates" parameterType="com.ozs.service.entity.MsgAppPush">
         update msg_app_push
         <set>
             <if test="status != null and status != 0">

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

@@ -399,14 +399,6 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(releasedType)) {
             msgAlarm.setReleasedType(releasedType);
         }
-        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);
-        
         //添加报警视频url
         LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
         base.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
@@ -417,6 +409,18 @@ public class MsgAlarmController extends BaseController {
                 false);
         msgAlarm.setReleasedUrl(url);
         msgAlarmService.updateById(msgAlarm);
+        boolean b = msgAlarmService.updateById(msgAlarm);
+        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
+        MsgAppPush app = new MsgAppPush();
+        app.setStatus(1);
+        boolean update = msgAppPushService.update(app, wrapper);
+        LambdaQueryWrapper<MsgWebPush> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
+        MsgWebPush web = new MsgWebPush();
+        web.setStatus(1);
+        boolean update1 = msgWebPushService.update(web, queryWrapper);
+
         if (b && update && update1) {
             return AjaxResult.success();
         } else {

hazard-admin/src/main/java/com/ozs/web/controller/app/GeoHazardMineController.java

@@ -153,7 +153,7 @@ public class GeoHazardMineController extends BaseController {
     @ApiOperation("app推送报警信息记录修改状态")
     public AjaxResult update(@RequestBody MsgAppPush msgAppPush) {
         msgAppPush.setUpdateBy(getUsername());
-        msgAppPushService.update(msgAppPush);
+        msgAppPushService.updates(msgAppPush);
         return AjaxResult.success();
     }
 }