Commit 8cfec9e6 authored by wujipeng's avatar wujipeng
Browse files

调整

parent e9c11ac2
...@@ -75,19 +75,20 @@ public class EquipmentServiceImpl ...@@ -75,19 +75,20 @@ public class EquipmentServiceImpl
@Override @Override
public List<DeviceVO> getTodayByDeviceId(String deviceId) { public List<DeviceVO> getTodayByDeviceId(String deviceId) {
LocalDate today = LocalDate.now(ZoneId.systemDefault());
LocalDateTime startOfDay = today.atStartOfDay();
LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().minusNanos(1);
return deviceDao.findByDeviceIdAndTimestampBetweenOrderByTimestamp(deviceId, startOfDay, endOfDay);
// LocalDate today = LocalDate.now(ZoneId.systemDefault()); // LocalDate today = LocalDate.now(ZoneId.systemDefault());
// LocalDateTime startOfDay = today.atStartOfDay().plusHours(8); // LocalDateTime startOfDay = today.atStartOfDay();
// LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().plusHours(8).minusNanos(1); // LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().minusNanos(1);
// return deviceDao.findByDeviceIdAndTimestampBetweenOrderByTimestamp(deviceId, startOfDay, endOfDay); // return deviceDao.findByDeviceIdAndTimestampBetweenOrderByTimestamp(deviceId, startOfDay, endOfDay);
LocalDate today = LocalDate.now(ZoneId.systemDefault());
LocalDateTime startOfDay = today.atStartOfDay().plusHours(8);
LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().plusHours(8).minusNanos(1);
return deviceDao.findByDeviceIdAndTimestampBetweenOrderByTimestamp(deviceId, startOfDay, endOfDay);
} }
@Override @Override
public List<DeviceVO> getFormerByDeviceId(EquipmentDTO equipmentDTO) { public List<DeviceVO> getFormerByDeviceId(EquipmentDTO equipmentDTO) {
Date sevenDaysAgo = Date.from(Instant.now().minus(7, ChronoUnit.DAYS)); // Date sevenDaysAgo = Date.from(Instant.now().minus(7, ChronoUnit.DAYS));
Date sevenDaysAgo = Date.from(Instant.now().minus(7, ChronoUnit.DAYS).plus(8, ChronoUnit.HOURS));
return deviceDao.findAllByDeviceIdAndTimestampGreaterThanEqualOrderByTimestamp(equipmentDTO.getDeviceId(),sevenDaysAgo); return deviceDao.findAllByDeviceIdAndTimestampGreaterThanEqualOrderByTimestamp(equipmentDTO.getDeviceId(),sevenDaysAgo);
} }
......
...@@ -15,8 +15,7 @@ spring: ...@@ -15,8 +15,7 @@ spring:
port: 27017 port: 27017
host: 192.168.10.3 host: 192.168.10.3
authentication-database: admin authentication-database: admin
jackson:
time-zone: Asia/Shanghai
mybatis-plus: mybatis-plus:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment