lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加默认时间范围不超过当前时间

Browse Source
This commit is contained in:
lihongjie0209
2024-04-22 11:26:34 +08:00
parent 19180a0ec8
commit 5d9fa32cb0
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
View File

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -136,7 +137,7 @@ public class PdcDeviceDataService
""",
Tuple.class);
nativeQuery.setParameter("startTime", request.getStartTime());
nativeQuery.setParameter("endTime", request.getEndTime());
nativeQuery.setParameter("endTime", request.getEndTime().isAfter(LocalDateTime.now())? LocalDateTime.now(): request.getEndTime());
nativeQuery.setParameter("deviceGroup", request.getDeviceGroup());
Duration duration = Duration.between(request.getStartTime(), request.getEndTime());

2
src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/dto/GetRealTImeReportRequest.java
View File

@@ -12,5 +12,5 @@ public class GetRealTImeReportRequest {
private LocalDateTime startTime;
// private LocalDateTime endTime;
private LocalDateTime endTime;
}

6
src/main/java/cn/lihongjie/coal/pdcDeviceRealTimeData/service/PdcDeviceRealTimeDataService.java
View File

@@ -164,9 +164,13 @@ public class PdcDeviceRealTimeDataService
request.getStartTime() != null
? request.getStartTime()
: LocalDateTime.now().toLocalDate().atStartOfDay());
LocalDateTime endTime = request.getEndTime() != null ? request.getEndTime() : LocalDateTime.now();
if (endTime.isAfter(LocalDateTime.now())){
endTime = LocalDateTime.now();
}
nativeQuery.setParameter(
"endTime",
LocalDateTime.now().toLocalDate().atTime(23, 59, 59));
endTime);
List list =
JpaUtils.convertTuplesToMap(