Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -33,6 +33,4 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      * @return
      */
     public int update(@Param("id") Long id, @Param("status") Integer status, @Param("updateBy") String updateBy);
-
-    Integer appAlarmNum(@Param("userId") String userId);
 }

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

@@ -46,4 +46,6 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
     MsgAlarm getByAlarmId(String alarmId);
 
     Map<String, Integer> statisticsNum(MsgAlarmVo msgAlarmVo);
+
+    Integer appAlarmNum(MsgAlarmVo msgAlarmVo);
 }

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

@@ -33,9 +33,4 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
      */
     int update(Long id, Integer status, String updateBy);
 
-    /**
-     * app 未读消息个数
-     * @return
-     */
-    Integer appAlarmNum(String userId);
 }

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

@@ -126,4 +126,9 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
         map.put("countWJC", countWJC);
         return map;
     }
+
+    @Override
+    public Integer appAlarmNum(MsgAlarmVo msgAlarmVo) {
+        return msgAlarmMapper.countWJC(msgAlarmVo);
+    }
 }

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

@@ -44,10 +44,4 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
         int num = msgAppPushMapper.update(id, status, updateBy);
         return num;
     }
-
-    @Override
-    public Integer appAlarmNum(String userId) {
-        Integer integer = msgAppPushMapper.appAlarmNum(userId);
-        return integer;
-    }
 }

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

@@ -77,8 +77,4 @@
         </set>
         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>
 </mapper>

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

@@ -27,7 +27,7 @@
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
             <if test="userId != null and userId != ''">
-                or a.receive_by = #{userId}
+                and a.receive_by = #{userId}
             </if>
             <if test="status != null and status != ''">
                 and a.status = #{status}
@@ -60,7 +60,7 @@
         select count(1) count, SUM(CASE status WHEN '1' THEN 1 ELSE 0 end) AS 'noCount' from msg_web_push
         <where>
             <if test="userId != null and userId != ''">
-                or receive_by = #{userId}
+                and receive_by = #{userId}
             </if>
         </where>
     </select>

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

@@ -4,8 +4,12 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.UserRegistrationid;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
+import com.ozs.service.entity.vo.MsgAlarmVo;
+import com.ozs.service.service.MsgAlarmService;
 import com.ozs.service.service.MsgAppPushService;
 import com.ozs.service.service.UserRegistrationidService;
+import com.ozs.system.service.DataScoreUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +27,9 @@ public class JPushAppController extends BaseController {
     @Autowired
     private UserRegistrationidService userRegistrationidService;
     @Autowired
-    private MsgAppPushService msgAppPushService;
+    private MsgAlarmService msgAlarmService;
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
 
     /**
      * app报警推送次数
@@ -31,8 +37,8 @@ public class JPushAppController extends BaseController {
     @GetMapping("/appAlarmNum")
     @ApiOperation("app报警推送次数")
     public AjaxResult appAlarmNum() {
-        String userId = getUserId();
-        Integer appAlarmNum = msgAppPushService.appAlarmNum(userId);
+        MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
+        Integer appAlarmNum = msgAlarmService.appAlarmNum(msgAlarmVo);
         return AjaxResult.success(appAlarmNum);
     }