app web 查下当前登陆人的报警数据

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

@@ -68,7 +68,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     /**
      * 用户userID
      */
-    private List<String> userIds;
+    private String userId;
 
     /**
      * 状态：1未读；2已读

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

@@ -16,11 +16,11 @@ import java.util.Map;
  */
 @Mapper
 public interface MsgWebPushMapper extends BaseMapper<MsgWebPush> {
-    Integer webAlarmNum(MsgAlarmVo msgAlarmParameter);
+    Integer webAlarmNum(@Param("userId") String userId);
 
-    List<MsgAlarm> webAlarm(MsgAlarmVo msgAlarmParameter);
+    List<MsgAlarm> webAlarm(@Param("userId") String userId);
 
     List<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo);
 
-    Map<String, Integer> messageMoreNum(MsgAlarmVo msgAlarmVo);
+    Map<String, Integer> messageMoreNum(@Param("userId") String userId);
 }

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

@@ -17,9 +17,9 @@ import java.util.Map;
 public interface MsgWebPushService extends IService<MsgWebPush> {
     int read(MsgWebPush msgWebPush);
 
-    Map webAlarm(MsgAlarmVo msgAlarm);
+    Map webAlarm(String userId);
 
     IPage<MsgAlarm> messageMore(MsgAlarmVo msgAlarmVo);
 
-    Map<String, Integer> messageMoreNum(MsgAlarmVo msgAlarmVo);
+    Map<String, Integer> messageMoreNum(String userId);
 }

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

@@ -47,12 +47,12 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
     }
 
     @Override
