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
58bbfd5d
authored
Jan 10, 2024
by
罗志长
Committed by
汪志阳
Jan 29, 2024
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: 睡眠数据租户id
parent
5d403491
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
View file @
58bbfd5d
...
...
@@ -650,7 +650,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
return
elderSleepAnalysis
;
}
private
List
<
PlatElderSleep
>
saveElderSleep
(
SleepTimeDTO
sleepTimeDTO
,
String
platElderId
,
String
currentDate
)
{
private
List
<
PlatElderSleep
>
saveElderSleep
(
SleepTimeDTO
sleepTimeDTO
,
String
platElderId
,
String
tenantId
,
String
currentDate
)
{
List
<
PlatElderSleep
>
elderSleepList
=
new
ArrayList
<>();
List
<
SleepTimeAnalysisVO
>
deepList
=
sleepTimeDTO
.
getDeepList
();
List
<
SleepTimeAnalysisVO
>
moderateList
=
sleepTimeDTO
.
getMidList
();
...
...
@@ -742,6 +742,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
platElderSleep
.
setStartSleep
(
LocalDateTime
.
parse
(
analysisVO
.
getStartTime
(),
DEFAULT_FORMATTER
));
platElderSleep
.
setEndSleep
(
LocalDateTime
.
parse
(
analysisVO
.
getEndTime
(),
DEFAULT_FORMATTER
));
platElderSleep
.
setElderId
(
platElderId
);
platElderSleep
.
setTenantId
(
tenantId
);
platElderSleep
.
setElderSleepType
(
SleepTypeEnum
.
RESTING
.
getType
());
platElderSleep
.
setSleepRecord
(
rangeList
);
platElderSleep
.
setInterval
(
analysisVO
.
getInterval
());
...
...
@@ -844,7 +845,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
getUp
(
totalMap
,
riseLeaveThreshold
,
riseActionDuration
,
repeatSleepThreshold
,
sleepTimeAnalysisVOList
,
sleepCountDTO
);
//浅睡
SleepTimeDTO
sleepTimeDTO
=
groupSleepData
(
sleepTimeAnalysisVOList
);
List
<
PlatElderSleep
>
platElderSleeps
=
saveElderSleep
(
sleepTimeDTO
,
elder
.
getId
(),
currentDate
);
List
<
PlatElderSleep
>
platElderSleeps
=
saveElderSleep
(
sleepTimeDTO
,
elder
.
getId
(),
elder
.
getTenantId
(),
currentDate
);
PlatElderSleepAnalysis
platElderSleepAnalysis
=
savePlatElderSleepAnalysis
(
sleepTimeDTO
,
evaluateStandardReport
,
elder
.
getId
(),
currentDate
,
sleepCountDTO
,
tenantId
,
platDevice
.
getOriDeviceId
());
ElderSleepAnalysisVO
analysisVO
=
BeanUtil
.
copyProperties
(
platElderSleepAnalysis
,
ElderSleepAnalysisVO
.
class
);
...
...
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