Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit dd754f0e by 杨伟程
Options

saas端--租户设备管理：查看-数据分析：月报下的表格的对应数据没有返回

parent 34c46add
Inline Side-by-side
Showing with 59 additions and 39 deletions
db/inti-elder.sql
...@@ -152,7 +152,7 @@ CREATE TABLE `plat_elder_medical_examination_info` ...@@ -152,7 +152,7 @@ CREATE TABLE `plat_elder_medical_examination_info`
CREATE TABLE `plat_elder_children_info` CREATE TABLE `plat_elder_children_info`
( (
`id` varchar(64) NOT NULL COMMENT 'id', `id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` varchar(600) NULL COMMENT '长者id', `elder_id` varchar(600) NULL COMMENT '长者id',
`openid` varchar(64) NOT NULL COMMENT 'openid', `openid` varchar(64) NOT NULL COMMENT 'openid',
`name` varchar(64) DEFAULT NULL COMMENT '姓名', `name` varchar(64) DEFAULT NULL COMMENT '姓名',
`phone` varchar(64) DEFAULT NULL COMMENT '手机号码', `phone` varchar(64) DEFAULT NULL COMMENT '手机号码',
...@@ -293,7 +293,7 @@ CREATE TABLE `plat_elder_sleep` ...@@ -293,7 +293,7 @@ CREATE TABLE `plat_elder_sleep`
`elder_id` VARCHAR(64) NOT NULL COMMENT '长者id', `elder_id` VARCHAR(64) NOT NULL COMMENT '长者id',
`start_sleep` datetime DEFAULT NULL COMMENT '入睡时间', `start_sleep` datetime DEFAULT NULL COMMENT '入睡时间',
`end_sleep` datetime DEFAULT NULL COMMENT '起床时间', `end_sleep` datetime DEFAULT NULL COMMENT '起床时间',
`happen_date` VARCHAR(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd', `happen_date` VARCHAR(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd',
`sleep_record` text DEFAULT NULL COMMENT '睡眠记录 区分时间段记录 [{"sleepType":"","startTime":"","endTime":""},{}]', `sleep_record` text DEFAULT NULL COMMENT '睡眠记录 区分时间段记录 [{"sleepType":"","startTime":"","endTime":""},{}]',
`create_date` datetime DEFAULT NULL COMMENT '创建时间', `create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_date` datetime DEFAULT NULL COMMENT '更新时间', `update_date` datetime DEFAULT NULL COMMENT '更新时间',
...@@ -316,7 +316,7 @@ CREATE TABLE `plat_elder_sleep_analysis` ...@@ -316,7 +316,7 @@ CREATE TABLE `plat_elder_sleep_analysis`
`sleep_time` VARCHAR(64) DEFAULT NULL COMMENT '睡眠时长', `sleep_time` VARCHAR(64) DEFAULT NULL COMMENT '睡眠时长',
`rest_time` VARCHAR(64) DEFAULT NULL COMMENT '休息时长', `rest_time` VARCHAR(64) DEFAULT NULL COMMENT '休息时长',
`sleep_evaluate` VARCHAR(64) DEFAULT NULL COMMENT '评价', `sleep_evaluate` VARCHAR(64) DEFAULT NULL COMMENT '评价',
`happen_date` VARCHAR(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd', `happen_date` VARCHAR(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd',
`create_date` datetime DEFAULT NULL COMMENT '创建时间', `create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_date` datetime DEFAULT NULL COMMENT '更新时间', `update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` CHAR(1) DEFAULT NULL COMMENT '删除标识', `del_flag` CHAR(1) DEFAULT NULL COMMENT '删除标识',
...@@ -329,46 +329,54 @@ CREATE TABLE `plat_elder_sleep_analysis` ...@@ -329,46 +329,54 @@ CREATE TABLE `plat_elder_sleep_analysis`
DEFAULT CHARSET = utf8mb4 DEFAULT CHARSET = utf8mb4
ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉分析'; ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉分析';
CREATE TABLE `plat_elder_breathe_abnormal` ( CREATE TABLE `plat_elder_breathe_abnormal`
`id` varchar(64) NOT NULL COMMENT 'id', (
`elder_id` varchar(64) NOT NULL COMMENT '长者id', `id` varchar(64) NOT NULL COMMENT 'id',
`breathe_analysis_id` varchar(64) NOT NULL COMMENT '呼吸分析id', `elder_id` varchar(64) NOT NULL COMMENT '长者id',
`happen_time` datetime NOT NULL COMMENT '发生时间', `breathe_analysis_id` varchar(64) NOT NULL COMMENT '呼吸分析id',
`type` varchar(32) DEFAULT NULL COMMENT '异常类型', `happen_time` datetime NOT NULL COMMENT '发生时间',
`value` varchar(64) DEFAULT NULL COMMENT '值', `type` varchar(32) DEFAULT NULL COMMENT '异常类型',
`create_date` datetime DEFAULT NULL COMMENT '创建时间', `value` varchar(64) DEFAULT NULL COMMENT '值',
`update_date` datetime DEFAULT NULL COMMENT '更新时间', `create_date` datetime DEFAULT NULL COMMENT '创建时间',
`del_flag` char(1) DEFAULT NULL COMMENT '删除标识', `update_date` datetime DEFAULT NULL COMMENT '更新时间',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人', `del_flag` char(1) DEFAULT NULL COMMENT '删除标识',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人', `create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
`tenant_id` varchar(64) DEFAULT NULL COMMENT '租户id', `update_by` varchar(64) DEFAULT NULL COMMENT '更新人',
PRIMARY KEY (`id`), `tenant_id` varchar(64) DEFAULT NULL COMMENT '租户id',
KEY `index_elder_id` (`elder_id`) USING BTREE PRIMARY KEY (`id`),
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='长者每天呼吸异常'; KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
ROW_FORMAT = COMPACT COMMENT ='长者每天呼吸异常';
CREATE TABLE `plat_elder_breathe_analysis` ( CREATE TABLE `plat_elder_breathe_analysis`
`id` varchar(64) NOT NULL COMMENT 'id', (
`elder_id` varchar(64) NOT NULL COMMENT '长者id', `id` varchar(64) NOT NULL COMMENT 'id',
`breathe_score` varchar(64) DEFAULT NULL COMMENT '睡眠评分', `elder_id` varchar(64) NOT NULL COMMENT '长者id',
`breathe_result` varchar(64) DEFAULT NULL COMMENT '睡眠结果', `breathe_score` varchar(64) DEFAULT NULL COMMENT '睡眠评分',
`breathe_evaluate` varchar(64) DEFAULT NULL COMMENT '评价', `breathe_result` varchar(64) DEFAULT NULL COMMENT '睡眠结果',
`avg_heart_rate` varchar(64) DEFAULT NULL COMMENT '平均心率', `breathe_evaluate` varchar(64) DEFAULT NULL COMMENT '评价',
`avg_breathe_rate` varchar(64) DEFAULT NULL COMMENT '平均呼吸率', `avg_heart_rate` varchar(64) DEFAULT NULL COMMENT '平均心率',
`happen_date` varchar(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd', `avg_breathe_rate` varchar(64) DEFAULT NULL COMMENT '平均呼吸率',
`create_date` datetime DEFAULT NULL COMMENT '创建时间', `happen_date` varchar(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd',
`update_date` datetime DEFAULT NULL COMMENT '更新时间', `create_date` datetime DEFAULT NULL COMMENT '创建时间',
`del_flag` char(1) DEFAULT NULL COMMENT '删除标识', `update_date` datetime DEFAULT NULL COMMENT '更新时间',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人', `del_flag` char(1) DEFAULT NULL COMMENT '删除标识',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人', `create_by` varchar(64) DEFAULT NULL COMMENT '创建人',
`tenant_id` varchar(64) DEFAULT NULL COMMENT '租户id', `update_by` varchar(64) DEFAULT NULL COMMENT '更新人',
PRIMARY KEY (`id`), `tenant_id` varchar(64) DEFAULT NULL COMMENT '租户id',
KEY `index_elder_id` (`elder_id`) USING BTREE PRIMARY KEY (`id`),
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='长者每天呼吸分析'; KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
ROW_FORMAT = COMPACT COMMENT ='长者每天呼吸分析';
CREATE TABLE `plat_elder_report_month` CREATE TABLE `plat_elder_report_month`
( (
`id` varchar(64) NOT NULL COMMENT 'id', `id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` VARCHAR(64) NOT NULL COMMENT '长者id', `elder_id` VARCHAR(64) NOT NULL COMMENT '长者id',
breathe_device_id VARCHAR(64) NULL COMMENT '呼吸心率设备id',
breathe_ori_device_id VARCHAR(64) NULL COMMENT '呼吸心率设备原始id',
day date NOT NULL COMMENT '日期', day date NOT NULL COMMENT '日期',
sleep_result varchar(64) NOT NULL COMMENT '睡眠结果', sleep_result varchar(64) NOT NULL COMMENT '睡眠结果',
heart_rate int NOT NULL COMMENT '心率', heart_rate int NOT NULL COMMENT '心率',
...@@ -389,7 +397,7 @@ CREATE TABLE `plat_elder_report_month` ...@@ -389,7 +397,7 @@ CREATE TABLE `plat_elder_report_month`
ALTER TABLE `dev_iot_yanglao_platform`.`plat_elder_sleep_analysis` ALTER TABLE `dev_iot_yanglao_platform`.`plat_elder_sleep_analysis`
ADD COLUMN `action_count` int(4) COMMENT '体动次数' AFTER `happen_date`, ADD COLUMN `action_count` int(4) COMMENT '体动次数' AFTER `happen_date`,
ADD COLUMN `turned_count` int(4) COMMENT '翻身次数' AFTER `action_count`; ADD COLUMN `turned_count` int(4) COMMENT '翻身次数' AFTER `action_count`;
ALTER TABLE `dev_iot_yanglao_platform`.`plat_elder_sleep` ALTER TABLE `dev_iot_yanglao_platform`.`plat_elder_sleep`
ADD COLUMN `elder_sleep_type` int(4) COMMENT '睡眠类型 1 睡眠 2 小憩' AFTER `happen_date`; ADD COLUMN `elder_sleep_type` int(4) COMMENT '睡眠类型 1 睡眠 2 小憩' AFTER `happen_date`;
......
server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderReportMonth.java
...@@ -27,6 +27,12 @@ public class PlatElderReportMonth extends BaseBusEntity { ...@@ -27,6 +27,12 @@ public class PlatElderReportMonth extends BaseBusEntity {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
@ApiModelProperty(value = "呼吸心率设备id")
private String breatheDeviceId;
@ApiModelProperty(value = "呼吸心率设备原始id")
private String breatheOriDeviceId;
@ApiModelProperty(value = "日期") @ApiModelProperty(value = "日期")
private LocalDate day; private LocalDate day;
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java
...@@ -127,9 +127,11 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport ...@@ -127,9 +127,11 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport
LocalDate end = LocalDateTimeUtils.getMonthMax(start); LocalDate end = LocalDateTimeUtils.getMonthMax(start);
List<PlatElderReportMonth> monthList = list(new QueryWrapper<PlatElderReportMonth>().lambda() List<PlatElderReportMonth> monthList = list(new QueryWrapper<PlatElderReportMonth>().lambda()
.eq(PlatElderReportMonth::getElderId, platElderIdDTO.getElderId()) .eq(StringUtils.isNotBlank(platElderIdDTO.getElderId()), PlatElderReportMonth::getElderId, platElderIdDTO.getElderId())
.eq(StringUtils.isNotBlank(platElderIdDTO.getDeviceId()), PlatElderReportMonth::getBreatheDeviceId, platElderIdDTO.getDeviceId())
.ge(PlatElderReportMonth::getDay, start) .ge(PlatElderReportMonth::getDay, start)
.le(PlatElderReportMonth::getDay, end) .le(PlatElderReportMonth::getDay, end)
.orderByAsc(PlatElderReportMonth::getDay)
); );
List<PlatElderReportMonthVO> voList = BeanDtoVoUtils.listVo(monthList, PlatElderReportMonthVO.class); List<PlatElderReportMonthVO> voList = BeanDtoVoUtils.listVo(monthList, PlatElderReportMonthVO.class);
...@@ -179,6 +181,10 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport ...@@ -179,6 +181,10 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport
List<DeviceInfoContentBreathe> breatheList = iotProductDeviceService.getDeviceLogByTimeRangeBreathe(platDevice.getOriDeviceId(), 2 * 24 * 3600, yesStart, yesEnd); List<DeviceInfoContentBreathe> breatheList = iotProductDeviceService.getDeviceLogByTimeRangeBreathe(platDevice.getOriDeviceId(), 2 * 24 * 3600, yesStart, yesEnd);
if (CollectionUtils.isNotEmpty(breatheList)) { if (CollectionUtils.isNotEmpty(breatheList)) {
reportMonth.setBreatheDeviceId(platDevice.getId());
reportMonth.setBreatheOriDeviceId(platDevice.getOriDeviceId());
reportMonth.setHeartRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getHr(), 0L, Long::sum) / breatheList.size())); reportMonth.setHeartRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getHr(), 0L, Long::sum) / breatheList.size()));
reportMonth.setRespiratoryRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getBr(), 0L, Long::sum) / breatheList.size())); reportMonth.setRespiratoryRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getBr(), 0L, Long::sum) / breatheList.size()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment