Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
cf93b476
authored
Dec 15, 2023
by
汪志阳
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:初始化config离床
parent
04e4f441
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
View file @
cf93b476
...
...
@@ -151,7 +151,7 @@ public class OffBedAlarm implements IAlarm {
Long
firstOffBedLong
=
alarmRedisDTO
.
getStartLong
();
long
currentTimeMillis
=
System
.
currentTimeMillis
();
LocalDateTime
nowTest
=
LocalDateTime
.
now
().
plusHours
(
6
);
LocalDateTime
nowTest
=
LocalDateTime
.
now
().
plusHours
(
5
).
plusMinutes
(
45
);
currentTimeMillis
=
nowTest
.
toInstant
(
ZoneOffset
.
of
(
"+8"
)).
toEpochMilli
();
log
.
info
(
"handleCrossDay,测试当前的时间:{},时间戳:{}"
,
nowTest
,
currentTimeMillis
);
boolean
isOverTime
=
(
currentTimeMillis
-
firstOffBedLong
)
/
1000
>=
duration
*
60
;
...
...
@@ -174,7 +174,7 @@ public class OffBedAlarm implements IAlarm {
return
;
}
// LocalDateTime now = LocalDateTime.now();
LocalDateTime
now
=
LocalDateTime
.
now
().
plusHours
(
6
);;
LocalDateTime
now
=
LocalDateTime
.
now
().
plusHours
(
5
).
plusMinutes
(
50
);;
LocalDateTime
startLocalDteTime
=
LocalDateTime
.
of
(
LocalDate
.
now
(),
startTime
);
if
(!
isInTime
)
{
long
mills
=
Duration
.
between
(
startLocalDteTime
,
now
).
toMillis
()
/
1000
;
...
...
@@ -195,7 +195,7 @@ public class OffBedAlarm implements IAlarm {
}
public
static
void
main
(
String
[]
args
)
{
LocalDateTime
now
=
LocalDateTime
.
now
().
plusHours
(
6
);
LocalDateTime
now
=
LocalDateTime
.
now
().
plusHours
(
5
).
plusMinutes
(
45
);
System
.
out
.
println
(
now
);
}
...
...
@@ -212,7 +212,7 @@ public class OffBedAlarm implements IAlarm {
Long
firstOffBedLong
=
alarmRedisDTO
.
getStartLong
();
long
currentTimeMillis
=
System
.
currentTimeMillis
();
LocalDateTime
nowTest
=
LocalDateTime
.
now
().
plusHours
(
6
);
LocalDateTime
nowTest
=
LocalDateTime
.
now
().
plusHours
(
5
).
plusMinutes
(
45
);
currentTimeMillis
=
nowTest
.
toInstant
(
ZoneOffset
.
of
(
"+8"
)).
toEpochMilli
();
boolean
isOverTime
=
(
currentTimeMillis
-
firstOffBedLong
)
/
1000
>=
duration
*
60
;
LocalDateTime
firstOffBedTime
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
firstOffBedLong
),
ZoneOffset
.
of
(
"+8"
));
...
...
@@ -239,7 +239,7 @@ public class OffBedAlarm implements IAlarm {
return
;
}
LocalDateTime
now
=
LocalDateTime
.
now
().
plusHours
(
6
);
LocalDateTime
now
=
LocalDateTime
.
now
().
plusHours
(
5
).
plusMinutes
(
45
);
if
(!
isInTime
&&
now
.
isAfter
(
startLocalDteTime
)
&&
now
.
isBefore
(
endLocalDteTime
))
{
long
mills
=
Duration
.
between
(
startLocalDteTime
,
now
).
toMillis
()
/
1000
;
boolean
noInOverTime
=
mills
>=
duration
*
60
;
...
...
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