ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

二次版本提交

Browse Source
This commit is contained in:
hzj
2025-07-29 20:58:15 +08:00
parent 1eb64fadae
commit 4c0816a829
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java
View File

@@ -5,6 +5,7 @@ import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@@ -31,8 +32,8 @@ public class LargeScreenCountParam extends BaseParam {
private Integer state; private Integer state;
private Integer sendResult; private Integer sendResult;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime startTime; private LocalDate startTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime endTime; private LocalDate endTime;
} }

12
event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
View File

@@ -950,8 +950,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
@Override @Override
public List<SubStationCountVO> substationCount(LargeScreenCountParam largeScreenCountParam) { public List<SubStationCountVO> substationCount(LargeScreenCountParam largeScreenCountParam) {
LocalDateTime startTime = largeScreenCountParam.getStartTime(); LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay();
LocalDateTime endTime = largeScreenCountParam.getEndTime(); LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay());
List<SubStationCountVO> subStationCountVOS = new ArrayList<>(); List<SubStationCountVO> subStationCountVOS = new ArrayList<>();
List<PqLine> pqLineList = (List<PqLine>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); List<PqLine> pqLineList = (List<PqLine>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList");
@@ -1015,8 +1015,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
@Override @Override
public Page<EventDetailVO> eventPage(LargeScreenCountParam largeScreenCountParam) { public Page<EventDetailVO> eventPage(LargeScreenCountParam largeScreenCountParam) {
Page<PqsEventdetail> pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); Page<PqsEventdetail> pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize());
LocalDateTime startTime = largeScreenCountParam.getStartTime(); LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay();
LocalDateTime endTime = largeScreenCountParam.getEndTime(); LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay());
List<Integer> deptslineIds = (List<Integer>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId()); List<Integer> deptslineIds = (List<Integer>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId());
@@ -1074,8 +1074,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
@Override @Override
public Page<DeviceDTO> devicePage(LargeScreenCountParam largeScreenCountParam) { public Page<DeviceDTO> devicePage(LargeScreenCountParam largeScreenCountParam) {
LocalDateTime startTime = largeScreenCountParam.getStartTime(); LocalDateTime startTime = largeScreenCountParam.getStartTime().atStartOfDay();
LocalDateTime endTime = largeScreenCountParam.getEndTime(); LocalDateTime endTime = LocalDateTimeUtil.endOfDay(largeScreenCountParam.getEndTime().atStartOfDay());
Page<DeviceDTO> pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); Page<DeviceDTO> pqsEventdetailPage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize());
List<PqLine> pqLineList = (List<PqLine>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList"); List<PqLine> pqLineList = (List<PqLine>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+"pqLineList");
List<Integer> deptslineIds = (List<Integer>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId()); List<Integer> deptslineIds = (List<Integer>) redisUtil.getObjectByKey( NAME_KEY+ StrUtil.DASHED+largeScreenCountParam.getDeptId());