Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 30aef15a by 李小龙
Options

Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

parents 0758472d a6b1eb13
Inline Side-by-side
Showing with 199 additions and 222 deletions
db/inti.sql
-- 长者管理
CREATE TABLE `elder` (
`id` varchar(64) NOT NULL COMMENT 'id',
`name` varchar(128) NOT NULL COMMENT '姓名',
`age` int(4) DEFAULT NULL COMMENT '年龄',
`sex` char(1) DEFAULT NULL COMMENT '性别 1 男 2 女',
`certificate_type` char(1) DEFAULT NULL COMMENT '证件类型 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件',
`certificate_number` varchar(128) DEFAULT NULL COMMENT '证件号码',
`phone` varchar(64) DEFAULT NULL COMMENT '手机号码',
`telephone` varchar(64) DEFAULT NULL COMMENT '固定电话',
`birth` varchar(64) DEFAULT NULL COMMENT '出生日期',
`nation` varchar(64) DEFAULT NULL COMMENT '名族',
`blood` varchar(64) DEFAULT NULL COMMENT '血型',
`height` varchar(64) DEFAULT NULL COMMENT '身高',
`weight` varchar(64) DEFAULT NULL COMMENT '体重',
`register_address` varchar(64) DEFAULT NULL COMMENT '户籍地址',
`address` varchar(256) DEFAULT NULL COMMENT '家庭地址',
`space_id` varchar(64) DEFAULT NULL COMMENT '床位id',
`remark` varchar(1024) DEFAULT NULL COMMENT '备注',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`name` VARCHAR ( 128 ) NOT NULL COMMENT '姓名',
`age` INT ( 4 ) DEFAULT NULL COMMENT '年龄',
`sex` CHAR ( 1 ) DEFAULT NULL COMMENT '性别 1 男 2 女',
`certificate_type` CHAR ( 1 ) DEFAULT NULL COMMENT '证件类型 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件',
`certificate_number` VARCHAR ( 128 ) DEFAULT NULL COMMENT '证件号码',
`phone` VARCHAR ( 64 ) DEFAULT NULL COMMENT '手机号码',
`telephone` VARCHAR ( 64 ) DEFAULT NULL COMMENT '固定电话',
`birth` VARCHAR ( 64 ) DEFAULT NULL COMMENT '出生日期',
`nation` VARCHAR ( 64 ) DEFAULT NULL COMMENT '名族',
`blood` VARCHAR ( 64 ) DEFAULT NULL COMMENT '血型',
`height` VARCHAR ( 64 ) DEFAULT NULL COMMENT '身高',
`weight` VARCHAR ( 64 ) DEFAULT NULL COMMENT '体重',
`register_address` VARCHAR ( 64 ) DEFAULT NULL COMMENT '户籍地址',
`address` VARCHAR ( 256 ) DEFAULT NULL COMMENT '家庭地址',
`space_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '床位id',
`remark` VARCHAR ( 1024 ) DEFAULT NULL COMMENT '备注',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
UNIQUE KEY `name_idx` (`name`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者基本信息';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
UNIQUE KEY `name_idx` ( `name` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '长者基本信息';
CREATE TABLE `s_elder_social_relation` (
`id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` varchar(64) NOT NULL COMMENT '长者id',
`name` varchar(128) NOT NULL COMMENT '姓名',
`relation` varchar(4) DEFAULT NULL COMMENT '关系 1、配偶 2、父女',
`phone` varchar(32) DEFAULT NULL COMMENT '联系电话',
`id_card` varchar(32) DEFAULT NULL COMMENT '身份证号码',
`emergency_contact` TINYINT(4) DEFAULT 0 COMMENT '是否紧急联系人 1 是 0否',
`remark` varchar(1024) DEFAULT NULL COMMENT '备注',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`elder_id` VARCHAR ( 64 ) NOT NULL COMMENT '长者id',
`name` VARCHAR ( 128 ) NOT NULL COMMENT '姓名',
`relation` VARCHAR ( 4 ) DEFAULT NULL COMMENT '关系 1、配偶 2、父女',
`phone` VARCHAR ( 32 ) DEFAULT NULL COMMENT '联系电话',
`id_card` VARCHAR ( 32 ) DEFAULT NULL COMMENT '身份证号码',
`emergency_contact` TINYINT ( 4 ) DEFAULT 0 COMMENT '是否紧急联系人 1 是 0否',
`remark` VARCHAR ( 1024 ) DEFAULT NULL COMMENT '备注',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者社会关系';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
KEY `index_elder_id` ( `elder_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '长者社会关系';
CREATE TABLE `elder_health_info` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
......@@ -66,12 +64,11 @@ CREATE TABLE `elder_health_info` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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` ),
KEY `index_elder_id` ( `elder_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '长者健康状态';
CREATE TABLE `elder_other_info` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`elder_id` VARCHAR ( 64 ) NOT NULL COMMENT '长者id',
......@@ -90,108 +87,101 @@ CREATE TABLE `elder_other_info` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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` ),
KEY `index_elder_id` ( `elder_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '长者其他信息';
CREATE TABLE `elder_medical_examination_info` (
`id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` varchar(64) NOT NULL COMMENT '长者id',
`report_id` varchar(64) DEFAULT NULL COMMENT '体检报告',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`elder_id` VARCHAR ( 64 ) NOT NULL COMMENT '长者id',
`report_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '体检报告',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者体检报告信息';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
KEY `index_elder_id` ( `elder_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '长者体检报告信息';
CREATE TABLE `children_info` (
`id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` varchar(64) NOT NULL COMMENT '长者id',
`openid` varchar(64) NOT NULL COMMENT 'openid',
`name` varchar(64) DEFAULT NULL COMMENT '姓名',
`phone` varchar(64) DEFAULT NULL COMMENT '手机号码',
`org_id` varchar(64) DEFAULT NULL COMMENT '关联机构',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`elder_id` VARCHAR ( 64 ) NOT NULL COMMENT '长者id',
`openid` VARCHAR ( 64 ) NOT NULL COMMENT 'openid',
`name` VARCHAR ( 64 ) DEFAULT NULL COMMENT '姓名',
`phone` VARCHAR ( 64 ) DEFAULT NULL COMMENT '手机号码',
`org_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '关联机构',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者其他信息';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
KEY `index_elder_id` ( `elder_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '长者其他信息';
CREATE TABLE `dict_type` (
`id` varchar(64) NOT NULL COMMENT 'id',
`code` varchar(64) DEFAULT NULL '类型编码',
`name` varchar(64) DEFAULT NULL '类型名称',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`code` VARCHAR ( 64 ) DEFAULT NULL '类型编码',
`name` VARCHAR ( 64 ) DEFAULT NULL '类型名称',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字典类型';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '字典类型';
CREATE TABLE `dict_info` (
`id` varchar(64) NOT NULL COMMENT 'id',
`dict_type_id` varchar(64) NOT NULL COMMENT '字典类型id',
`name` varchar(64) DEFAULT NULL COMMENT '字典名称',
`value` varchar(64) DEFAULT NULL COMMENT '字典值',
`sort` int(4) DEFAULT NULL COMMENT '排序',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`dict_type_id` VARCHAR ( 64 ) NOT NULL COMMENT '字典类型id',
`name` VARCHAR ( 64 ) DEFAULT NULL COMMENT '字典名称',
`value` VARCHAR ( 64 ) DEFAULT NULL COMMENT '字典值',
`sort` INT ( 4 ) DEFAULT NULL COMMENT '排序',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字典信息';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '字典信息';
CREATE TABLE `sys_file` (
`id` varchar(64) NOT NULL DEFAULT '' COMMENT '主键',
`name` varchar(1000) DEFAULT NULL COMMENT '文件名',
`path` varchar(564) DEFAULT NULL COMMENT '物理路径',
`type` varchar(264) DEFAULT NULL COMMENT '文件类型',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
`size` int(64) DEFAULT NULL COMMENT '文件大小',
`del_flag` int(64) DEFAULT NULL COMMENT '逻辑删除标记（0：显示；1：隐藏）',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL DEFAULT '' COMMENT '主键',
`name` VARCHAR ( 1000 ) DEFAULT NULL COMMENT '文件名',
`path` VARCHAR ( 564 ) DEFAULT NULL COMMENT '物理路径',
`type` VARCHAR ( 264 ) DEFAULT NULL COMMENT '文件类型',
`remarks` VARCHAR ( 255 ) DEFAULT NULL COMMENT '备注信息',
`size` INT ( 64 ) DEFAULT NULL COMMENT '文件大小',
`del_flag` INT ( 64 ) DEFAULT NULL COMMENT '逻辑删除标记（0：显示；1：隐藏）',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='文件管理';
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8 ROW_FORMAT = DYNAMIC COMMENT = '文件管理';
CREATE TABLE `sys_user` (
`id` varchar(64) NOT NULL COMMENT 'id',
`name` varchar(128) NOT NULL COMMENT '姓名',
`phone` varchar(64) DEFAULT NULL COMMENT '手机号码',
`email` varchar(64) DEFAULT NULL COMMENT '邮箱',
`password` varchar(64) DEFAULT NULL COMMENT '密码',
`remark` varchar(1024) DEFAULT NULL COMMENT '描述',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`name` VARCHAR ( 128 ) NOT NULL COMMENT '姓名',
`phone` VARCHAR ( 64 ) DEFAULT NULL COMMENT '手机号码',
`email` VARCHAR ( 64 ) DEFAULT NULL COMMENT '邮箱',
`password` VARCHAR ( 64 ) DEFAULT NULL COMMENT '密码',
`remark` VARCHAR ( 1024 ) DEFAULT NULL COMMENT '描述',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='人员管理';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '人员管理';
CREATE TABLE `sys_role` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
......@@ -202,26 +192,25 @@ CREATE TABLE `sys_role` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '角色管理';
CREATE TABLE `sys_user_role` (
`id` char(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT ' id ',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
`user_id` varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 用户id ',
`role_id` varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 角色id ',
`id` CHAR ( 64 ) COLLATE utf8mb4_general_ci NOT NULL COMMENT ' id ',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
`user_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 用户id ',
`role_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 角色id ',
`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` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
KEY `tnt_auth_user_role_role_id_index` (`role_id`),
KEY `tnt_auth_user_role_user_id_index` (`user_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT=' 用户角色关联表 ';
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
KEY `tnt_auth_user_role_role_id_index` ( `role_id` ),
KEY `tnt_auth_user_role_user_id_index` ( `user_id` )
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = ' 用户角色关联表 ';
CREATE TABLE `sys_org` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
......@@ -235,11 +224,10 @@ CREATE TABLE `sys_org` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '组织管理';
CREATE TABLE `sys_role_org` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`role_id` VARCHAR ( 64 ) NOT NULL COMMENT '角色id',
......@@ -249,53 +237,54 @@ CREATE TABLE `sys_role_org` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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` ),
KEY index_role_id ( `role_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '角色机构关联';
CREATE TABLE `sys_menu` (
`id` varchar(64) NOT NULL COMMENT '编号',
`parent_id` varchar(64) DEFAULT NULL COMMENT '父级编号',
`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '名称',
`sort` int(4) DEFAULT NULL COMMENT '排序',
`href` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT '链接',
`target` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '目标',
`icon` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '图标',
`is_show` char(1) DEFAULT NULL COMMENT '是否在菜单中显示',
`permission` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '权限标识',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT '编号',
`parent_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '父级编号',
`name` VARCHAR ( 100 ) CHARACTER
SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '名称',
`sort` INT ( 4 ) DEFAULT NULL COMMENT '排序',
`href` text CHARACTER
SET utf8 COLLATE utf8_bin COMMENT '链接',
`target` VARCHAR ( 20 ) CHARACTER
SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '目标',
`icon` VARCHAR ( 100 ) CHARACTER
SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '图标',
`is_show` CHAR ( 1 ) DEFAULT NULL COMMENT '是否在菜单中显示',
`permission` VARCHAR ( 200 ) CHARACTER
SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '权限标识',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '备注信息',
`menu_type` char(1) DEFAULT NULL COMMENT '0:功能菜单 1：菜单 2：按钮 3：数据权限',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`cache_flag` int(1) DEFAULT '0' COMMENT '缓存 0 否 1 是 默认 0',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
KEY `sys_menu_parent_id` (`parent_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单表';
`remarks` VARCHAR ( 255 ) CHARACTER
SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '备注信息',
`menu_type` CHAR ( 1 ) DEFAULT NULL COMMENT '0:功能菜单 1：菜单 2：按钮 3：数据权限',
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`cache_flag` INT ( 1 ) DEFAULT '0' COMMENT '缓存 0 否 1 是 默认 0',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
KEY `sys_menu_parent_id` ( `parent_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8 ROW_FORMAT = DYNAMIC COMMENT = '菜单表';
CREATE TABLE `sys_role_menus` (
`id` varchar(64) NOT NULL COMMENT 'id',
`role_id` varchar(64) NOT NULL COMMENT '角色id',
`menu_id` varchar(64) NOT NULL COMMENT '菜单id',
`menu_type` char(1) DEFAULT NULL COMMENT '0:功能菜单 1：菜单 2：按钮 3：数据权限',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`role_id` VARCHAR ( 64 ) NOT NULL COMMENT '角色id',
`menu_id` VARCHAR ( 64 ) NOT NULL COMMENT '菜单id',
`menu_type` CHAR ( 1 ) DEFAULT NULL COMMENT '0:功能菜单 1：菜单 2：按钮 3：数据权限',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`),
KEY index_role_id (`role_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色菜单关联';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ),
KEY index_role_id ( `role_id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '角色菜单关联';
CREATE TABLE `space` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
......@@ -308,7 +297,7 @@ CREATE TABLE `space` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '空间管理';
......@@ -323,11 +312,11 @@ CREATE TABLE `room` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '房间管理';
-- 待完善 区域设置表
-- 待完善
CREATE TABLE `region_setting` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`room_id` VARCHAR ( 64 ) NOT NULL COMMENT '房间id',
......@@ -337,40 +326,41 @@ CREATE TABLE `region_setting` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '区域管理';
CREATE TABLE `bed` (
`id` varchar(64) NOT NULL COMMENT 'id',
`name` varchar(128) NOT NULL COMMENT '床位名称 床位1，床位2',
`room_id` varchar(64) NOT NULL COMMENT '空间id',
`equipment_id` varchar(64） DEFAULT NULL COMMENT '设备id',
`status` TINYINT(1） DEFAULT 1 COMMENT '是否空闲 1 是 0 否 ',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`name` VARCHAR ( 128 ) NOT NULL COMMENT '床位名称 床位1，床位2',
`room_id` VARCHAR ( 64 ) NOT NULL COMMENT '空间id',
`equipment_id` VARCHAR (
64） DEFAULT NULL COMMENT '设备id',
`status` TINYINT (
1） DEFAULT 1 COMMENT '是否空闲 1 是 0 否 ',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='床位管理';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '床位管理';
CREATE TABLE `region_setting` (
`id` varchar(64) NOT NULL COMMENT 'id',
`name` varchar(128) NOT NULL COMMENT '床位名称 床位1，床位2',
`room_id` varchar(64) NOT NULL COMMENT '空间id',
`equipment_id` varchar(64） NOT NULL COMMENT '设备id',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`name` VARCHAR ( 128 ) NOT NULL COMMENT '床位名称 床位1，床位2',
`room_id` VARCHAR ( 64 ) NOT NULL COMMENT '空间id',
`equipment_id` VARCHAR (
64） NOT NULL COMMENT '设备id',
`create_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` int(1) DEFAULT '0' COMMENT '删除标记',
`tenant_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='区域设置';
`del_flag` INT ( 1 ) DEFAULT '0' COMMENT '删除标记',
`tenant_id` VARCHAR ( 64 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY ( `id` ) USING BTREE
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '区域设置';
CREATE TABLE `equipment` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
......@@ -389,11 +379,10 @@ CREATE TABLE `equipment` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '设备管理';
CREATE TABLE `alarm_config` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`alarm_type` VARCHAR ( 4 ) DEFAULT NULL COMMENT '告警类型 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常',
......@@ -411,11 +400,10 @@ CREATE TABLE `alarm_config` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '告警配置';
CREATE TABLE `alarm_record` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`alarm_id` VARCHAR ( 64 ) DEFAULT NULL COMMENT '关联告警配置',
......@@ -428,11 +416,10 @@ CREATE TABLE `alarm_record` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '告警配置';
CREATE TABLE `plafform_setting` (
`id` VARCHAR ( 64 ) NOT NULL COMMENT 'id',
`name` VARCHAR ( 64 ) NOT NULL COMMENT '名称',
......@@ -444,9 +431,6 @@ CREATE TABLE `plafform_setting` (
`update_by` VARCHAR ( 64 ) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL 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
) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COMMENT = '平台设置';
\ No newline at end of file
server-common/src/main/java/com/makeit/common/entity/BaseEntity.java
......@@ -35,7 +35,7 @@ public class BaseEntity implements Serializable {
* 创建时间
*/
@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")
private LocalDateTime createdAt;
......@@ -43,18 +43,10 @@ public class BaseEntity implements Serializable {
* 更新时间
*/
@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")
private LocalDateTime updatedAt;
//
// /**
// * 删除时间（逻辑删除）
// */
// @TableLogic(value="NULL",delval = "NOW()")
// @ApiModelProperty(value = "删除时间",required = false)
// @JsonFormat(pattern="yyyy-mm-dd HH:mm:ss")
// private LocalDateTime deletedAt;
@TableLogic
@TableField(select = false, fill = FieldFill.INSERT)
......@@ -62,10 +54,10 @@ public class BaseEntity implements Serializable {
@ApiModelProperty(value = "创建人名称")
@TableField(fill = FieldFill.INSERT)
private String createdByName;
private String createBy;
@ApiModelProperty(value = "更新人名称")
@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 {
// 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())) {
handler.setFieldValByName(BaseEntity.Fields.createdByName, commonUserVO.getName(), metaObject);
handler.setFieldValByName(BaseEntity.Fields.createBy, commonUserVO.getName(), metaObject);
}
}
if (metaObject.hasSetter(BaseEntity.Fields.updatedByName)) {
handler.setFieldValByName(BaseEntity.Fields.updatedByName, commonUserVO.getName(), metaObject);
if (metaObject.hasSetter(BaseEntity.Fields.updateBy)) {
handler.setFieldValByName(BaseEntity.Fields.updateBy, commonUserVO.getName(), metaObject);
}
if (metaObject.hasSetter("createdById")) {
......@@ -50,9 +50,9 @@ public class UserObjectHandler implements MetaObjectHandlerInternal {
CommonUserVO commonUserVO = CommonUserUtil.getUser();
if (metaObject.hasSetter(BaseEntity.Fields.updatedByName)) {
if (metaObject.hasSetter(BaseEntity.Fields.updateBy)) {
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