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
4ba1a43d
authored
Dec 27, 2023
by
汪志阳
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:bug修复
parent
8394ca14
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
View file @
4ba1a43d
...
@@ -63,6 +63,7 @@ public class PlatElderSleepController {
...
@@ -63,6 +63,7 @@ public class PlatElderSleepController {
@ApiOperation
(
"测试"
)
@ApiOperation
(
"测试"
)
@PostMapping
(
"test2"
)
@PostMapping
(
"test2"
)
@AuthIgnore
@AuthIgnore
@TenantIdIgnore
public
ApiResponseEntity
<
Void
>
heartRespiratoryTask
()
{
public
ApiResponseEntity
<
Void
>
heartRespiratoryTask
()
{
platElderBreatheDayStatService
.
heartRespiratoryTask
();
platElderBreatheDayStatService
.
heartRespiratoryTask
();
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
...
@@ -71,6 +72,7 @@ public class PlatElderSleepController {
...
@@ -71,6 +72,7 @@ public class PlatElderSleepController {
@ApiOperation
(
"测试"
)
@ApiOperation
(
"测试"
)
@GetMapping
(
"test3"
)
@GetMapping
(
"test3"
)
@AuthIgnore
@AuthIgnore
@TenantIdIgnore
public
ApiResponseEntity
<
List
<
PlatElderBreatheAnalysis
>>
elderHeartRespiratoryAnalysisTask
(
@RequestParam
Integer
month
,
public
ApiResponseEntity
<
List
<
PlatElderBreatheAnalysis
>>
elderHeartRespiratoryAnalysisTask
(
@RequestParam
Integer
month
,
@RequestParam
Integer
day
)
{
@RequestParam
Integer
day
)
{
return
ApiResponseUtils
.
success
(
platElderBreatheAnalysisService
.
elderHeartRespiratoryAnalysisTask
(
month
,
day
));
return
ApiResponseUtils
.
success
(
platElderBreatheAnalysisService
.
elderHeartRespiratoryAnalysisTask
(
month
,
day
));
...
@@ -79,6 +81,7 @@ public class PlatElderSleepController {
...
@@ -79,6 +81,7 @@ public class PlatElderSleepController {
@ApiOperation
(
"测试"
)
@ApiOperation
(
"测试"
)
@GetMapping
(
"test4"
)
@GetMapping
(
"test4"
)
@AuthIgnore
@AuthIgnore
@TenantIdIgnore
public
ApiResponseEntity
<
List
<
PlatElderSleepAnalysis
>>
elderSleepSleepAnalysisTask
(
@RequestParam
Integer
month
,
public
ApiResponseEntity
<
List
<
PlatElderSleepAnalysis
>>
elderSleepSleepAnalysisTask
(
@RequestParam
Integer
month
,
@RequestParam
Integer
day
)
{
@RequestParam
Integer
day
)
{
return
ApiResponseUtils
.
success
(
platElderSleepService
.
elderSleepSleepAnalysisTask
(
month
,
day
));
return
ApiResponseUtils
.
success
(
platElderSleepService
.
elderSleepSleepAnalysisTask
(
month
,
day
));
...
...
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
View file @
4ba1a43d
...
@@ -705,7 +705,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
...
@@ -705,7 +705,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
dayRestTime
+=
elderSleep
.
getInterval
();
dayRestTime
+=
elderSleep
.
getInterval
();
}
}
}
}
//
platElderSleepService.saveBatch(elderSleepList);
platElderSleepService
.
saveBatch
(
elderSleepList
);
String
score
=
calculateScores
(
daySleepTime
,
dayRestTime
,
deepTime
,
soberTime
,
lightTime
,
evaluateStandardReport
);
String
score
=
calculateScores
(
daySleepTime
,
dayRestTime
,
deepTime
,
soberTime
,
lightTime
,
evaluateStandardReport
);
EvaluateReportVO
sleepReport
=
saasSleepEvaluateReportService
.
getByScore
(
Long
.
parseLong
(
score
));
EvaluateReportVO
sleepReport
=
saasSleepEvaluateReportService
.
getByScore
(
Long
.
parseLong
(
score
));
...
@@ -723,7 +723,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
...
@@ -723,7 +723,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
elderSleepAnalysis
.
setSleepEvaluate
(
sleepReport
.
getEvaluate
());
elderSleepAnalysis
.
setSleepEvaluate
(
sleepReport
.
getEvaluate
());
elderSleepAnalysis
.
setOriDeviceId
(
platDevice
.
getOriDeviceId
());
elderSleepAnalysis
.
setOriDeviceId
(
platDevice
.
getOriDeviceId
());
result
.
add
(
elderSleepAnalysis
);
result
.
add
(
elderSleepAnalysis
);
//
platElderSleepAnalysisService.save(elderSleepAnalysis);
platElderSleepAnalysisService
.
save
(
elderSleepAnalysis
);
}
}
return
result
;
return
result
;
}
}
...
...
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