Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 66efaf4c by 杨伟程
Options

长者管理建表

parents 06cd1cb7 183e662e
Inline Side-by-side
Showing with 19 additions and 43 deletions
.gitignore
...@@ -17,6 +17,7 @@ target/ ...@@ -17,6 +17,7 @@ target/
/**/.idea /**/.idea
/**/*.iws /**/*.iws
/**/*.iml /**/*.iml
/**/**/*.iml
/**/*.ipr /**/*.ipr
.idea/ .idea/
/**/.idea/ /**/.idea/
......
db/inti.sql
...@@ -15,25 +15,8 @@ CREATE TABLE `elder` ( ...@@ -15,25 +15,8 @@ CREATE TABLE `elder` (
`height` varchar(64) DEFAULT NULL COMMENT '身高', `height` varchar(64) DEFAULT NULL COMMENT '身高',
`weight` varchar(64) DEFAULT NULL COMMENT '体重', `weight` varchar(64) DEFAULT NULL COMMENT '体重',
`register_address` varchar(64) DEFAULT NULL COMMENT '户籍地址', `register_address` varchar(64) DEFAULT NULL COMMENT '户籍地址',
`register_province_code` varchar(64) DEFAULT NULL COMMENT '户籍省code', `address` varchar(256) DEFAULT NULL COMMENT '家庭地址',
`register_province_name` varchar(64) DEFAULT NULL COMMENT '户籍省名称', `space_id` varchar(64) DEFAULT NULL COMMENT '床位id',
`register_city_code` varchar(64) DEFAULT NULL COMMENT '户籍市code',
`register_city_name` varchar(64) DEFAULT NULL COMMENT '户籍市名称',
`register_district_code` varchar(64) DEFAULT NULL COMMENT '户籍区code',
`register_district_name` varchar(64) DEFAULT NULL COMMENT '户籍区名称',
`register_address_detail` varchar(64) DEFAULT NULL COMMENT '户籍地址详细',
`home_address` varchar(256) DEFAULT NULL COMMENT '家庭地址',
`home_province_code` varchar(64) DEFAULT NULL COMMENT '家庭省code',
`home_province_name` varchar(64) DEFAULT NULL COMMENT '家庭省名称',
`home_city_code` varchar(64) DEFAULT NULL COMMENT '家庭市code',
`home_city_name` varchar(64) DEFAULT NULL COMMENT '家庭市名称',
`home_district_code` varchar(64) DEFAULT NULL COMMENT '家庭区code',
`home_district_name` varchar(64) DEFAULT NULL COMMENT '家庭区名称',
`home_address_detail` varchar(64) DEFAULT NULL COMMENT '家庭地址详细',
`space_id` varchar(64) DEFAULT NULL COMMENT '空间id',
`room_id` varchar(64) DEFAULT NULL COMMENT '房间id',
`bed_id` varchar(64) DEFAULT NULL COMMENT '床位id',
`space_path` varchar(64) DEFAULT NULL COMMENT '空间-房间-床位路径',
`remark` varchar(1024) DEFAULT NULL COMMENT '备注', `remark` varchar(1024) DEFAULT 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 '创建时间',
...@@ -46,7 +29,7 @@ CREATE TABLE `elder` ( ...@@ -46,7 +29,7 @@ CREATE TABLE `elder` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者基本信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者基本信息';
CREATE TABLE `elder_social_relation` ( CREATE TABLE `s_elder_social_relation` (
`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',
`name` varchar(128) NOT NULL COMMENT '姓名', `name` varchar(128) NOT NULL COMMENT '姓名',
...@@ -76,7 +59,7 @@ CREATE TABLE `elder_health_info` ( ...@@ -76,7 +59,7 @@ CREATE TABLE `elder_health_info` (
`respiratory_rate ` VARCHAR ( 64 ) DEFAULT NULL COMMENT '呼吸率，范围用-区分', `respiratory_rate ` VARCHAR ( 64 ) DEFAULT NULL COMMENT '呼吸率，范围用-区分',
`respiratory_exception_time` VARCHAR ( 64 ) DEFAULT NULL COMMENT '呼吸率异常时间 单位：s', `respiratory_exception_time` VARCHAR ( 64 ) DEFAULT NULL COMMENT '呼吸率异常时间 单位：s',
`heart_rate` VARCHAR ( 64 ) DEFAULT NULL COMMENT '心率，范围用-区分', `heart_rate` VARCHAR ( 64 ) DEFAULT NULL COMMENT '心率，范围用-区分',
`heart_exception_time` VARCHAR ( 64 ) DEFAULT NULL COMMENT '心率异常时间 单位 s', `heart__exception_time` VARCHAR ( 64 ) DEFAULT NULL COMMENT '心率异常时间 单位 s',
`remark` VARCHAR ( 1024 ) DEFAULT NULL COMMENT '备注', `remark` VARCHAR ( 1024 ) DEFAULT 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 '创建时间',
...@@ -101,7 +84,7 @@ CREATE TABLE `elder_other_info` ( ...@@ -101,7 +84,7 @@ CREATE TABLE `elder_other_info` (
`children_quantity` INT ( 4 ) DEFAULT NULL COMMENT '子女数量', `children_quantity` INT ( 4 ) DEFAULT NULL COMMENT '子女数量',
`other_children_quantity` INT ( 4 ) DEFAULT NULL COMMENT '外地子女数量', `other_children_quantity` INT ( 4 ) DEFAULT NULL COMMENT '外地子女数量',
`politics_status` VARCHAR ( 64 ) DEFAULT NULL COMMENT '政治面貌', `politics_status` VARCHAR ( 64 ) DEFAULT NULL COMMENT '政治面貌',
`work_unit` VARCHAR ( 64 ) DEFAULT NULL COMMENT '工作单位', `workunit` VARCHAR ( 64 ) DEFAULT 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 '更新者',
...@@ -128,7 +111,7 @@ CREATE TABLE `elder_medical_examination_info` ( ...@@ -128,7 +111,7 @@ CREATE TABLE `elder_medical_examination_info` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者体检报告信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者体检报告信息';
CREATE TABLE `elder_children_info` ( CREATE TABLE `children_info` (
`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',
`openid` varchar(64) NOT NULL COMMENT 'openid', `openid` varchar(64) NOT NULL COMMENT 'openid',
...@@ -143,7 +126,7 @@ CREATE TABLE `elder_children_info` ( ...@@ -143,7 +126,7 @@ CREATE TABLE `elder_children_info` (
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ', `tenant_id` varchar(64) COLLATE utf8mb4_general_ci 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 COMMENT='长者子女账号'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者其他信息';
...@@ -372,7 +355,7 @@ CREATE TABLE `bed` ( ...@@ -372,7 +355,7 @@ CREATE TABLE `bed` (
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记', `del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ', `tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='床位管理'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='床位管理';
CREATE TABLE `region_setting` ( CREATE TABLE `region_setting` (
`id` varchar(64) NOT NULL COMMENT 'id', `id` varchar(64) NOT NULL COMMENT 'id',
......
server-common/src/main/java/com/makeit/common/entity/BaseEntity.java
...@@ -35,7 +35,7 @@ public class BaseEntity implements Serializable { ...@@ -35,7 +35,7 @@ public class BaseEntity implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间", required = false) @ApiModelProperty(value = "创建时间", required = false)
@TableField(value = "created_at", fill = FieldFill.INSERT, typeHandler = LocalDateTimeTypeHandler.class) @TableField(value = "create_date", fill = FieldFill.INSERT, typeHandler = LocalDateTimeTypeHandler.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createdAt; private LocalDateTime createdAt;
...@@ -43,18 +43,10 @@ public class BaseEntity implements Serializable { ...@@ -43,18 +43,10 @@ public class BaseEntity implements Serializable {
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间", required = false) @ApiModelProperty(value = "更新时间", required = false)
@TableField(value = "updated_at", fill = FieldFill.INSERT_UPDATE, typeHandler = LocalDateTimeTypeHandler.class) @TableField(value = "update_date", fill = FieldFill.INSERT_UPDATE, typeHandler = LocalDateTimeTypeHandler.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
//
// /**
// * 删除时间（逻辑删除）
// */
// @TableLogic(value="NULL",delval = "NOW()")
// @ApiModelProperty(value = "删除时间",required = false)
// @JsonFormat(pattern="yyyy-mm-dd HH:mm:ss")
// private LocalDateTime deletedAt;
@TableLogic @TableLogic
@TableField(select = false, fill = FieldFill.INSERT) @TableField(select = false, fill = FieldFill.INSERT)
...@@ -62,10 +54,10 @@ public class BaseEntity implements Serializable { ...@@ -62,10 +54,10 @@ public class BaseEntity implements Serializable {
@ApiModelProperty(value = "创建人名称") @ApiModelProperty(value = "创建人名称")
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private String createdByName; private String createBy;
@ApiModelProperty(value = "更新人名称") @ApiModelProperty(value = "更新人名称")
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
private String updatedByName; private String updateBy;
} }
server-common/src/main/java/com/makeit/config/mybatis/objecthandler/UserObjectHandler.java
...@@ -26,14 +26,14 @@ public class UserObjectHandler implements MetaObjectHandlerInternal { ...@@ -26,14 +26,14 @@ public class UserObjectHandler implements MetaObjectHandlerInternal {
// handler.setFieldValByName(BaseEntity.Fields.createdByName, commonUserVO.getName(), metaObject); // handler.setFieldValByName(BaseEntity.Fields.createdByName, commonUserVO.getName(), metaObject);
// } // }
if (metaObject.hasSetter(BaseEntity.Fields.createdByName)) { if (metaObject.hasSetter(BaseEntity.Fields.createBy)) {
if (!Boolean.TRUE.equals(NoFillUtil.getCreate())) { if (!Boolean.TRUE.equals(NoFillUtil.getCreate())) {
handler.setFieldValByName(BaseEntity.Fields.createdByName, commonUserVO.getName(), metaObject); handler.setFieldValByName(BaseEntity.Fields.createBy, commonUserVO.getName(), metaObject);
} }
} }
if (metaObject.hasSetter(BaseEntity.Fields.updatedByName)) { if (metaObject.hasSetter(BaseEntity.Fields.updateBy)) {
handler.setFieldValByName(BaseEntity.Fields.updatedByName, commonUserVO.getName(), metaObject); handler.setFieldValByName(BaseEntity.Fields.updateBy, commonUserVO.getName(), metaObject);
} }
if (metaObject.hasSetter("createdById")) { if (metaObject.hasSetter("createdById")) {
...@@ -50,9 +50,9 @@ public class UserObjectHandler implements MetaObjectHandlerInternal { ...@@ -50,9 +50,9 @@ public class UserObjectHandler implements MetaObjectHandlerInternal {
CommonUserVO commonUserVO = CommonUserUtil.getUser(); CommonUserVO commonUserVO = CommonUserUtil.getUser();
if (metaObject.hasSetter(BaseEntity.Fields.updatedByName)) { if (metaObject.hasSetter(BaseEntity.Fields.updateBy)) {
if (!Boolean.TRUE.equals(NoFillUtil.getUpdate())) { if (!Boolean.TRUE.equals(NoFillUtil.getUpdate())) {
handler.setFieldValByName(BaseEntity.Fields.updatedByName, commonUserVO.getName(), metaObject);; handler.setFieldValByName(BaseEntity.Fields.updateBy, commonUserVO.getName(), metaObject);;
} }
} }
......
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