Forráskód Böngészése

feat(stats): 添加事件统计的日期过滤功能

-为fallingCount统计添加当日时间范围过滤
- 为alarmCount统计添加当日时间范围过滤- 引入LocalDate用于日期范围查询
- 移除未使用的UserConstants和StpUtil导入
hxd 5 napja
szülő
commit
83198cd673

+ 5 - 2
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebStatsGatewayImpl.java

@@ -1,8 +1,6 @@
 package com.hfln.portal.infrastructure.gateway.impl;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hfln.portal.common.constant.UserConstants;
 import com.hfln.portal.common.dto.data.device.OnoffDTO;
 import com.hfln.portal.common.dto.data.event.EventListDTO;
 import com.hfln.portal.common.dto.data.event.EventsDTO;
@@ -31,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -157,9 +156,13 @@ public class WebStatsGatewayImpl implements WebStatsGateway {
 
         res.setFallingCount(Math.toIntExact(eventListService.lambdaQuery()
                 .eq(EventList::getTenantId, params.getTenantId())
+                .ge(EventList::getCreateTime, LocalDate.now())
+                .lt(EventList::getCreateTime, LocalDate.now().plusDays(1))
                 .count()));
         res.setAlarmCount(Math.toIntExact(eventsService.lambdaQuery()
                 .eq(Events::getTenantId, params.getTenantId())
+                .ge(Events::getCreateTime, LocalDate.now())
+                .lt(Events::getCreateTime, LocalDate.now().plusDays(1))
                 .count()));