同步代码

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

@@ -22,19 +22,16 @@ import java.util.Map;
 @Mapper
 public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
     //报警数据详情
-    List<AlarmStatisticVo> list(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
 
     //报警数据详情导出数据集合
-    List<AlarmStatisticDto> listDto(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
-
-    //报警月统计数据
-    List<AlarmStatisticVo> listMonth(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticDto> listDto(AlarmStatisticResVo alarmStatisticResVo);
 
     //报警月统计数据导出数据集合
-    List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticMonthDto> listDtoMonth(AlarmStatisticResVo alarmStatisticResVo);
 
     //报警月统计数据导出数据集合（天）
-    List<AlarmStatisticMonthDto> listDtoDay(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticMonthDto> listDtoDay(AlarmStatisticResVo alarmStatisticResVo);
 
     Integer selectCameraCode(@Param("cameraCode") String cameraCode);
 

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

@@ -18,25 +18,18 @@ import java.util.Map;
  * @since 2023-02-22
  */
 public interface MsgAlarmService extends IService<MsgAlarm> {
-    //web数据统计 报警数据详情
-    List<AlarmStatisticVo> list(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, Integer pageNum, Integer pageSize, String userId);
+    IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
 
     IPage listToPage(List list, int pageNum, int pageSize);
 
     //web数据统计 报警月统计数据
-    List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId);
+    List<AlarmStatisticMonthDto> getCount(AlarmStatisticResVo alarmStatisticResVo);
 
     //web数据统计 报警月统计数据（天）
-    List<AlarmStatisticMonthDto> getDayCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId);
+    List<AlarmStatisticMonthDto> getDayCount(AlarmStatisticResVo alarmStatisticResVo);
 
     //报警数据详情导出数据集合
-    List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo, String userId);
-
-    //报警数据详情导出数据集合(天)
-    List<AlarmStatisticMonthDto> exportDayExcel(AlarmStatisticResVo alarmStatisticResVo, String userId);
-
-    //web数据统计 报警月统计数据导出
-    List<AlarmStatisticMonthDto> exportExcelMonth(AlarmStatisticResVo alarmStatisticResVo, String userId) throws Exception;
+    List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
 
     /**
      * 通过相机编码查询未解除预警信息

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

@@ -50,41 +50,33 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
 
     //web数据统计 报警数据详情
     @Override
-    public List<AlarmStatisticVo> list(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, Integer pageNum, Integer pageSize, String userId) {
-        List<AlarmStatisticVo> list = msgAlarmMapper.list(railwayCode, currentYear, currentMonth, alarmType, userId);
-        return list;
+    public IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo) {
+        int pageNum = Integer.parseInt(alarmStatisticResVo.getPageNum().toString());
+        int pageSize = Integer.parseInt(alarmStatisticResVo.getPageSize().toString());
+        com.github.pagehelper.Page<AlarmStatisticVo> page = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> msgAlarmMapper.list(alarmStatisticResVo));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<AlarmStatisticVo> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
+        pageR.setRecords(page.getResult());
+        pageR.setTotal(page.getTotal());
+        return pageR;
     }
 
     @Override
-    public List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId) {
-        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoMonth(railwayCode, currentYear, currentMonth, alarmType, userId);
+    public List<AlarmStatisticMonthDto> getCount(AlarmStatisticResVo alarmStatisticResVo) {
+        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoMonth(alarmStatisticResVo);
         return list;
     }
 
     @Override
-    public List<AlarmStatisticMonthDto> getDayCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId) {
-        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoDay(railwayCode, currentYear, currentMonth, alarmType, userId);
+    public List<AlarmStatisticMonthDto> getDayCount(AlarmStatisticResVo alarmStatisticResVo) {
+        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoDay(alarmStatisticResVo);
         return list;
     }
 
     @Override
-    public List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo, String userId) {
-        List<AlarmStatisticDto> listDto = msgAlarmMapper.listDto(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
-        return listDto;
-    }
-
-    @Override
-    public List<AlarmStatisticMonthDto> exportDayExcel(AlarmStatisticResVo alarmStatisticResVo, String userId) {
-        List<AlarmStatisticMonthDto> listDto = msgAlarmMapper.listDtoDay(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
-        return listDto;
-    }
-
-    @Override
-    public List<AlarmStatisticMonthDto> exportExcelMonth(AlarmStatisticResVo alarmStatisticResVo, String userId) throws Exception {
-        List<AlarmStatisticMonthDto> listDto = msgAlarmMapper.listDtoMonth(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
+    public List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo) {
+        List<AlarmStatisticDto> listDto = msgAlarmMapper.listDto(alarmStatisticResVo);
         return listDto;
     }
 

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

@@ -22,7 +22,7 @@
         <result column="is_lock" property="isLock"/>
     </resultMap>
 
-    <select id="list" resultMap="AlarmStatisticVoResult">
+    <select id="list" parameterType="com.ozs.service.entity.vo.AlarmStatisticResVo" resultMap="AlarmStatisticVoResult">
         SELECT
         a.alarm_id ,
         a.camera_code ,
@@ -44,7 +44,6 @@
         FROM
         msg_alarm AS a inner join
         base_camera_management AS b on a.camera_code=b.camera_code left join
-        msg_web_push m on a.alarm_id = m.alarm_id left join
         base_railway_management c on b.railway_code=c.railway_code
 
         <where>
@@ -63,8 +62,22 @@
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
             </if>
-            <if test="userId != null and userId != ''">
-                and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
+            <if test="!dsFlay">
+                and
+                <trim prefix="(" prefixOverrides="or" suffix=")">
+                    <if test="dsUserId != null and dsUserId != ''">
+                        or a.create_by=#{dsUserId}
+                    </if>
+                    <if test="dsDeptId != null and dsDeptId != 0">
+                        or b.dept_id=#{dsDeptId}
+                    </if>
+                    <if test="dsDeptIds != null">
+                        or b.dept_id in
+                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                            #{item}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
         group by a.alarm_id order by a.alarm_time desc
@@ -90,7 +103,7 @@
         <result column="remark" property="remark"/>
         <result column="isLock" property="isLock"/>
     </resultMap>
-    <select id="listDto" resultMap="AlarmStatisticDtoResult">
+    <select id="listDto" parameterType="com.ozs.service.entity.vo.AlarmStatisticResVo" resultMap="AlarmStatisticDtoResult">
         SELECT
         a.alarm_id AS alarmId,
         a.camera_code AS cameraCode,
@@ -112,7 +125,6 @@
         FROM
         msg_alarm AS a inner join
         base_camera_management AS b on a.camera_code=b.camera_code left join
-        msg_web_push m on a.alarm_id = m.alarm_id left join
         base_railway_management c on b.railway_code=c.railway_code
 
         <where>
@@ -131,8 +143,22 @@
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
             </if>
-            <if test="userId != null and userId != ''">
-                and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
+            <if test="!dsFlay">
+                and
+                <trim prefix="(" prefixOverrides="or" suffix=")">
+                    <if test="dsUserId != null and dsUserId != ''">
+                        or a.create_by=#{dsUserId}
+                    </if>
+                    <if test="dsDeptId != null and dsDeptId != 0">
+                        or b.dept_id=#{dsDeptId}
+                    </if>
+                    <if test="dsDeptIds != null">
+                        or b.dept_id in
+                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                            #{item}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
         group by a.alarm_id order by a.alarm_time desc
@@ -144,7 +170,7 @@
         <result column="frequency" property="frequency"/>
         <result column="alarm_type" property="alarmType"/>
     </resultMap>
-    <select id="listDtoMonth" resultMap="AlarmStatisticMonthDtoResult">
+    <select id="listDtoMonth" parameterType="com.ozs.service.entity.vo.AlarmStatisticResVo" resultMap="AlarmStatisticMonthDtoResult">
         SELECT p.monthsta as monthsta,sum(p.fre) as frequency,p.monthstaString as monthstaString
         from
         (SELECT
@@ -154,7 +180,6 @@
         FROM
         msg_alarm AS a inner join
         base_camera_management AS b on a.camera_code=b.camera_code left join
-        msg_web_push m on a.alarm_id = m.alarm_id left join
         base_railway_management c on b.railway_code=c.railway_code
 
         <where>
@@ -173,14 +198,28 @@
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
             </if>
-            <if test="userId != null and userId != ''">
-                and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
+            <if test="!dsFlay">
+                and
+                <trim prefix="(" prefixOverrides="or" suffix=")">
+                    <if test="dsUserId != null and dsUserId != ''">
+                        or a.create_by=#{dsUserId}
+                    </if>
+                    <if test="dsDeptId != null and dsDeptId != 0">
+                        or b.dept_id=#{dsDeptId}
+                    </if>
+                    <if test="dsDeptIds != null">
+                        or b.dept_id in
+                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                            #{item}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
         group by a.alarm_id) AS p group by p.monthsta order by p.monthsta
     </select>
 
-    <select id="listDtoDay" resultMap="AlarmStatisticMonthDtoResult">
+    <select id="listDtoDay" parameterType="com.ozs.service.entity.vo.AlarmStatisticResVo" resultMap="AlarmStatisticMonthDtoResult">
         SELECT p.daysta as monthsta,sum(p.fre) as frequency,p.daystaString as monthstaString
         from
         (SELECT
@@ -190,7 +229,6 @@
         FROM
         msg_alarm AS a inner join
         base_camera_management AS b on a.camera_code=b.camera_code left join
-        msg_web_push m on a.alarm_id = m.alarm_id left join
         base_railway_management c on b.railway_code=c.railway_code
 
         <where>
@@ -209,8 +247,22 @@
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
             </if>
-            <if test="userId != null and userId != ''">
-                and UPPER(m.receive_by) like UPPER(CONCAT('%',#{userId},'%'))
+            <if test="!dsFlay">
+                and
+                <trim prefix="(" prefixOverrides="or" suffix=")">
+                    <if test="dsUserId != null and dsUserId != ''">
+                        or a.create_by=#{dsUserId}
+                    </if>
+                    <if test="dsDeptId != null and dsDeptId != 0">
+                        or b.dept_id=#{dsDeptId}
+                    </if>
+                    <if test="dsDeptIds != null">
+                        or b.dept_id in
+                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                            #{item}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
         group by a.alarm_id) AS p group by p.daysta order by p.daysta

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

@@ -527,46 +527,43 @@ public class MsgAlarmController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public AjaxResult dataStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
-        Integer pageNum = alarmStatisticResVo.getPageNum().intValue();
-        Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
-        SysUser user = getLoginUser().getUser();
-        String userId = getUserId();
-        if (user.isAdmin(user.getId())) {
-            userId = "";
-        }
-        List<AlarmStatisticVo> list = msgAlarmService.list(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), pageNum, pageSize, userId);
-        if (!ObjectUtils.isEmpty(list)) {
-            list.forEach(l -> {
-                if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
-                    l.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
+        alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
+        IPage<AlarmStatisticVo> page = msgAlarmService.list(alarmStatisticResVo);
+        page.setTotal(page.getTotal());
+        page.setCurrent(page.getCurrent());
+        page.setPages(page.getPages());
+        if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
+            List<AlarmStatisticVo> dto1 = page.getRecords().stream().map(o -> {
+                if (!ObjectUtils.isEmpty(o.getAlarmMile())) {
+                    o.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(o.getAlarmMile())));
                 }
-                if (StringUtils.isNotEmpty(l.getReleasedBy())) {
-                    BaseUser buser = baseUserService.getUser(l.getReleasedBy());
-                    l.setReleasedByName(buser.getNickName());
+                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                    BaseUser buser = baseUserService.getUser(o.getReleasedBy());
+                    o.setReleasedByName(buser.getNickName());
                 }
-                if (!ObjectUtils.isEmpty(l.getReleasedType())) {
-                    l.setReleasedTypeName(l.getReleasedType() == 1 ? "实报" : "误报");
+                if (!ObjectUtils.isEmpty(o.getReleasedType())) {
+                    o.setReleasedTypeName(o.getReleasedType() == 1 ? "实报" : "误报");
                 }
-                if (!ObjectUtils.isEmpty(l.getLineDir())) {
-                    l.setLineDirName(l.getLineDir() == 1 ? "上行" : "下行");
+                if (!ObjectUtils.isEmpty(o.getLineDir())) {
+                    o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
                 }
-                if (!ObjectUtils.isEmpty(l.getAlarmType())) {
-                    l.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(l.getAlarmType())));
+                if (!ObjectUtils.isEmpty(o.getAlarmType())) {
+                    o.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(o.getAlarmType())));
                 }
-                if (!ObjectUtils.isEmpty(l.getIsLock())) {
-                    l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
+                if (!ObjectUtils.isEmpty(o.getIsLock())) {
+                    o.setIsLockName(o.getIsLock() == 1 ? "已解除" : "未解除");
                 }
-                if (!ObjectUtils.isEmpty(l.getAlarmAttr())) {
-                    String[] split1 = l.getAlarmAttr().split(",");
+                if (!ObjectUtils.isEmpty(o.getAlarmAttr())) {
+                    String[] split1 = o.getAlarmAttr().split(",");
                     String stringBuilder = "画面大小" + split1[0] + "×" + split1[1] + "," +
                             "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                             "大小" + split1[4] + "×" + split1[5];
-                    l.setAlarmAttrString(stringBuilder);
+                    o.setAlarmAttrString(stringBuilder);
                 }
-            });
+                return o;
+            }).collect(Collectors.toList());
+            page.setRecords(dto1);
         }
-        IPage page = msgAlarmService.listToPage(list, pageNum, pageSize);
         return AjaxResult.success(page);
     }
 
@@ -586,18 +583,12 @@ public class MsgAlarmController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public AjaxResult alarmMonthStatistic(@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
-        SysUser user = getLoginUser().getUser();
-        String userId = getUserId();
-        ;
-        if (user.isAdmin(user.getId())) {
-            userId = "";
-        }
+        alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
         List<Integer> numbs = new ArrayList<>();
         Integer listSize;
         List<AlarmStatisticMonthDto> list = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
-            list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                    alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
+            list = msgAlarmService.getCount(alarmStatisticResVo);
             listSize = 12;
         } else {
             if (alarmStatisticResVo.getCurrentMonth().equals(2)) {//2
@@ -608,8 +599,7 @@ public class MsgAlarmController extends BaseController {
             } else {//1,3,5,7,8,10,12
                 listSize = 31;
             }
-            list = msgAlarmService.getDayCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                    alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
+            list = msgAlarmService.getDayCount(alarmStatisticResVo);
         }
         for (int i = 1; i <= listSize; i++) {
             numbs.add(i);
@@ -659,13 +649,9 @@ public class MsgAlarmController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public void exportDataStatistic(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
-        SysUser user = getLoginUser().getUser();
-        String userId = getUserId();
-        if (user.isAdmin(user.getId())) {
-            userId = "";
-        }
+        alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
         try {
-            List<AlarmStatisticDto> list = msgAlarmService.exportExcel(alarmStatisticResVo, userId);
+            List<AlarmStatisticDto> list = msgAlarmService.exportExcel(alarmStatisticResVo);
             if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
                 list.forEach(l -> {
                     if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
@@ -725,18 +711,13 @@ public class MsgAlarmController extends BaseController {
             @ApiImplicitParam(paramType = "query", name = "alarmType", value = "灾害类型"),
     })
     public void exportDataStatisticMonth(HttpServletResponse response, @RequestBody AlarmStatisticResVo alarmStatisticResVo) {
-        SysUser user = getLoginUser().getUser();
-        String userId = getUserId();
-        if (user.isAdmin(user.getId())) {
-            userId = "";
-        }
+        alarmStatisticResVo = (AlarmStatisticResVo) dataScoreUtil.setDataScore(getUserId(), alarmStatisticResVo);
         String sheetName = "报警年统计数据";
         List<Integer> numbs = new ArrayList<>();
         Integer listSize;
         List<AlarmStatisticMonthDto> list = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
-            list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                    alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
+            list = msgAlarmService.getCount(alarmStatisticResVo);
             listSize = 12;
         } else {
             sheetName = "报警月统计数据";
@@ -748,8 +729,7 @@ public class MsgAlarmController extends BaseController {
             } else {//1,3,5,7,8,10,12
                 listSize = 31;
             }
-            list = msgAlarmService.getDayCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
-                    alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
+            list = msgAlarmService.getDayCount(alarmStatisticResVo);
         }
         if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
             for (int i = 1; i <= listSize; i++) {