Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 282a8239 by 杨伟程
Options

小程序端设备更新

parent 196e5182
Inline Side-by-side
Showing with 67 additions and 35 deletions
db/inti-elder.sql
...@@ -270,12 +270,12 @@ CREATE TABLE `plat_device_other` ...@@ -270,12 +270,12 @@ CREATE TABLE `plat_device_other`
installation varchar(64) NULL COMMENT '设备安装方式', installation varchar(64) NULL COMMENT '设备安装方式',
indicator_light varchar(64) NULL COMMENT '开关指示灯', indicator_light varchar(64) NULL COMMENT '开关指示灯',
attribute varchar(3000) NULL COMMENT '设备属性json', attribute varchar(3000) NULL COMMENT '设备属性json',
wifi_name varchar(200) NOT NULL COMMENT 'wifi名称', wifi_name varchar(200) NULL COMMENT 'wifi名称',
wifi_password varchar(200) NOT NULL COMMENT 'wifi密码', wifi_password varchar(200) NULL COMMENT 'wifi密码',
protocol_address varchar(100) NOT NULL COMMENT '协议地址', protocol_address varchar(100) NULL COMMENT '协议地址',
protocol_port varchar(100) NOT NULL COMMENT '协议端口', protocol_port varchar(100) NULL COMMENT '协议端口',
protocol_account varchar(200) NOT NULL COMMENT '协议账号', protocol_account varchar(200) NULL COMMENT '协议账号',
protocol_password varchar(200) NOT NULL COMMENT '协议密码', protocol_password varchar(200) NULL COMMENT '协议密码',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者', `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间', `create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者', `update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
...@@ -287,39 +287,59 @@ CREATE TABLE `plat_device_other` ...@@ -287,39 +287,59 @@ CREATE TABLE `plat_device_other`
DEFAULT CHARSET = utf8mb4 COMMENT ='设备其他信息'; DEFAULT CHARSET = utf8mb4 COMMENT ='设备其他信息';
CREATE TABLE `plat_elder_sleep` ( CREATE TABLE `plat_elder_sleep`
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id', (
`elder_id` VARCHAR ( 64 ) NOT NULL COMMENT '长者id', `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 '起床时间',
`current_date` VARCHAR ( 64 ) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd', `current_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 NOT NULL COMMENT '创建时间', `create_date` datetime NOT NULL COMMENT '创建时间',
`update_date` datetime NOT NULL COMMENT '更新时间', `update_date` datetime NOT NULL COMMENT '更新时间',
`del_flag` CHAR ( 1 ) DEFAULT NULL COMMENT '删除标识', `del_flag` CHAR(1) DEFAULT NULL COMMENT '删除标识',
`create_by` VARCHAR ( 64 ) NOT NULL COMMENT '创建人', `create_by` VARCHAR(64) NOT NULL COMMENT '创建人',
`update_by` VARCHAR ( 64 ) NOT NULL COMMENT '更新人', `update_by` VARCHAR(64) NOT NULL COMMENT '更新人',
`tenant_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '租户id', `tenant_id` VARCHAR(64) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY ( `id` ), PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉记录'; ) ENGINE = INNODB
DEFAULT CHARSET = utf8mb4
ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉记录';
CREATE TABLE `plat_elder_sleep_analysis` ( CREATE TABLE `plat_elder_sleep_analysis`
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id', (
`elder_id` VARCHAR ( 64 ) NOT NULL COMMENT '长者id', `id` VARCHAR(64) NOT NULL COMMENT 'id',
`sleep_score` VARCHAR ( 64 ) DEFAULT NULL COMMENT '睡眠评分', `elder_id` VARCHAR(64) NOT NULL COMMENT '长者id',
`sleep_result` VARCHAR ( 64 ) DEFAULT NULL COMMENT '睡眠结果', `sleep_score` VARCHAR(64) DEFAULT NULL COMMENT '睡眠评分',
`sleep_time` VARCHAR ( 64 ) DEFAULT NULL COMMENT '睡眠时长', `sleep_result` VARCHAR(64) DEFAULT NULL COMMENT '睡眠结果',
`rest_time` VARCHAR ( 64 ) DEFAULT NULL COMMENT '休息时长', `sleep_time` VARCHAR(64) DEFAULT NULL COMMENT '睡眠时长',
`sleep_evaluate` VARCHAR ( 64 ) DEFAULT NULL COMMENT '评价', `rest_time` VARCHAR(64) DEFAULT NULL COMMENT '休息时长',
`current_date` VARCHAR ( 64 ) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd', `sleep_evaluate` VARCHAR(64) DEFAULT NULL COMMENT '评价',
`current_date` VARCHAR(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd',
`create_date` datetime NOT NULL COMMENT '创建时间', `create_date` datetime NOT NULL COMMENT '创建时间',
`update_date` datetime NOT NULL COMMENT '更新时间', `update_date` datetime NOT NULL COMMENT '更新时间',
`del_flag` CHAR ( 1 ) DEFAULT NULL COMMENT '删除标识', `del_flag` CHAR(1) DEFAULT NULL COMMENT '删除标识',
`create_by` VARCHAR ( 64 ) NOT NULL COMMENT '创建人', `create_by` VARCHAR(64) NOT NULL COMMENT '创建人',
`update_by` VARCHAR ( 64 ) NOT NULL COMMENT '更新人', `update_by` VARCHAR(64) NOT NULL COMMENT '更新人',
`tenant_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '租户id', `tenant_id` VARCHAR(64) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY ( `id` ), PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉分析'; ) ENGINE = INNODB
DEFAULT CHARSET = utf8mb4
ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉分析';
CREATE TABLE `plat_elder_report_month`
(
`id` varchar(64) NOT NULL COMMENT 'id',
day date NOT NULL COMMENT '日期',
sleep_result varchar(64) NOT NULL COMMENT '睡眠结果',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
del_flag char(1) not null comment ' 删除标志 0否 1是 ',
`tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='长者月报';
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
...@@ -142,11 +142,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev ...@@ -142,11 +142,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
other = new PlatDeviceOther(); other = new PlatDeviceOther();
} }
String otherId = other.getId();
BeanUtils.copyProperties(dto, db); BeanUtils.copyProperties(dto, db);
db.setId(id); db.setId(id);
BeanUtils.copyProperties(dto, other); BeanUtils.copyProperties(dto, other);
other.setId(otherId);
other.setDeviceId(id); other.setDeviceId(id);
other.setOriDeviceId(db.getOriDeviceId());
updateById(db); updateById(db);
...@@ -169,11 +173,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev ...@@ -169,11 +173,15 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
other = new PlatDeviceOther(); other = new PlatDeviceOther();
} }
String otherId = other.getId();
BeanUtils.copyProperties(dto, db); BeanUtils.copyProperties(dto, db);
db.setId(id); db.setId(id);
BeanUtils.copyProperties(dto, other); BeanUtils.copyProperties(dto, other);
other.setId(otherId);
other.setDeviceId(id); other.setDeviceId(id);
other.setOriDeviceId(db.getOriDeviceId());
updateById(db); updateById(db);
......
server-web/src/main/resources/application-dev.yml
server: server:
port: 8888 port: 10005
servlet: servlet:
encoding: encoding:
charset: UTF-8 charset: UTF-8
...@@ -123,12 +123,12 @@ mqtt: ...@@ -123,12 +123,12 @@ mqtt:
wx: wx:
miniapp: miniapp:
config: config:
appid: wx48720402e3fdbe0f #微信小程序的appid
secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret
# appid: wx48720402e3fdbe0f #微信小程序的appid # appid: wx48720402e3fdbe0f #微信小程序的appid
# secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret # secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret
appid: wx5138507da6bf5709 #微信小程序的appid
secret: 2cdf04b11dce20f48402a1fef1cc9842 #微信小程序的Secret
token: #微信小程序消息服务器配置的token token: #微信小程序消息服务器配置的token
aesKey: #微信小程序消息服务器配置的EncodingAESKey aesKey: #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON msgDataFormat: JSON
......
server-web/src/main/resources/application-test.yml
...@@ -122,6 +122,10 @@ wx: ...@@ -122,6 +122,10 @@ wx:
config: config:
appid: wx48720402e3fdbe0f #微信小程序的appid appid: wx48720402e3fdbe0f #微信小程序的appid
secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret
# appid: wx48720402e3fdbe0f #微信小程序的appid
# secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret
token: #微信小程序消息服务器配置的token token: #微信小程序消息服务器配置的token
aesKey: #微信小程序消息服务器配置的EncodingAESKey aesKey: #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON msgDataFormat: JSON
......
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