-    public Map webAlarm(MsgAlarmVo msgAlarmParameter) {
+    public Map webAlarm(String userId) {
         // List<String> userIds = baseCameraManagementService.getUserIds(userId);
         Map<String, Object> webAlarmMap = new HashMap<>();
         List<MsgAlarmResp> msgAlarmRespList = new ArrayList<>();
-        Integer webAlarmNum = msgWebPushMapper.webAlarmNum(msgAlarmParameter);
-        List<MsgAlarm> webAlarm = msgWebPushMapper.webAlarm(msgAlarmParameter);
+        Integer webAlarmNum = msgWebPushMapper.webAlarmNum(userId);
+        List<MsgAlarm> webAlarm = msgWebPushMapper.webAlarm(userId);
         if (!StringUtils.isEmpty(webAlarm) && webAlarm.size() > 0) {
             for (MsgAlarm msgAlarm : webAlarm) {
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -125,8 +125,8 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
     }
 
     @Override
-    public Map<String, Integer> messageMoreNum(MsgAlarmVo msgAlarmVo) {
-        Map<String, Integer> map = msgWebPushMapper.messageMoreNum(msgAlarmVo);
+    public Map<String, Integer> messageMoreNum(String userId) {
+        Map<String, Integer> map = msgWebPushMapper.messageMoreNum(userId);
         return map;
     }
 }

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

@@ -2,58 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ozs.service.mapper.MsgWebPushMapper">
 
-    <select id="webAlarmNum" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="java.lang.Integer">
-        select count(1)
-        from msg_web_push AS a
-        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>
-            a.status = 1
-            <if test="!dsFlay">
-                and
-                <trim prefix="(" prefixOverrides="or" suffix=")">
-                    <if test="dsUserId != null and dsUserId != ''">
-                        or a.receive_by = #{dsUserId}
-                    </if>
-                    <if test="dsDeptId != null and dsDeptId != 0">
-                        or c.dept_id = #{dsDeptId}
-                    </if>
-                    <if test="dsDeptIds != null">
-                        or c.dept_id in
-                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                            #{item}
-                        </foreach>
-                    </if>
-                </trim>
-            </if>
-        </where>
+    <select id="webAlarmNum" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select count(1) from msg_web_push where status = 1
+        <if test="userId != null and userId != ''">
+            and receive_by = #{userId}
+        </if>
     </select>
 
-    <select id="webAlarm" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="com.ozs.service.entity.MsgAlarm">
+    <select id="webAlarm" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgAlarm">
         select b.*
         from msg_web_push AS a
         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>
-            a.status = 1
-            <if test="!dsFlay">
-                and
-                <trim prefix="(" prefixOverrides="or" suffix=")">
-                    <if test="dsUserId != null and dsUserId != ''">
-                        or a.receive_by = #{dsUserId}
-                    </if>
-                    <if test="dsDeptId != null and dsDeptId != 0">
-                        or c.dept_id = #{dsDeptId}
-                    </if>
-                    <if test="dsDeptIds != null">
-                        or c.dept_id in
-                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                            #{item}
-                        </foreach>
-                    </if>
-                </trim>
-            </if>
-        </where>
+        where a.status = 1
+        <if test="userId != null and userId != ''">
+            and a.receive_by = #{userId}
+        </if>
     </select>
 
     <select id="messageMore" parameterType="com.ozs.service.entity.vo.MsgAlarmVo"
@@ -63,22 +26,8 @@
         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="!dsFlay">
-                and
-                <trim prefix="(" prefixOverrides="or" suffix=")">
-                    <if test="dsUserId != null and dsUserId != ''">
-                        or a.receive_by = #{dsUserId}
-                    </if>
-                    <if test="dsDeptId != null and dsDeptId != 0">
-                        or c.dept_id = #{dsDeptId}
-                    </if>
-                    <if test="dsDeptIds != null">
-                        or c.dept_id in
-                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                            #{item}
-                        </foreach>
-                    </if>
-                </trim>
+            <if test="userId != null and userId != ''">
+                or a.receive_by = #{userId}
             </if>
             <if test="status != null and status != ''">
                 and a.status = #{status}
@@ -108,24 +57,10 @@
     </select>
 
     <select id="messageMoreNum" parameterType="com.ozs.service.entity.vo.MsgAlarmVo" resultType="java.util.Map">
-        select count(1) count, SUM(CASE a.status WHEN '1' THEN 1 ELSE 0 end) AS 'noCount' from msg_web_push AS a 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
+        select count(1) count, SUM(CASE status WHEN '1' THEN 1 ELSE 0 end) AS 'noCount' from msg_web_push
         <where>
-            <if test="!dsFlay">
-                and
-                <trim prefix="(" prefixOverrides="or" suffix=")">
-                    <if test="dsUserId != null and dsUserId != ''">
-                        or a.receive_by = #{dsUserId}
-                    </if>
-                    <if test="dsDeptId != null and dsDeptId != 0">
-                        or c.dept_id = #{dsDeptId}
-                    </if>
-                    <if test="dsDeptIds != null">
-                        or c.dept_id in
-                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                            #{item}
-                        </foreach>
-                    </if>
-                </trim>
+            <if test="userId != null and userId != ''">
+                or receive_by = #{userId}
             </if>
         </where>
     </select>

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

@@ -93,8 +93,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("更多消息--总数，已读数")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMoreNum(@RequestBody MsgAlarmVo msgAlarmVo) {
-        MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
-        Map<String, Integer> messageMore = msgWebPushService.messageMoreNum(msgAlarmVo1);
+        // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
+        Map<String, Integer> messageMore = msgWebPushService.messageMoreNum(getUserId());
         return AjaxResult.success(messageMore);
     }
 
@@ -105,8 +105,12 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("更多消息")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
-        MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
-        IPage<MsgAlarm> messageMore = msgWebPushService.messageMore(msgAlarmVo1);
+        // MsgAlarmVo msgAlarmVo1 = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
+        String userId = getUserId();
+        if (!StringUtils.isEmpty(userId)){
+            msgAlarmVo.setUserId(userId);
+        }
+        IPage<MsgAlarm> messageMore = msgWebPushService.messageMore(msgAlarmVo);
         return AjaxResult.success(messageMore);
     }
 
@@ -117,8 +121,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("app报警推送次数")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult webAlarmNum() {
-        MsgAlarmVo msgAlarm = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
-        Map webAlarm = msgWebPushService.webAlarm(msgAlarm);
+        // MsgAlarmVo msgAlarm = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
+        Map webAlarm = msgWebPushService.webAlarm(getUserId());
         return AjaxResult.success(webAlarm);
     }