Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
rx
Commits
8cfec9e6
Commit
8cfec9e6
authored
Aug 26, 2024
by
wujipeng
Browse files
调整
parent
e9c11ac2
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/rx/service/impl/EquipmentServiceImpl.java
View file @
8cfec9e6
...
...
@@ -75,19 +75,20 @@ public class EquipmentServiceImpl
@Override
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());
// LocalDateTime startOfDay = today.atStartOfDay()
.plusHours(8)
;
// LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().
plusHours(8).
minusNanos(1);
// LocalDateTime startOfDay = today.atStartOfDay();
// LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().minusNanos(1);
// 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
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
);
}
...
...
src/main/resources/application.yml
View file @
8cfec9e6
...
...
@@ -15,8 +15,7 @@ spring:
port
:
27017
host
:
192.168.10.3
authentication-database
:
admin
jackson
:
time-zone
:
Asia/Shanghai
mybatis-plus
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment