app 消息列表返回 字段转换

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

@@ -1,7 +1,9 @@
 package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAppPush;
+import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,5 +36,5 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      */
     public int update(@Param("id") Long id, @Param("status") Integer status, @Param("updateBy") String updateBy);
 
-    void messageMoreApp(MsgAppPushVo msgAppPushVo);
+    List<MsgAlarm> messageMoreApp(MsgAlarmVo msgAlarmVo);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAppPush;
+import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,7 +23,7 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
      * @param
      * @return
      */
-    IPage<MsgAlarm> alarmPushMsg(MsgAppPushVo msgAppPushVo);
+    IPage<MsgAlarm> alarmPushMsg(MsgAlarmVo msgAlarmVo);
 
     /**
      * app推送报警信息记录修改状态

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

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.*;
+import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import com.ozs.service.mapper.MsgAppPushMapper;
 import com.ozs.service.service.BaseCameraManagementService;
@@ -37,14 +38,14 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
     private BaseRailwayManagementService baseRailwayManagementService;
 
     @Override
-    public IPage<MsgAlarm> alarmPushMsg(MsgAppPushVo msgAppPushVo) {
-        // List<MsgAlarm> list = msgAppPushMapper.alarmPushMsg(status);
-        Page<MsgAlarm> page = PageHelper.startPage(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue())
-                .doSelectPage(() -> msgAppPushMapper.messageMoreApp(msgAppPushVo));
+    public IPage<MsgAlarm> alarmPushMsg(MsgAlarmVo msgAlarmVo) {
+        Page<MsgAlarm> page = PageHelper.startPage(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue())
+                .doSelectPage(() -> msgAppPushMapper.messageMoreApp(msgAlarmVo));
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
-                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue());
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
         pageR.setSize(page.size());
         pageR.setTotal(page.getTotal());
+        pageR.setTotal(page.getTotal());
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
             List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");

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

@@ -84,7 +84,7 @@
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
-            <if test="userId != null and userId != ''">
+            <if test="userId != null and userId != 0">
                 and a.receive_by = #{userId}
             </if>
             <if test="status != null and status != ''">

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

@@ -15,6 +15,7 @@ import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAppPush;
+import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import com.ozs.service.service.MsgAppPushService;
 import com.ozs.system.service.ISysUserService;
@@ -107,12 +108,12 @@ public class GeoHazardMineController extends BaseController {
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiOperation("app推送报警信息记录分页显示（全部信息）")
-    public AjaxResult list(@RequestBody MsgAppPushVo msgAppPushVo) {
+    public AjaxResult list(@RequestBody MsgAlarmVo msgAlarmVo) {
         String userId = getUserId();
         if (!StringUtils.isEmpty(userId)) {
-            msgAppPushVo.setReceiveBy(userId);
+            msgAlarmVo.setUserId(userId);
         }
-        IPage<MsgAlarm> list = msgAppPushService.alarmPushMsg(msgAppPushVo);
+        IPage<MsgAlarm> list = msgAppPushService.alarmPushMsg(msgAlarmVo);
         return AjaxResult.success(list);
     }