调整大屏统计类名

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/stat/ScreenAlarmDTO.java

@@ -1,5 +1,6 @@
 package com.hfln.portal.common.dto.data.stat;
 
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,14 +10,14 @@ import java.util.List;
 public class ScreenAlarmDTO {
 
     @Schema(description = "月统计信息列表")
-    private List<MonthStatInfo> monthStatInfo;
+    private List<AlarmMonthStatInfo> monthStatInfo;
 
     @Schema(description = "日统计信息列表")
-    private List<DayStatInfo> dayStatInfo;
+    private List<AlarmDayStatInfo> dayStatInfo;
 
     @Data
     @Schema(description = "月统计信息")
-    public static class MonthStatInfo {
+    public static class AlarmMonthStatInfo {
         @Schema(description = "年月，格式: yyyy-MM")
         private String month;
 
@@ -28,7 +29,7 @@ public class ScreenAlarmDTO {
 
     @Data
     @Schema(description = "日统计信息")
-    public static class DayStatInfo {
+    public static class AlarmDayStatInfo {
         @Schema(description = "日期，格式: yyyy-MM-dd")
         private String date;
 

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/stat/ScreenFallingDTO.java

@@ -1,5 +1,6 @@
 package com.hfln.portal.common.dto.data.stat;
 
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -9,14 +10,14 @@ import java.util.List;
 public class ScreenFallingDTO {
 
     @Schema(description = "月统计信息列表")
-    private List<MonthStatInfo> monthStatInfo;
+    private List<FallingMonthStatInfo> monthStatInfo;
 
     @Schema(description = "日统计信息列表")
-    private List<DayStatInfo> dayStatInfo;
+    private List<FallingDayStatInfo> dayStatInfo;
 
     @Data
     @Schema(description = "月统计信息")
-    public static class MonthStatInfo {
+    public static class FallingMonthStatInfo {
         @Schema(description = "年月，格式: yyyy-MM")
         private String month;
 
@@ -28,7 +29,7 @@ public class ScreenFallingDTO {
 
     @Data
     @Schema(description = "日统计信息")
-    public static class DayStatInfo {
+    public static class FallingDayStatInfo {
         @Schema(description = "日期，格式: yyyy-MM-dd")
         private String date;
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/EventListMapper.java

@@ -22,7 +22,7 @@ public interface EventListMapper extends BaseMapper<EventList> {
             "WHERE e.tenant_id = #{tenantId} and e.create_time >=  #{startDate} " +
             "GROUP BY DATE_FORMAT(e.create_time, '%Y-%m') " +
             "ORDER BY month ASC ")
-    List<ScreenFallingDTO.MonthStatInfo> queryEventsInSixMonths(Long tenantId, LocalDate startDate);
+    List<ScreenFallingDTO.FallingMonthStatInfo> queryEventsInSixMonths(Long tenantId, LocalDate startDate);
 
     @Select("SELECT " +
             "   DATE_FORMAT(e.create_time, '%Y-%m-%d') AS date, " +
@@ -31,5 +31,5 @@ public interface EventListMapper extends BaseMapper<EventList> {
             "WHERE e.tenant_id = #{tenantId} and e.create_time >=  #{startDate} " +
             "GROUP BY DATE_FORMAT(e.create_time, '%Y-%m-%d') " +
             "ORDER BY date ASC ")
-    List<ScreenFallingDTO.DayStatInfo> queryEventsInSevenDays(Long tenantId, LocalDate startDate);
+    List<ScreenFallingDTO.FallingDayStatInfo> queryEventsInSevenDays(Long tenantId, LocalDate startDate);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/EventsMapper.java

@@ -28,7 +28,7 @@ public interface EventsMapper extends BaseMapper<Events> {
             "WHERE e.tenant_id = #{tenantId} and e.create_time >=  #{startDate} " +
             "GROUP BY DATE_FORMAT(e.create_time, '%Y-%m') " +
             "ORDER BY month ASC ")
-    List<ScreenAlarmDTO.MonthStatInfo> queryEventsInSixMonths(Long tenantId, LocalDate startDate);
+    List<ScreenAlarmDTO.AlarmMonthStatInfo> queryEventsInSixMonths(Long tenantId, LocalDate startDate);
 
     @Select("SELECT " +
             "   DATE_FORMAT(e.create_time, '%Y-%m-%d') AS date, " +
@@ -37,5 +37,5 @@ public interface EventsMapper extends BaseMapper<Events> {
             "WHERE e.tenant_id = #{tenantId} and e.create_time >=  #{startDate} " +
             "GROUP BY DATE_FORMAT(e.create_time, '%Y-%m-%d') " +
             "ORDER BY date ASC ")
-    List<ScreenAlarmDTO.DayStatInfo> queryEventsInSevenDays(Long tenantId, LocalDate startDate);
+    List<ScreenAlarmDTO.AlarmDayStatInfo> queryEventsInSevenDays(Long tenantId, LocalDate startDate);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/EventListService.java

@@ -18,7 +18,7 @@ public interface EventListService extends IService<EventList> {
 
     Page<EventList> WapQueryEventList(WapEventListParams params);
 
-    List<ScreenFallingDTO.MonthStatInfo> queryEventsInSixMonths(Long tenantId);
+    List<ScreenFallingDTO.FallingMonthStatInfo> queryEventsInSixMonths(Long tenantId);
 
-    List<ScreenFallingDTO.DayStatInfo> queryEventsInSevenDays(Long tenantId);
+    List<ScreenFallingDTO.FallingDayStatInfo> queryEventsInSevenDays(Long tenantId);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/EventsService.java

@@ -26,7 +26,7 @@ public interface EventsService extends IService<Events> {
 
     long  countUserDevicesEvents(List<String> clientIds);
 
-    List<ScreenAlarmDTO.MonthStatInfo> queryEventsInSixMonths(Long tenantId);
+    List<ScreenAlarmDTO.AlarmMonthStatInfo> queryEventsInSixMonths(Long tenantId);
 
-    List<ScreenAlarmDTO.DayStatInfo> queryEventsInSevenDays(Long tenantId);
+    List<ScreenAlarmDTO.AlarmDayStatInfo> queryEventsInSevenDays(Long tenantId);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/EventListServiceImpl.java

@@ -96,7 +96,7 @@ public class EventListServiceImpl extends ServiceImpl<EventListMapper, EventList
     }
 
     @Override
-    public List<ScreenFallingDTO.MonthStatInfo> queryEventsInSixMonths(Long tenantId) {
+    public List<ScreenFallingDTO.FallingMonthStatInfo> queryEventsInSixMonths(Long tenantId) {
         LocalDate today = LocalDate.now();
         // 取六月前的第一天，包含当月  比如 今天是 九月八号，就取 四月一号
         LocalDate startDate = today.minusMonths(5).with(TemporalAdjusters.firstDayOfMonth());
@@ -104,7 +104,7 @@ public class EventListServiceImpl extends ServiceImpl<EventListMapper, EventList
     }
 
     @Override
-    public List<ScreenFallingDTO.DayStatInfo> queryEventsInSevenDays(Long tenantId) {
+    public List<ScreenFallingDTO.FallingDayStatInfo> queryEventsInSevenDays(Long tenantId) {
         LocalDate today = LocalDate.now();
         LocalDate startDate = today.minusDays(6);
         return this.baseMapper.queryEventsInSevenDays(tenantId, startDate);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/EventsServiceImpl.java

@@ -146,7 +146,7 @@ public class EventsServiceImpl extends ServiceImpl<EventsMapper, Events> impleme
     }
 
     @Override
-    public List<ScreenAlarmDTO.MonthStatInfo> queryEventsInSixMonths(Long tenantId) {
+    public List<ScreenAlarmDTO.AlarmMonthStatInfo> queryEventsInSixMonths(Long tenantId) {
         LocalDate today = LocalDate.now();
         // 取六月前的第一天，包含当月  比如 今天是 九月八号，就取 四月一号
         LocalDate startDate = today.minusMonths(5).with(TemporalAdjusters.firstDayOfMonth());
@@ -154,7 +154,7 @@ public class EventsServiceImpl extends ServiceImpl<EventsMapper, Events> impleme
     }
 
     @Override
-    public List<ScreenAlarmDTO.DayStatInfo> queryEventsInSevenDays(Long tenantId) {
+    public List<ScreenAlarmDTO.AlarmDayStatInfo> queryEventsInSevenDays(Long tenantId) {
         LocalDate today = LocalDate.now();
         LocalDate startDate = today.minusDays(6);
         return this.baseMapper.queryEventsInSevenDays(tenantId, startDate);