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
832ac43e
authored
Sep 18, 2023
by
杨伟程
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
老人统计
parent
3be302f2
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
131 additions
and
32 deletions
server-generator/src/main/java/com/makeit/com/makeit/controller/PlatElderReportMonthController.java
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportDayController.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderDayReportDayService.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderReportMonthService.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java
server-generator/src/main/java/com/makeit/com/makeit/controller/PlatElderReportMonthController.java
deleted
100644 → 0
View file @
3be302f2
package
com
.
makeit
.
com
.
makeit
.
controller
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* <p>
* 长者月报 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-14
*/
@RestController
@RequestMapping
(
"/plat-elder-report-month"
)
public
class
PlatElderReportMonthController
{
}
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportDayController.java
View file @
832ac43e
...
@@ -49,19 +49,19 @@ public class PlatElderReportDayController {
...
@@ -49,19 +49,19 @@ public class PlatElderReportDayController {
@ApiOperation
(
"心率呼吸评价"
)
@ApiOperation
(
"心率呼吸评价"
)
@PostMapping
(
"heartRespiratoryEvaluation"
)
@PostMapping
(
"heartRespiratoryEvaluation"
)
public
ApiResponseEntity
<
PlatElderHeartRespiratoryEvaluationVO
>
heartRespiratoryEvaluation
(
@RequestBody
PlatElderReportDTO
platElderIdDTO
)
{
public
ApiResponseEntity
<
PlatElderHeartRespiratoryEvaluationVO
>
heartRespiratoryEvaluation
(
@RequestBody
PlatElderReportDTO
platElderIdDTO
)
{
return
null
;
return
ApiResponseUtils
.
success
(
platElderDayReportDayService
.
heartRespiratoryEvaluation
(
platElderIdDTO
))
;
}
}
@ApiOperation
(
"心率异常记录"
)
@ApiOperation
(
"心率异常记录"
)
@PostMapping
(
"heartExceptionRecordList"
)
@PostMapping
(
"heartExceptionRecordList"
)
public
ApiResponseEntity
<
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>>
heartExceptionRecordList
(
@RequestBody
PlatElderReportDTO
platElderIdDTO
)
{
public
ApiResponseEntity
<
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>>
heartExceptionRecordList
(
@RequestBody
PlatElderReportDTO
platElderIdDTO
)
{
return
null
;
return
ApiResponseUtils
.
success
(
platElderDayReportDayService
.
heartExceptionRecordList
(
platElderIdDTO
))
;
}
}
@ApiOperation
(
"呼吸率异常记录"
)
@ApiOperation
(
"呼吸率异常记录"
)
@PostMapping
(
"respiratoryExceptionRecordList"
)
@PostMapping
(
"respiratoryExceptionRecordList"
)
public
ApiResponseEntity
<
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>>
respiratoryExceptionRecordList
(
@RequestBody
PlatElderReportDTO
platElderIdDTO
)
{
public
ApiResponseEntity
<
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>>
respiratoryExceptionRecordList
(
@RequestBody
PlatElderReportDTO
platElderIdDTO
)
{
return
null
;
return
ApiResponseUtils
.
success
(
platElderDayReportDayService
.
respiratoryExceptionRecordList
(
platElderIdDTO
))
;
}
}
@ApiOperation
(
"心率呼吸率"
)
@ApiOperation
(
"心率呼吸率"
)
...
...
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderDayReportDayService.java
View file @
832ac43e
package
com
.
makeit
.
service
.
platform
.
elder
;
package
com
.
makeit
.
service
.
platform
.
elder
;
import
com.makeit.common.response.ApiResponseEntity
;
import
com.makeit.dto.platform.elder.PlatElderReportDTO
;
import
com.makeit.dto.platform.elder.PlatElderReportDTO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.report.day.PlatElderSleepDiagramVO
;
import
com.makeit.vo.platform.elder.report.day.*
;
import
com.makeit.vo.platform.elder.report.day.PlatElderSleepEvaluationVO
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
...
@@ -23,8 +26,18 @@ public interface PlatElderDayReportDayService {
...
@@ -23,8 +26,18 @@ public interface PlatElderDayReportDayService {
List
<
PlatElderSleepDiagramVO
>
sleepDiagram
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderSleepDiagramVO
>
sleepDiagram
(
PlatElderReportDTO
platElderIdDTO
);
PlatElderHeartRespiratoryEvaluationVO
heartRespiratoryEvaluation
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>
heartExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>
respiratoryExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderRealTimeHeartRespiratoryVO
>
heartRespiratory
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderRealTimeHeartRespiratoryVO
>
heartRespiratory
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderBehaviorExceptionRecordVO
>
behaviorExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
);
List
<
String
>
failRecordList
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderCoordinateVO
>
coordinateList
(
String
elderId
,
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
);
List
<
PlatElderCoordinateVO
>
coordinateList
(
String
elderId
,
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
);
List
<
PlatElderCoordinateVO
>
coordinateList
(
PlatElderReportDTO
platElderIdDTO
);
List
<
PlatElderCoordinateVO
>
coordinateList
(
PlatElderReportDTO
platElderIdDTO
);
...
...
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderReportMonthService.java
View file @
832ac43e
package
com
.
makeit
.
service
.
platform
.
elder
;
package
com
.
makeit
.
service
.
platform
.
elder
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.makeit.common.response.ApiResponseEntity
;
import
com.makeit.dto.platform.elder.PlatElderReportDTO
;
import
com.makeit.dto.platform.elder.PlatElderReportDTO
;
import
com.makeit.entity.platform.elder.PlatElderReportMonth
;
import
com.makeit.entity.platform.elder.PlatElderReportMonth
;
import
com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO
;
import
com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
java.util.List
;
import
java.util.List
;
...
...
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
View file @
832ac43e
...
@@ -2,12 +2,16 @@ package com.makeit.service.platform.elder.impl;
...
@@ -2,12 +2,16 @@ package com.makeit.service.platform.elder.impl;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.makeit.dto.platform.elder.PlatElderReportDTO
;
import
com.makeit.dto.platform.elder.PlatElderReportDTO
;
import
com.makeit.entity.platform.alarm.PlatAlarmRecord
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.elder.PlatElderBreatheAnalysis
;
import
com.makeit.entity.platform.elder.PlatElderSleep
;
import
com.makeit.entity.platform.elder.PlatElderSleep
;
import
com.makeit.entity.platform.elder.PlatElderSleepAnalysis
;
import
com.makeit.entity.platform.elder.PlatElderSleepAnalysis
;
import
com.makeit.enums.platform.alarm.PlatAlarmConfigEnum
;
import
com.makeit.module.iot.service.IotProductDeviceService
;
import
com.makeit.module.iot.service.IotProductDeviceService
;
import
com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe
;
import
com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe
;
import
com.makeit.module.iot.vo.breathe.DeviceInfoContentSpace
;
import
com.makeit.module.iot.vo.breathe.DeviceInfoContentSpace
;
import
com.makeit.service.platform.alarm.PlatAlarmRecordService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.elder.*
;
import
com.makeit.service.platform.elder.*
;
import
com.makeit.utils.LongTimestampUtil
;
import
com.makeit.utils.LongTimestampUtil
;
...
@@ -16,9 +20,7 @@ import com.makeit.utils.data.validate.CollectionUtils;
...
@@ -16,9 +20,7 @@ import com.makeit.utils.data.validate.CollectionUtils;
import
com.makeit.utils.time.LocalDateTimeUtils
;
import
com.makeit.utils.time.LocalDateTimeUtils
;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO
;
import
com.makeit.vo.platform.elder.report.day.PlatElderSleepDiagramContentVO
;
import
com.makeit.vo.platform.elder.report.day.*
;
import
com.makeit.vo.platform.elder.report.day.PlatElderSleepDiagramVO
;
import
com.makeit.vo.platform.elder.report.day.PlatElderSleepEvaluationVO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -47,6 +49,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
...
@@ -47,6 +49,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
private
PlatElderSleepAnalysisService
platElderSleepAnalysisService
;
private
PlatElderSleepAnalysisService
platElderSleepAnalysisService
;
@Autowired
@Autowired
private
PlatElderBreatheAnalysisService
platElderBreatheAnalysisService
;
private
PlatAlarmRecordService
platAlarmRecordService
;
@Autowired
private
IotProductDeviceService
iotProductDeviceService
;
private
IotProductDeviceService
iotProductDeviceService
;
@Autowired
@Autowired
...
@@ -140,6 +147,74 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
...
@@ -140,6 +147,74 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
}
}
@Override
@Override
public
PlatElderHeartRespiratoryEvaluationVO
heartRespiratoryEvaluation
(
PlatElderReportDTO
platElderIdDTO
)
{
LocalDate
now
=
Optional
.
ofNullable
(
platElderIdDTO
.
getNow
()).
orElse
(
LocalDate
.
now
());
LocalDateTime
start
=
dayStartNow
(
now
);
LocalDateTime
end
=
dayEndNow
(
now
);
PlatElderHeartRespiratoryEvaluationVO
platElderSleepEvaluationVO
=
new
PlatElderHeartRespiratoryEvaluationVO
();
String
nowString
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
).
format
(
now
);
PlatElderBreatheAnalysis
platElderSleepAnalysis
=
platElderBreatheAnalysisService
.
getOne
(
new
QueryWrapper
<
PlatElderBreatheAnalysis
>().
lambda
()
.
eq
(
PlatElderBreatheAnalysis:
:
getElderId
,
platElderIdDTO
.
getElderId
())
.
eq
(
PlatElderBreatheAnalysis:
:
getCurrentDate
,
nowString
)
);
if
(
platElderSleepAnalysis
==
null
)
{
return
platElderSleepEvaluationVO
;
}
platElderSleepEvaluationVO
.
setScore
(
Integer
.
valueOf
(
platElderSleepAnalysis
.
getBreatheScore
()
+
""
));
platElderSleepEvaluationVO
.
setResult
(
platElderSleepAnalysis
.
getBreatheResult
());
platElderSleepEvaluationVO
.
setEvaluation
(
platElderSleepAnalysis
.
getBreatheEvaluate
());
platElderSleepEvaluationVO
.
setHeartRate
(
Integer
.
valueOf
(
platElderSleepAnalysis
.
getAvgHeartRate
()
+
""
));
platElderSleepEvaluationVO
.
setRespiratoryRate
(
Integer
.
valueOf
(
platElderSleepAnalysis
.
getAvgBreatheRate
()
+
""
));
return
platElderSleepEvaluationVO
;
}
private
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>
heartRespiratoryExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
,
String
alarmType
)
{
PlatDevice
device
=
platElderRealTimeService
.
getBreathDevice
(
platElderIdDTO
.
getElderId
(),
platElderIdDTO
.
getDeviceId
());
if
(
device
==
null
)
{
return
new
ArrayList
<>(
10
);
}
List
<
PlatAlarmRecord
>
recordList
=
platAlarmRecordService
.
list
(
new
QueryWrapper
<
PlatAlarmRecord
>().
lambda
()
.
eq
(
PlatAlarmRecord:
:
getAlarmType
,
alarmType
)
.
eq
(
PlatAlarmRecord:
:
getDeviceId
,
device
.
getId
())
.
orderByDesc
(
PlatAlarmRecord:
:
getAlarmDate
)
);
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>
voList
=
StreamUtil
.
map
(
recordList
,
e
->
{
PlatElderHeartRespiratoryEvaluationRecordVO
vo
=
new
PlatElderHeartRespiratoryEvaluationRecordVO
();
vo
.
setTime
(
e
.
getAlarmDate
());
vo
.
setStatus
(
e
.
getRemark
());
vo
.
setRate
(
Integer
.
valueOf
(
e
.
getAbnormalValue
()
+
""
));
return
vo
;
});
return
voList
;
}
@Override
public
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>
heartExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
)
{
return
heartRespiratoryExceptionRecordList
(
platElderIdDTO
,
PlatAlarmConfigEnum
.
AlarmTypeEnum
.
HEART
.
getValue
());
}
@Override
public
List
<
PlatElderHeartRespiratoryEvaluationRecordVO
>
respiratoryExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
)
{
return
heartRespiratoryExceptionRecordList
(
platElderIdDTO
,
PlatAlarmConfigEnum
.
AlarmTypeEnum
.
BREATHE
.
getValue
());
}
@Override
public
List
<
PlatElderRealTimeHeartRespiratoryVO
>
heartRespiratory
(
PlatElderReportDTO
platElderIdDTO
)
{
public
List
<
PlatElderRealTimeHeartRespiratoryVO
>
heartRespiratory
(
PlatElderReportDTO
platElderIdDTO
)
{
PlatDevice
platDevice
=
platElderRealTimeService
.
getBreathDevice
(
platElderIdDTO
.
getElderId
(),
platElderIdDTO
.
getDeviceId
());
PlatDevice
platDevice
=
platElderRealTimeService
.
getBreathDevice
(
platElderIdDTO
.
getElderId
(),
platElderIdDTO
.
getDeviceId
());
...
@@ -170,6 +245,41 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
...
@@ -170,6 +245,41 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
}
}
@Override
@Override
public
List
<
PlatElderBehaviorExceptionRecordVO
>
behaviorExceptionRecordList
(
PlatElderReportDTO
platElderIdDTO
)
{
List
<
PlatDevice
>
platDeviceList
=
platElderRealTimeService
.
getSpaceDevice
(
platElderIdDTO
.
getElderId
(),
platElderIdDTO
.
getDeviceId
());
if
(
CollectionUtils
.
isEmpty
(
platDeviceList
))
{
return
new
ArrayList
<>(
10
);
}
List
<
PlatAlarmRecord
>
recordList
=
platAlarmRecordService
.
list
(
new
QueryWrapper
<
PlatAlarmRecord
>().
lambda
()
.
eq
(
PlatAlarmRecord:
:
getAlarmType
,
PlatAlarmConfigEnum
.
AlarmTypeEnum
.
BEHAVIOR
.
getValue
())
.
in
(
PlatAlarmRecord:
:
getDeviceId
,
StreamUtil
.
mapId
(
platDeviceList
,
PlatDevice:
:
getId
))
.
orderByDesc
(
PlatAlarmRecord:
:
getAlarmDate
)
);
List
<
PlatElderBehaviorExceptionRecordVO
>
voList
=
StreamUtil
.
map
(
recordList
,
e
->
{
PlatElderBehaviorExceptionRecordVO
vo
=
new
PlatElderBehaviorExceptionRecordVO
();
vo
.
setTime
(
e
.
getAlarmDate
());
//vo.setRoomId(e.get);
//vo.setRoomName(e.get);
vo
.
setDuration
(
Integer
.
valueOf
(
e
.
getAbnormalValue
()
+
""
));
return
vo
;
});
return
voList
;
}
@Override
public
List
<
String
>
failRecordList
(
PlatElderReportDTO
platElderIdDTO
)
{
return
null
;
}
@Override
public
List
<
PlatElderCoordinateVO
>
coordinateList
(
String
elderId
,
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
)
{
public
List
<
PlatElderCoordinateVO
>
coordinateList
(
String
elderId
,
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
)
{
List
<
PlatDevice
>
platDeviceList
=
platElderRealTimeService
.
getSpaceDevice
(
elderId
,
deviceId
);
List
<
PlatDevice
>
platDeviceList
=
platElderRealTimeService
.
getSpaceDevice
(
elderId
,
deviceId
);
...
...
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java
View file @
832ac43e
...
@@ -7,7 +7,6 @@ import com.makeit.entity.platform.elder.PlatElderReportMonth;
...
@@ -7,7 +7,6 @@ import com.makeit.entity.platform.elder.PlatElderReportMonth;
import
com.makeit.mapper.platform.elder.PlatElderReportMonthMapper
;
import
com.makeit.mapper.platform.elder.PlatElderReportMonthMapper
;
import
com.makeit.service.platform.elder.PlatElderReportMonthService
;
import
com.makeit.service.platform.elder.PlatElderReportMonthService
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.StreamUtil
;
import
com.makeit.utils.time.LocalDateTimeUtils
;
import
com.makeit.utils.time.LocalDateTimeUtils
;
import
com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO
;
import
com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
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