app推送报警信息记录 -- 分页

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

@@ -77,7 +77,7 @@ public class MsgAppPushVo extends PageVo implements Serializable {
     private String receiveBy;
 
     /**
-     * 状态：0未读；1已读
+     * 状态：1未读；2已读
      */
     private Integer status;
 

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

@@ -22,7 +22,7 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      * @param
      * @return
      */
-    List<MsgAppPushVo> alarmPushMsg(Integer status);
+    List<MsgAppPushVo> alarmPushMsg(MsgAppPushVo msgAppPushVo);
 
     /**
      * app推送报警信息记录修改状态

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

@@ -1,5 +1,6 @@
 package com.ozs.service.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.vo.MsgAppPushVo;
@@ -20,7 +21,7 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
      * @param
      * @return
      */
-    List<MsgAppPushVo> alarmPushMsg(Integer status);
+    IPage<MsgAppPushVo> alarmPushMsg(MsgAppPushVo msgAppPushVo);
 
     /**
      * app推送报警信息记录修改状态

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

@@ -1,8 +1,12 @@
 package com.ozs.service.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import com.ozs.service.mapper.MsgAppPushMapper;
@@ -23,9 +27,16 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
     MsgAppPushMapper msgAppPushMapper;
 
     @Override
-    public List<MsgAppPushVo> alarmPushMsg(Integer status) {
-        List<MsgAppPushVo> list = msgAppPushMapper.alarmPushMsg(status);
-        return list;
+    public IPage<MsgAppPushVo> alarmPushMsg(MsgAppPushVo msgAppPushVo) {
+        // List<MsgAppPushVo> list = msgAppPushMapper.alarmPushMsg(status);
+        Page<MsgAppPushVo> page = PageHelper.startPage(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue())
+                .doSelectPage(() -> msgAppPushMapper.alarmPushMsg(msgAppPushVo));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAppPushVo> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAppPushVo.getPageNum().intValue(), msgAppPushVo.getPageSize().intValue());
+        pageR.setSize(page.size());
+        pageR.setTotal(page.getTotal());
+        pageR.setRecords(page.getResult());
+        return pageR;
     }
 
     @Override

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

@@ -29,7 +29,7 @@
             <result column="install_latitude" property="installLatitude"/>
         </association>
     </resultMap>
-    <select id="alarmPushMsg" resultMap="MsgAppPushVoResult">
+    <select id="alarmPushMsg" resultMap="MsgAppPushVoResult" parameterType="com.ozs.service.entity.vo.MsgAppPushVo">
         select
         m.id,
         m.alarm_id,
@@ -60,11 +60,14 @@
         base_railway_management AS r on b.railway_code=r.railway_code
         <where>
             <if test="status != null and status != 0">
-                and UPPER(status) like UPPER(CONCAT('%',#{status},'%'))
+                and status = = #{status}
+            </if>
+            <if test="receiveBy != null and receiveBy != ''">
+                and receive_by = #{receiveBy}
             </if>
-            and YEAR(a.alarm_time) = YEAR(SYSDATE())
         </where>
     </select>
+
     <update id="update" parameterType="com.ozs.service.entity.MsgAppPush">
         update msg_app_push
         <set>
@@ -75,7 +78,6 @@
         where id = #{id}
     </update>
 
-
     <select id="appAlarmNum" parameterType="java.lang.String" resultType="java.lang.Integer">
         select count(*) from msg_app_push where status = 1 and receive_by = #{userId}
     </select>

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

@@ -13,6 +13,7 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.uuid.IdUtils;
 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.MsgAppPushVo;
 import com.ozs.service.service.MsgAppPushService;
@@ -107,7 +108,11 @@ public class GeoHazardMineController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiOperation("app推送报警信息记录分页显示（全部信息）")
     public AjaxResult list(@RequestBody MsgAppPushVo msgAppPushVo) {
-        List<MsgAppPushVo> list = msgAppPushService.alarmPushMsg(msgAppPushVo.getStatus());
+        String userId = getUserId();
+        if (!StringUtils.isEmpty(userId)) {
+            msgAppPushVo.setReceiveBy(userId);
+        }
+        IPage<MsgAppPushVo> list = msgAppPushService.alarmPushMsg(msgAppPushVo);
         return AjaxResult.success(list);
     }