优化数据统计

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

@@ -1,51 +0,0 @@
-package com.ozs.service.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wyy
- * @subject
- * @creat 2023/4/4
- */
-@Data
-public class AlarmStatisticDayDto {
-
-    /**
-     * 报警类型编码
-     */
-    private String alarmType;
-
-    /**
-     * 报警类型
-     */
-    //@Excel(name = "报警类型")
-    private String alarmTypeValue;
-
-    /**
-     * 报警日期
-     */
-    private Integer daysta;
-
-    /**
-     * 报警日期字符串
-     */
-    @Excel(name = "报警日期")
-    private String daystaString;
-
-    /**
-     * 报警次数
-     */
-    @Excel(name = "报警次数")
-    private Integer frequency;
-
-    /**
-     * 报警时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    //@Excel(name = "报警时间")
-    private Date alarmTime;
-}

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

@@ -42,7 +42,7 @@ public class AlarmStatisticMonthDto {
     /**
      * 报警月份字符串
      */
-    @Excel(name = "报警月份")
+    @Excel(name = "报警日期")
     private String monthstaString;
 
     /**

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

@@ -34,7 +34,7 @@ public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
     List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     //报警月统计数据导出数据集合（天）
-    List<AlarmStatisticDayDto> listDtoDay(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+    List<AlarmStatisticMonthDto> listDtoDay(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     Integer selectCameraCode(@Param("cameraCode") String cameraCode);
 

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

@@ -25,13 +25,13 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
     List<AlarmStatisticMonthDto> getCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId);
 
     //web数据统计 报警月统计数据（天）
-    List<AlarmStatisticDayDto> getDayCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId);
+    List<AlarmStatisticMonthDto> getDayCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId);
 
     //报警数据详情导出数据集合
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo, String userId);
 
     //报警数据详情导出数据集合(天)
-    List<AlarmStatisticDayDto> exportDayExcel(AlarmStatisticResVo alarmStatisticResVo, String userId);
+    List<AlarmStatisticMonthDto> exportDayExcel(AlarmStatisticResVo alarmStatisticResVo, String userId);
 
     //web数据统计 报警月统计数据导出
     List<AlarmStatisticMonthDto> exportExcelMonth(AlarmStatisticResVo alarmStatisticResVo, String userId) throws Exception;

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

@@ -65,8 +65,8 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     }
 
     @Override
-    public List<AlarmStatisticDayDto> getDayCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId) {
-        List<AlarmStatisticDayDto> list = msgAlarmMapper.listDtoDay(railwayCode, currentYear, currentMonth, alarmType, userId);
+    public List<AlarmStatisticMonthDto> getDayCount(String railwayCode, Integer currentYear, Integer currentMonth, String alarmType, String userId) {
+        List<AlarmStatisticMonthDto> list = msgAlarmMapper.listDtoDay(railwayCode, currentYear, currentMonth, alarmType, userId);
         return list;
     }
 
@@ -78,8 +78,8 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     }
 
     @Override
-    public List<AlarmStatisticDayDto> exportDayExcel(AlarmStatisticResVo alarmStatisticResVo, String userId) {
-        List<AlarmStatisticDayDto> listDto = msgAlarmMapper.listDtoDay(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+    public List<AlarmStatisticMonthDto> exportDayExcel(AlarmStatisticResVo alarmStatisticResVo, String userId) {
+        List<AlarmStatisticMonthDto> listDto = msgAlarmMapper.listDtoDay(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                 alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
         return listDto;
     }

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

@@ -176,15 +176,9 @@
         </where>
         group by a.alarm_id) AS p group by p.monthsta order by p.monthsta
     </select>
-    <resultMap id="AlarmStatisticDayDtoResult" type="com.ozs.service.entity.vo.AlarmStatisticDayDto">
-        <id column="id" property="id"/>
-        <result column="daysta" property="daysta"/>
-        <result column="daystaString" property="daystaString"/>
-        <result column="frequency" property="frequency"/>
-        <result column="alarm_type" property="alarmType"/>
-    </resultMap>
-    <select id="listDtoDay" resultMap="AlarmStatisticDayDtoResult">
-        SELECT p.daysta as daysta,sum(p.fre) as frequency,p.daystaString as daystaString
+
+    <select id="listDtoDay" resultMap="AlarmStatisticMonthDtoResult">
+        SELECT p.daysta as monthsta,sum(p.fre) as frequency,p.daystaString as monthstaString
         from
         (SELECT
         DATE_FORMAT(a.alarm_time,'%Y年%m月%d日') as daystaString,

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

@@ -402,7 +402,6 @@ public class MsgAlarmController extends BaseController {
         List<Integer> numbs = new ArrayList<>();
         Integer listSize;
         List<AlarmStatisticMonthDto> list = null;
-        List<AlarmStatisticDayDto> listDay = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
             list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                     alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
@@ -416,7 +415,7 @@ public class MsgAlarmController extends BaseController {
             } else {//1,3,5,7,8,10,12
                 listSize = 31;
             }
-            listDay = msgAlarmService.getDayCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+            list = msgAlarmService.getDayCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                     alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
         }
         for (int i = 1; i <= listSize; i++) {
@@ -424,7 +423,6 @@ public class MsgAlarmController extends BaseController {
         }
 
         List<Integer> list1 = new ArrayList<>();
-        if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
             if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
                 list.forEach(l -> {
                     list1.add(l.getMonthsta());
@@ -449,32 +447,6 @@ public class MsgAlarmController extends BaseController {
                 });
             }
             return AjaxResult.success(list);
-        } else {
-            if (!CollectionUtils.isEmpty(listDay) && Objects.nonNull(listDay.get(0))) {
-                listDay.forEach(l -> {
-                    list1.add(l.getDaysta());
-                });
-            }
-            AlarmStatisticDayDto dto;
-            for (int i = 0; i < numbs.size(); i++) {
-                if (!list1.contains(numbs.get(i))) {
-                    dto = new AlarmStatisticDayDto();
-                    dto.setDaysta(numbs.get(i));
-                    dto.setFrequency(0);
-                    listDay.add(dto);
-                }
-            }
-            if (!CollectionUtils.isEmpty(listDay) && Objects.nonNull(listDay.get(0))) {
-                Collections.sort(listDay, new Comparator<AlarmStatisticDayDto>() {
-                    @Override
-                    public int compare(AlarmStatisticDayDto o1, AlarmStatisticDayDto o2) {
-
-                        return o1.getDaysta().compareTo(o2.getDaysta());
-                    }
-                });
-            }
-            return AjaxResult.success(listDay);
-        }
     }
 
 
@@ -545,18 +517,15 @@ public class MsgAlarmController extends BaseController {
         }
 
         List<AlarmStatisticMonthDto> list = null;
-        List<AlarmStatisticDayDto> listDay = null;
         if (ObjectUtils.isEmpty(alarmStatisticResVo.getCurrentMonth())) {
             list = msgAlarmService.getCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                     alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
-            ExcelUtil<AlarmStatisticMonthDto> util = new ExcelUtil<>(AlarmStatisticMonthDto.class);
-            util.exportExcel(response, list, "报警月统计数据");
         } else {
-            listDay = msgAlarmService.getDayCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+            list = msgAlarmService.getDayCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                     alarmStatisticResVo.getCurrentMonth(), alarmStatisticResVo.getAlarmType(), userId);
-            ExcelUtil<AlarmStatisticDayDto> util = new ExcelUtil<>(AlarmStatisticDayDto.class);
-            util.exportExcel(response, listDay, "报警月统计数据");
         }
+        ExcelUtil<AlarmStatisticMonthDto> util = new ExcelUtil<>(AlarmStatisticMonthDto.class);
+        util.exportExcel(response, list, "报警月统计数据");
     }
 }