From 4c0816a829b0a430566d04ed716c05601a0bb15c Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 29 Jul 2025 20:58:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=89=88=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/LargeScreenCountParam.java | 9 +++++---- .../service/impl/LargeScreenCountServiceImpl.java | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java index 547bc3f8..c432eab6 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java @@ -5,6 +5,7 @@ import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -31,8 +32,8 @@ public class LargeScreenCountParam extends BaseParam { private Integer state; private Integer sendResult; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime startTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime endTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index 4d386dce..a2a36df9 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -950,8 +950,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { @Override public List substationCount(LargeScreenCountParam largeScreenCountParam) { - LocalDateTime startTime = largeScreenCountParam.getStartTime(); - LocalDateTime endTime = largeScreenCountParam.getEndTime(); + LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); + LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); List subStationCountVOS = new ArrayList<>(); List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); @@ -1015,8 +1015,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { @Override public Page eventPage(LargeScreenCountParam largeScreenCountParam) { Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); - LocalDateTime startTime = largeScreenCountParam.getStartTime(); - LocalDateTime endTime = largeScreenCountParam.getEndTime(); + LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); + LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); List deptslineIds = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId()); @@ -1074,8 +1074,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { @Override public Page devicePage(LargeScreenCountParam largeScreenCountParam) { - LocalDateTime startTime = largeScreenCountParam.getStartTime(); - LocalDateTime endTime = largeScreenCountParam.getEndTime(); + LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay(); + LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay()); Page pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); List pqLineList = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); List deptslineIds = (List) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId());