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