fix : 设备点解/保养功能开发

doc/20240402104538.sql

@@ -894,14 +894,14 @@ CREATE TABLE `address_code` (
   `name` varchar(256) DEFAULT NULL COMMENT '名称',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `address_code` (`code`) USING BTREE COMMENT '地址编号索引'
-) ENGINE=InnoDB AUTO_INCREMENT=3476 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='地址编码';
+) ENGINE=InnoDB AUTO_INCREMENT=3476 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='地址编码';
 CREATE TABLE `article` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `title` varchar(256) NOT NULL COMMENT '标题',
   `content` longtext NOT NULL COMMENT '内容',
   `update_time` datetime NOT NULL COMMENT '更新日期',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='文章';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='文章';
 CREATE TABLE `audit_record` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `table_name` varchar(64) NOT NULL COMMENT '表名',
@@ -929,13 +929,13 @@ CREATE TABLE `audit_record` (
   `enterprise_id` bigint NOT NULL COMMENT '企业id',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `audit_record_index` (`table_name`,`ref_id`) USING BTREE COMMENT '审核记录索引'
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='审核记录';
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='审核记录';
 CREATE TABLE `b_base_area` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '区域名称',
   `state` varchar(64) NOT NULL COMMENT '状态',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='区域管理表';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='区域管理表';
 CREATE TABLE `b_base_device` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '设备名称',
@@ -946,7 +946,7 @@ CREATE TABLE `b_base_device` (
   `org_team_id` bigint DEFAULT NULL COMMENT '所属班组',
   `state` varchar(20) NOT NULL COMMENT '状态启用',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='设备管理表';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='设备管理表';
 CREATE TABLE `b_base_ipc` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '名称',
@@ -956,7 +956,7 @@ CREATE TABLE `b_base_ipc` (
   `describe_` varchar(256) DEFAULT NULL COMMENT '描述',
   `state` bigint NOT NULL COMMENT '状态',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='工控机管理表';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工控机管理表';
 CREATE TABLE `b_base_machine_type` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `label` varchar(64) NOT NULL COMMENT '名称',
@@ -964,7 +964,7 @@ CREATE TABLE `b_base_machine_type` (
   `parent_id` bigint DEFAULT NULL COMMENT '父节点',
   `machine_type` varchar(64) NOT NULL COMMENT '机型',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='产品机型管理表';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='产品机型管理表';
 CREATE TABLE `b_base_prod_exception_type` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '生产异常状态',
@@ -972,7 +972,7 @@ CREATE TABLE `b_base_prod_exception_type` (
   `check_state` varchar(20) NOT NULL COMMENT '是否检查',
   `state` varchar(20) NOT NULL COMMENT '是否冻结',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='生产异常状态类型表';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='生产异常状态类型表';
 CREATE TABLE `b_bom` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `bom_id` varchar(64) DEFAULT NULL COMMENT 'BOM编号',
@@ -983,7 +983,7 @@ CREATE TABLE `b_bom` (
   `bom_mode` varchar(64) DEFAULT NULL COMMENT '启用状态',
   `bom_remark` varchar(64) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='BOM管理';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='BOM管理';
 CREATE TABLE `b_core_bom` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '零件名称',
@@ -1007,7 +1007,7 @@ CREATE TABLE `b_core_bom` (
   `delivery_address` varchar(256) DEFAULT NULL COMMENT '交付地址',
   `describe_` varchar(256) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='产品管理';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='产品管理';
 CREATE TABLE `b_core_technology_version` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '版本号',
@@ -1018,7 +1018,7 @@ CREATE TABLE `b_core_technology_version` (
   `audit_status` varchar(20) DEFAULT NULL COMMENT '审核状态',
   `bom_id` bigint DEFAULT NULL COMMENT '产品ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='工艺版本';
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='工艺版本';
 CREATE TABLE `b_sales_order` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `order_code` varchar(64) DEFAULT NULL COMMENT '订单编号',
@@ -1034,7 +1034,7 @@ CREATE TABLE `b_sales_order` (
   `created_at` datetime DEFAULT NULL COMMENT '创建时间',
   `status` int DEFAULT NULL COMMENT '状态(0未开始 1进行中 2已完成)',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=731 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='销售订单';
+) ENGINE=InnoDB AUTO_INCREMENT=731 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='销售订单';
 CREATE TABLE `b_scheduling_device_shift` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `device_id` bigint NOT NULL COMMENT '设备',
@@ -1043,14 +1043,14 @@ CREATE TABLE `b_scheduling_device_shift` (
   `shift_time_id` bigint NOT NULL COMMENT '班制id',
   `describe_` varchar(256) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='设备班制表';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='设备班制表';
 CREATE TABLE `b_scheduling_shift` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '班制名称',
   `shift_time` varchar(64) DEFAULT NULL COMMENT '班制时间',
   `describe_` varchar(256) DEFAULT NULL COMMENT '描述',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='排产班制信息表';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='排产班制信息表';
 CREATE TABLE `b_scheduling_week_device_shift` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `device_id` bigint NOT NULL COMMENT '设备',
@@ -1062,7 +1062,7 @@ CREATE TABLE `b_scheduling_week_device_shift` (
   `saturday_shift_time_id` bigint DEFAULT NULL COMMENT '星期六班制时间',
   `sunday_shift_time_id` bigint DEFAULT NULL COMMENT '星期天班制时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='周设备班制表';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='周设备班制表';
 CREATE TABLE `chart` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '名称',
@@ -1071,7 +1071,7 @@ CREATE TABLE `chart` (
   `code` varchar(64) NOT NULL COMMENT '编号',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `chart_code_idx` (`code`) COMMENT '图表编号索引'
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='图表';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='图表';
 CREATE TABLE `chart_test_data1` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '姓名',
@@ -1086,7 +1086,7 @@ CREATE TABLE `cn_platform` (
   `level` varchar(20) NOT NULL COMMENT '级别',
   PRIMARY KEY (`id`),
   KEY `code` (`code`) COMMENT '的的'
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='test';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='test';
 CREATE TABLE `config` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '编号',
@@ -1100,7 +1100,7 @@ CREATE TABLE `custom_page` (
   `name` varchar(64) NOT NULL COMMENT '名称',
   `content` longtext NOT NULL COMMENT '内容',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='自定义页面';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='自定义页面';
 CREATE TABLE `customer` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enterprise_id` bigint DEFAULT NULL COMMENT '企业id',
@@ -1114,7 +1114,7 @@ CREATE TABLE `customer` (
   `area` float DEFAULT NULL COMMENT '面积',
   `customer_status` varchar(20) DEFAULT NULL COMMENT '客户状态',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='客户';
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='客户';
 CREATE TABLE `customer_record` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `customer_id` bigint DEFAULT NULL COMMENT '客户id',
@@ -1126,14 +1126,14 @@ CREATE TABLE `customer_record` (
   `audit_imgs` varchar(1024) DEFAULT NULL COMMENT '图片',
   `audit_files` varchar(1024) DEFAULT NULL COMMENT '附件',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='客户审核记录';
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='客户审核记录';
 CREATE TABLE `customer_source` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '来源编码',
   `name` varchar(64) DEFAULT NULL COMMENT '来源名称',
   `parent_id` bigint DEFAULT NULL COMMENT '父id',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='客户来源';
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='客户来源';
 CREATE TABLE `data_import_task` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `user_id` bigint NOT NULL COMMENT '用户id',
@@ -1149,7 +1149,7 @@ CREATE TABLE `data_import_task` (
   `template_code` varchar(64) NOT NULL COMMENT '模板编号',
   `dynamic_task_id` bigint DEFAULT NULL COMMENT '动态任务id',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='数据导入任务';
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='数据导入任务';
 CREATE TABLE `data_import_template` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `table_name` varchar(64) NOT NULL COMMENT '表',
@@ -1158,7 +1158,7 @@ CREATE TABLE `data_import_template` (
   `repeat_fields` varchar(1024) DEFAULT NULL COMMENT '判重字段列表',
   `repeat_strategy` varchar(20) DEFAULT NULL COMMENT '判重处理策略',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='数据导入配置';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='数据导入配置';
 CREATE TABLE `data_import_template_field` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `template_id` bigint NOT NULL COMMENT '模板id',
@@ -1174,7 +1174,7 @@ CREATE TABLE `data_import_template_field` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `data_import_template_field_template_id_fk` (`template_id`) USING BTREE,
   CONSTRAINT `data_import_template_field_template_id_fk` FOREIGN KEY (`template_id`) REFERENCES `data_import_template` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='数据导入配置字段';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='数据导入配置字段';
 CREATE TABLE `data_listener` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `table_name` varchar(64) NOT NULL COMMENT '表名称',
@@ -1184,7 +1184,7 @@ CREATE TABLE `data_listener` (
   `seq` int NOT NULL COMMENT '序号',
   `java_bean` varchar(64) DEFAULT NULL COMMENT 'java接口',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='数据监听';
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='数据监听';
 CREATE TABLE `dept` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '部门编号',
@@ -1197,7 +1197,7 @@ CREATE TABLE `dept` (
   KEY `parent_id` (`parent_id`) USING BTREE COMMENT '部门-父部门索引',
   CONSTRAINT `dept_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `dept_parent_id_fk` FOREIGN KEY (`parent_id`) REFERENCES `dept` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='部门';
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='部门';
 CREATE TABLE `dept_manager` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `dept_id` bigint DEFAULT NULL COMMENT '部门id',
@@ -1207,7 +1207,7 @@ CREATE TABLE `dept_manager` (
   KEY `dept_manager_enterprise_user_id_fk` (`enterprise_user_id`) USING BTREE,
   CONSTRAINT `dept_manager_dept_id_fk` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `dept_manager_enterprise_user_id_fk` FOREIGN KEY (`enterprise_user_id`) REFERENCES `enterprise_user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='部门负责人';
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='部门负责人';
 CREATE TABLE `dept_permission` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `dept_id` bigint DEFAULT NULL COMMENT '部门id',
@@ -1218,7 +1218,7 @@ CREATE TABLE `dept_permission` (
   KEY `dept_permission_permission_id_fk` (`permission_id`) USING BTREE,
   CONSTRAINT `dept_permission_dept_id_fk` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `dept_permission_permission_id_fk` FOREIGN KEY (`permission_id`) REFERENCES `permission` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='部门数据权限';
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='部门数据权限';
 CREATE TABLE `device_collection` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `device_id` bigint NOT NULL COMMENT '设备台账ID',
@@ -1256,7 +1256,7 @@ CREATE TABLE `dic` (
   `dic_code` varchar(64) DEFAULT NULL COMMENT '字典编号',
   `dic_name` varchar(64) DEFAULT NULL COMMENT '字典名称',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='数据字典';
+) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='数据字典';
 CREATE TABLE `dic_item` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `parent_id` bigint DEFAULT NULL COMMENT '字典id',
@@ -1268,7 +1268,7 @@ CREATE TABLE `dic_item` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `dic_item_parent_id_fk` (`parent_id`) USING BTREE,
   CONSTRAINT `dic_item_parent_id_fk` FOREIGN KEY (`parent_id`) REFERENCES `dic` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=224 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='字典明细';
+) ENGINE=InnoDB AUTO_INCREMENT=224 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='字典明细';
 CREATE TABLE `dynamic_task` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(256) NOT NULL COMMENT '任务名称',
@@ -1283,7 +1283,7 @@ CREATE TABLE `dynamic_task` (
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `java_service` varchar(256) DEFAULT NULL COMMENT 'java接口',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='动态任务';
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='动态任务';
 CREATE TABLE `enterprise` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '编号',
@@ -1292,7 +1292,7 @@ CREATE TABLE `enterprise` (
   `address` varchar(1024) DEFAULT NULL COMMENT '地址',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `enterprise_code` (`code`) USING BTREE COMMENT '企业编号'
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='企业';
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='企业';
 CREATE TABLE `enterprise_manager` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enterprise_id` bigint DEFAULT NULL COMMENT '企业id',
@@ -1302,7 +1302,7 @@ CREATE TABLE `enterprise_manager` (
   KEY `enterprise_manager_user_id` (`user_id`) USING BTREE COMMENT '企业负责人-企业人员id',
   CONSTRAINT `enterprise_manager_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `enterprise_manager_user_id_fk` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='企业负责人';
+) ENGINE=InnoDB AUTO_INCREMENT=82 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='企业负责人';
 CREATE TABLE `enterprise_menu` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enterprise_id` bigint DEFAULT NULL COMMENT '企业id',
@@ -1312,7 +1312,7 @@ CREATE TABLE `enterprise_menu` (
   KEY `enterprise_menu_menu_id` (`menu_id`) USING BTREE COMMENT '企业菜单_菜单id索引',
   CONSTRAINT `enterprise_menu_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `enterprise_menu_menu_id_fk` FOREIGN KEY (`menu_id`) REFERENCES `sys_menu` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2191 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='企业菜单';
+) ENGINE=InnoDB AUTO_INCREMENT=2191 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='企业菜单';
 CREATE TABLE `enterprise_user` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enterprise_id` bigint DEFAULT NULL COMMENT '企业id',
@@ -1324,7 +1324,7 @@ CREATE TABLE `enterprise_user` (
   KEY `enterprise_user_org_id` (`dept_id`) USING BTREE COMMENT '企业用户-部门id索引',
   CONSTRAINT `enterprise_user_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `enterprise_user_user_id_fk` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='企业用户';
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='企业用户';
 CREATE TABLE `enterprise_user_position` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enterprise_user_id` bigint DEFAULT NULL COMMENT '企业用户id',
@@ -1334,7 +1334,7 @@ CREATE TABLE `enterprise_user_position` (
   KEY `enterprise_user_position_position_id` (`position_id`) USING BTREE COMMENT '企业用户岗位-岗位id索引',
   CONSTRAINT `enterprise_user_position_enterprise_user_id_fk` FOREIGN KEY (`enterprise_user_id`) REFERENCES `enterprise_user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `enterprise_user_position_position_id_fk` FOREIGN KEY (`position_id`) REFERENCES `position` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='企业用户岗位';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='企业用户岗位';
 CREATE TABLE `form` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) NOT NULL COMMENT '编号',
@@ -1354,7 +1354,7 @@ CREATE TABLE `form` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `form_code` (`code`) USING BTREE COMMENT '表单编号索引',
   KEY `form_table_name` (`table_name`) USING BTREE COMMENT '表单主表索引'
-) ENGINE=InnoDB AUTO_INCREMENT=115 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='表单';
+) ENGINE=InnoDB AUTO_INCREMENT=115 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表单';
 CREATE TABLE `form_button` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `form_id` bigint DEFAULT NULL COMMENT '表单id',
@@ -1370,7 +1370,7 @@ CREATE TABLE `form_button` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `form_button_form_id_fk` (`form_id`) USING BTREE,
   CONSTRAINT `form_button_form_id_fk` FOREIGN KEY (`form_id`) REFERENCES `form` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='表单按钮';
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表单按钮';
 CREATE TABLE `form_field` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `form_id` bigint DEFAULT NULL COMMENT '表单id',
@@ -1398,7 +1398,7 @@ CREATE TABLE `form_field` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `form_field_form_id_fk` (`form_id`) USING BTREE,
   CONSTRAINT `form_field_form_id_fk` FOREIGN KEY (`form_id`) REFERENCES `form` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=4447 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='表单字段';
+) ENGINE=InnoDB AUTO_INCREMENT=4447 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表单字段';
 CREATE TABLE `form_ref` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `form_id` bigint DEFAULT NULL COMMENT '表单id',
@@ -1408,7 +1408,7 @@ CREATE TABLE `form_ref` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `form_ref_form_id_fk` (`form_id`) USING BTREE,
   CONSTRAINT `form_ref_form_id_fk` FOREIGN KEY (`form_id`) REFERENCES `form` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='表单关联';
+) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表单关联';
 CREATE TABLE `global_log` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `table_name` varchar(64) NOT NULL COMMENT '表',
@@ -1422,7 +1422,7 @@ CREATE TABLE `global_log` (
   `remark` longtext NOT NULL COMMENT '说明',
   `ref_id` bigint NOT NULL COMMENT '关联id',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=427 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='全局操作日志';
+) ENGINE=InnoDB AUTO_INCREMENT=427 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='全局操作日志';
 CREATE TABLE `imcs_bom` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `parent_id` bigint DEFAULT NULL COMMENT '父节点',
@@ -1430,25 +1430,25 @@ CREATE TABLE `imcs_bom` (
   `material_name` varchar(64) NOT NULL COMMENT '物料名称',
   `status` int NOT NULL COMMENT '状态',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='产品表';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='产品表';
 CREATE TABLE `log_table` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `table_name` varchar(64) NOT NULL COMMENT '表名',
   `table_comment` varchar(64) NOT NULL COMMENT '注释',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='记录日志的表';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='记录日志的表';
 CREATE TABLE `magic_api_file` (
   `file_path` varchar(512) NOT NULL COMMENT '路径',
   `file_content` mediumtext COMMENT '内容',
   PRIMARY KEY (`file_path`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='magic-api存储';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='magic-api存储';
 CREATE TABLE `menu_url` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `menu_id` bigint DEFAULT NULL COMMENT '菜单id',
   `url` varchar(1024) NOT NULL COMMENT 'url',
   `name` varchar(64) DEFAULT NULL COMMENT '名称',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=569 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='菜单url';
+) ENGINE=InnoDB AUTO_INCREMENT=569 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='菜单url';
 CREATE TABLE `page` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '编码',
@@ -1464,7 +1464,7 @@ CREATE TABLE `page` (
   `open_page` varchar(20) DEFAULT NULL COMMENT '是否开启分页',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `code` (`code`) USING BTREE COMMENT '编码索引'
-) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='页面';
+) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='页面';
 CREATE TABLE `page_button` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `page_id` bigint DEFAULT NULL COMMENT '页面id',
@@ -1473,7 +1473,7 @@ CREATE TABLE `page_button` (
   `option_type` varchar(20) DEFAULT NULL COMMENT '操作类型',
   `option_value` varchar(1024) DEFAULT NULL COMMENT '操作配置',
   `level` varchar(20) DEFAULT NULL COMMENT '按钮级别',
-  `confirm_text` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '二次确认提示',
+  `confirm_text` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '二次确认提示',
   `seq` int DEFAULT NULL COMMENT '序号',
   `js_rule` varchar(1024) DEFAULT NULL COMMENT '按钮禁用规则',
   `code` varchar(256) DEFAULT NULL COMMENT '按钮编号',
@@ -1481,7 +1481,7 @@ CREATE TABLE `page_button` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `page_button_page_id` (`page_id`) USING BTREE COMMENT '页面id索引',
   CONSTRAINT `page_button_page_id_fk` FOREIGN KEY (`page_id`) REFERENCES `page` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2766 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='页面按钮';
+) ENGINE=InnoDB AUTO_INCREMENT=2766 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='页面按钮';
 CREATE TABLE `page_query_field` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `page_id` bigint DEFAULT NULL COMMENT '页面id',
@@ -1504,7 +1504,7 @@ CREATE TABLE `page_query_field` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `page_query_field_page_id_fk` (`page_id`) USING BTREE,
   CONSTRAINT `page_query_field_page_id_fk` FOREIGN KEY (`page_id`) REFERENCES `page` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1354 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='页面查询字段';
+) ENGINE=InnoDB AUTO_INCREMENT=1354 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='页面查询字段';
 CREATE TABLE `page_ref` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `ref_type` varchar(64) NOT NULL COMMENT '关联类型',
@@ -1516,7 +1516,7 @@ CREATE TABLE `page_ref` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `page_ref_page_id_fk` (`page_id`) USING BTREE,
   CONSTRAINT `page_ref_page_id_fk` FOREIGN KEY (`page_id`) REFERENCES `page` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='页面关联';
+) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='页面关联';
 CREATE TABLE `page_result_field` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `page_id` bigint DEFAULT NULL COMMENT '页面id',
@@ -1530,7 +1530,7 @@ CREATE TABLE `page_result_field` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `page_result_field_page_id_fk` (`page_id`) USING BTREE,
   CONSTRAINT `page_result_field_page_id_fk` FOREIGN KEY (`page_id`) REFERENCES `page` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=11014 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='页面查询结果';
+) ENGINE=InnoDB AUTO_INCREMENT=11014 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='页面查询结果';
 CREATE TABLE `permission` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '权限编码',
@@ -1542,7 +1542,7 @@ CREATE TABLE `permission` (
   `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `permission_code` (`code`) USING BTREE COMMENT '权限编码索引'
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='权限';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='权限';
 CREATE TABLE `position` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) NOT NULL COMMENT '岗位编号',
@@ -1554,7 +1554,7 @@ CREATE TABLE `position` (
   KEY `position_enterprise_id` (`enterprise_id`) USING BTREE COMMENT '企业id索引',
   KEY `position_type` (`position_type`) USING BTREE COMMENT '岗位类型索引',
   CONSTRAINT `position_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='岗位';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='岗位';
 CREATE TABLE `position_menu` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `position_id` bigint DEFAULT NULL COMMENT '岗位id',
@@ -1567,7 +1567,7 @@ CREATE TABLE `position_menu` (
   CONSTRAINT `position_menu_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `position_menu_menu_id_fk` FOREIGN KEY (`menu_id`) REFERENCES `sys_menu` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `position_menu_position_id_fk` FOREIGN KEY (`position_id`) REFERENCES `position` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=220 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='岗位菜单';
+) ENGINE=InnoDB AUTO_INCREMENT=220 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='岗位菜单';
 CREATE TABLE `position_permission` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `position_id` bigint DEFAULT NULL COMMENT '岗位id',
@@ -1581,7 +1581,7 @@ CREATE TABLE `position_permission` (
   CONSTRAINT `position_permission_enterprise_id_fk` FOREIGN KEY (`enterprise_id`) REFERENCES `enterprise` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `position_permission_permission_id_fk` FOREIGN KEY (`permission_id`) REFERENCES `permission` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `position_permission_position_id_fk` FOREIGN KEY (`position_id`) REFERENCES `position` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='岗位数据权限';
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='岗位数据权限';
 CREATE TABLE `process` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '流程编号',
@@ -1592,7 +1592,7 @@ CREATE TABLE `process` (
   `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
   `record_main_id_field` varchar(64) DEFAULT NULL COMMENT '记录主表id字段',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='流程';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流程';
 CREATE TABLE `process_node` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `process_id` bigint DEFAULT NULL COMMENT '流程id',
@@ -1609,7 +1609,7 @@ CREATE TABLE `process_node` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `process_node_process_id_fk` (`process_id`) USING BTREE,
   CONSTRAINT `process_node_process_id_fk` FOREIGN KEY (`process_id`) REFERENCES `process` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='流程节点';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流程节点';
 CREATE TABLE `schema_page` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) NOT NULL COMMENT '编号',
@@ -1618,7 +1618,7 @@ CREATE TABLE `schema_page` (
   `schema_json` longtext NOT NULL COMMENT '页面配置',
   `query_sql` longtext COMMENT '查询sql',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='页面配置';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='页面配置';
 CREATE TABLE `serial_number` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) DEFAULT NULL COMMENT '编号',
@@ -1630,7 +1630,7 @@ CREATE TABLE `serial_number` (
   `serial_lenth` int DEFAULT NULL COMMENT '顺序号长度',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `serial_number_code` (`code`) USING BTREE COMMENT '序号编码索引'
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='序号';
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='序号';
 CREATE TABLE `spring_session` (
   `PRIMARY_ID` char(36) NOT NULL,
   `SESSION_ID` char(36) NOT NULL,
@@ -1643,14 +1643,14 @@ CREATE TABLE `spring_session` (
   UNIQUE KEY `SPRING_SESSION_IX1` (`SESSION_ID`) USING BTREE,
   KEY `SPRING_SESSION_IX2` (`EXPIRY_TIME`) USING BTREE,
   KEY `SPRING_SESSION_IX3` (`PRINCIPAL_NAME`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 CREATE TABLE `spring_session_attributes` (
   `SESSION_PRIMARY_ID` char(36) NOT NULL,
   `ATTRIBUTE_NAME` varchar(200) NOT NULL,
   `ATTRIBUTE_BYTES` blob NOT NULL,
   PRIMARY KEY (`SESSION_PRIMARY_ID`,`ATTRIBUTE_NAME`) USING BTREE,
   CONSTRAINT `SPRING_SESSION_ATTRIBUTES_FK` FOREIGN KEY (`SESSION_PRIMARY_ID`) REFERENCES `spring_session` (`PRIMARY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 CREATE TABLE `sql_api` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) DEFAULT NULL COMMENT '名称',
@@ -1659,7 +1659,7 @@ CREATE TABLE `sql_api` (
   `content` longtext COMMENT '内容',
   `sql_api_type` varchar(20) DEFAULT NULL COMMENT '类型',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='sql接口';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='sql接口';
 CREATE TABLE `sql_info` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `code` varchar(64) NOT NULL COMMENT '编号',
@@ -1669,7 +1669,7 @@ CREATE TABLE `sql_info` (
   `ref_sql_codes` longtext COMMENT '关联sql',
   PRIMARY KEY (`id`),
   KEY `sql_code_idx` (`code`) COMMENT 'sql编号索引'
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='sql语句';
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='sql语句';
 CREATE TABLE `sql_param` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `sql_info_id` bigint NOT NULL COMMENT 'sql主键',
@@ -1683,7 +1683,7 @@ CREATE TABLE `sql_param` (
   PRIMARY KEY (`id`),
   KEY `sql_param_sql_info_id` (`sql_info_id`),
   CONSTRAINT `sql_param_sql_info_id` FOREIGN KEY (`sql_info_id`) REFERENCES `sql_info` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='sql参数';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='sql参数';
 CREATE TABLE `sql_result` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `sql_info_id` bigint NOT NULL COMMENT 'sql主键',
@@ -1695,7 +1695,7 @@ CREATE TABLE `sql_result` (
   PRIMARY KEY (`id`),
   KEY `sql_result_sql_info_id_fk` (`sql_info_id`),
   CONSTRAINT `sql_result_sql_info_id_fk` FOREIGN KEY (`sql_info_id`) REFERENCES `sql_info` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='sql结果';
+) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='sql结果';
 CREATE TABLE `sys_file` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `file_name` varchar(256) DEFAULT NULL COMMENT '文件名',
@@ -1711,7 +1711,7 @@ CREATE TABLE `sys_file` (
   `apply_status` int DEFAULT NULL COMMENT '审批状态',
   `file_path` varchar(1024) DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='系统文件';
+) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='系统文件';
 CREATE TABLE `sys_menu` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `parent_id` bigint DEFAULT NULL COMMENT '父菜单',
@@ -1726,13 +1726,13 @@ CREATE TABLE `sys_menu` (
   PRIMARY KEY (`id`) USING BTREE,
   KEY `sys_menu_parent_id_fk` (`parent_id`) USING BTREE,
   CONSTRAINT `sys_menu_parent_id_fk` FOREIGN KEY (`parent_id`) REFERENCES `sys_menu` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=295 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='系统菜单';
+) ENGINE=InnoDB AUTO_INCREMENT=295 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='系统菜单';
 CREATE TABLE `t_order` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `order_num` varchar(20) NOT NULL COMMENT '订单编号',
   `order_name` varchar(20) DEFAULT NULL COMMENT '订单名称',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='订单测试33';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='订单测试33';
 CREATE TABLE `tb_family` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `fa` varchar(20) NOT NULL COMMENT '姓名',
@@ -1741,7 +1741,7 @@ CREATE TABLE `tb_family` (
   `sister` varchar(64) DEFAULT NULL COMMENT '姓名',
   `age` bigint NOT NULL COMMENT '年龄',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='家庭成员表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='家庭成员表';
 CREATE TABLE `test` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT '姓名',
@@ -1750,19 +1750,19 @@ CREATE TABLE `test` (
   `test` varchar(64) DEFAULT NULL COMMENT 'test',
   PRIMARY KEY (`id`),
   KEY `姓名` (`name`) COMMENT '姓名'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='测试';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试';
 CREATE TABLE `test0` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(20) DEFAULT NULL COMMENT 'name',
   `age` int DEFAULT NULL COMMENT 'age',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='test0';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='test0';
 CREATE TABLE `test999` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(20) NOT NULL COMMENT '名称',
   `xin` varchar(64) NOT NULL COMMENT '测试9',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='999';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='999';
 CREATE TABLE `test_data_import` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `user_id` bigint NOT NULL COMMENT '用户id',
@@ -1771,7 +1771,7 @@ CREATE TABLE `test_data_import` (
   `age` int NOT NULL COMMENT '年龄',
   `gender` varchar(20) NOT NULL COMMENT '性别',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='测试数据导入';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试数据导入';
 CREATE TABLE `test_order` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `order_code` varchar(64) NOT NULL COMMENT '订单号',
@@ -1780,7 +1780,7 @@ CREATE TABLE `test_order` (
   `test_order_status` varchar(20) NOT NULL COMMENT '订单状态',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='测试订单';
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试订单';
 CREATE TABLE `test_rigion` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) NOT NULL COMMENT 'name',
@@ -1788,7 +1788,7 @@ CREATE TABLE `test_rigion` (
   `p_name` varchar(64) DEFAULT NULL COMMENT 'pname',
   `time` datetime DEFAULT NULL COMMENT 'time',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='test_rigion';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='test_rigion';
 CREATE TABLE `timer_task` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `name` varchar(64) DEFAULT NULL COMMENT '任务名称',
@@ -1797,7 +1797,7 @@ CREATE TABLE `timer_task` (
   `data_status` varchar(1024) DEFAULT NULL COMMENT '状态',
   `params` longtext COMMENT '参数',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='定时任务';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='定时任务';
 CREATE TABLE `timer_task_record` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `timer_task_id` bigint NOT NULL COMMENT '定时任务id',
@@ -1807,7 +1807,7 @@ CREATE TABLE `timer_task_record` (
   `params` longtext COMMENT '参数',
   `msg` varchar(1024) DEFAULT NULL COMMENT '提示信息',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='定时任务记录';
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='定时任务记录';
 CREATE TABLE `user` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `user_code` varchar(64) DEFAULT NULL COMMENT '用户编号',
@@ -1823,7 +1823,7 @@ CREATE TABLE `user` (
   `other_files` varchar(1024) DEFAULT NULL COMMENT '附件列表',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `user_user_code` (`user_code`) USING BTREE COMMENT '用户编号'
-) ENGINE=InnoDB AUTO_INCREMENT=138 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户';
+) ENGINE=InnoDB AUTO_INCREMENT=138 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户';
 CREATE TABLE `user_permission` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `enterprise_user_id` bigint DEFAULT NULL COMMENT '部门id',
@@ -1834,12 +1834,12 @@ CREATE TABLE `user_permission` (
   KEY `user_permission_permission_id_fk` (`permission_id`) USING BTREE,
   CONSTRAINT `user_permission_enterprise_user_id_fk` FOREIGN KEY (`enterprise_user_id`) REFERENCES `enterprise_user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `user_permission_permission_id_fk` FOREIGN KEY (`permission_id`) REFERENCES `permission` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户数据权限';
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户数据权限';
 CREATE TABLE `zhuhao_test` (
   `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
   `aaa` varchar(64) DEFAULT NULL COMMENT 'aaa',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='zh测试表';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='zh测试表';
 BEGIN;
 LOCK TABLES `imcs_platform`.`a_dept` WRITE;
 DELETE FROM `imcs_platform`.`a_dept`;

src/main/java/com/imcs/admin/business/controller/DevicMaintainController.java

@@ -0,0 +1,53 @@
+package com.imcs.admin.business.controller;
+
+
+import com.alibaba.fastjson.JSON;
+import com.imcs.admin.business.service.DevicMaintainService;
+import com.imcs.admin.common.Result;
+import com.imcs.admin.dto.DeviceMaintainDto;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/devic/maintain")
+public class DevicMaintainController {
+
+    @Resource
+    private DevicMaintainService devicMaintainService;
+
+    /**
+     * 保存设备维护保养任务
+     * @param json
+     * @return
+     */
+    @PostMapping("/task/add")
+    public Result addDeviceMaintainTask(@RequestBody String json){
+        log.info("===={}"+ json);
+        DeviceMaintainDto deviceMaintainDto = JSON.parseObject(json, DeviceMaintainDto.class);
+        Boolean aBoolean = devicMaintainService.addDeviceMaintainTask(deviceMaintainDto);
+
+        return Result.success(aBoolean);
+    }
+
+    /**
+     * 保存设备维护保养任务
+     * @param json
+     * @return
+     */
+    @PostMapping("/task/save")
+    public Result saveDeviceMaintainTask(@RequestBody String json){
+        log.info("===={}"+ json);
+        DeviceMaintainDto deviceMaintainDto = JSON.parseObject(json, DeviceMaintainDto.class);
+        Boolean aBoolean = devicMaintainService.saveDeviceMaintainTask(deviceMaintainDto);
+
+        return Result.success(aBoolean);
+    }
+
+}

src/main/java/com/imcs/admin/business/service/DevicMaintainService.java

@@ -0,0 +1,13 @@
+package com.imcs.admin.business.service;
+
+import com.imcs.admin.common.Result;
+import com.imcs.admin.dto.DeviceMaintainDto;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public interface DevicMaintainService {
+
+    public Boolean addDeviceMaintainTask(DeviceMaintainDto deviceMaintainDto);
+    public Boolean saveDeviceMaintainTask(DeviceMaintainDto deviceMaintainDto);
+
+}

src/main/java/com/imcs/admin/business/service/impl/DevicMaintainServiceImpl.java

@@ -0,0 +1,120 @@
+package com.imcs.admin.business.service.impl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.imcs.admin.business.service.DevicMaintainService;
+import com.imcs.admin.common.config.SessionContext;
+import com.imcs.admin.common.data.Obj;
+import com.imcs.admin.db.service.JdbcDao;
+import com.imcs.admin.db.service.JdbcService;
+import com.imcs.admin.dto.DeviceMaintainDto;
+import com.imcs.admin.dto.DeviceMaintainSubDto;
+import com.imcs.admin.rbac.data.User;
+import com.imcs.admin.util.DateUtils;
+import com.imcs.admin.util.GenerateSerial;
+import com.imcs.admin.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.thymeleaf.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class DevicMaintainServiceImpl  implements DevicMaintainService {
+
+    @Resource
+    private JdbcDao jdbcDao;
+
+    @Autowired
+    private JdbcService jdbcService;
+
+    @Resource
+    private GenerateSerial generateSerial;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean addDeviceMaintainTask(DeviceMaintainDto deviceMaintainDto) {
+
+        Map<String, Object> one = jdbcDao.findOne("SELECT * FROM a_device WHERE id = ?", deviceMaintainDto.getDeviceId());
+
+        deviceMaintainDto.setDeviceCode(one.get("deviceCode") == null ? null : one.get("deviceCode").toString());
+        deviceMaintainDto.setDeviceName(one.get("deviceName") == null ? null : one.get("deviceName").toString());
+
+        StringBuffer stringBuffer = new StringBuffer();
+
+        stringBuffer.append("INSERT INTO a_device_inspection_execut ");
+        stringBuffer.append("(device_code, device_name, Inspection_rule_code, Inspection_rule_name, Inspection_rule_type ,Inspection_status) ");
+        stringBuffer.append("VALUE (?,?,?,?,?,?)");
+
+        Long inserOne = jdbcDao.insert("执行表a_device_inspection_execut新增操作",
+                stringBuffer.toString(),
+                deviceMaintainDto.getDeviceCode(),
+                deviceMaintainDto.getDeviceName(), deviceMaintainDto.getInspectionRuleCode(), deviceMaintainDto.getInspectionRuleName(), deviceMaintainDto.getInspectionType(), 1);
+
+        if(deviceMaintainDto.getInspectionItem()==null || deviceMaintainDto.getInspectionItem().size()<=0){
+            return true;
+        }
+
+        stringBuffer.setLength(0);
+        stringBuffer.append("INSERT INTO a_device_inspection_execut_detail");
+        stringBuffer.append("(execut_detail_pid, execut_detail_content, execut_detail_result, execut_detail_user, execut_detail_time) ");
+        stringBuffer.append("VALUE (?,?,?,?,?)");
+
+        User user = SessionContext.getUser();
+        for (DeviceMaintainSubDto deviceMaintainSubDto : deviceMaintainDto.getInspectionItem()) {
+            jdbcDao.insert("执行表a_device_inspection_execut_detail新增操作",
+                    stringBuffer.toString(),
+                    inserOne, deviceMaintainSubDto.getInspectionRulesDetailContent(), deviceMaintainSubDto.getExecutDetailResult(), user.getName(), new Date());
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean saveDeviceMaintainTask(DeviceMaintainDto deviceMaintainDto) {
+
+        StringBuffer stringBuffer = new StringBuffer();
+
+        stringBuffer.append(" UPDATE a_device_inspection_execut_detail ");
+        stringBuffer.append(" SET execut_detail_result = ?, execut_detail_user = ?, execut_detail_time = ? ");
+        stringBuffer.append(" WHERE id = ? ");
+
+        boolean bool =false;
+        User user = SessionContext.getUser();
+        for (DeviceMaintainSubDto deviceMaintainSubDto : deviceMaintainDto.getInspectionExcetcItem()) {
+            if(StringUtils.isEmpty(deviceMaintainSubDto.getExecutDetailResult())){
+                bool =true;
+            }
+            jdbcDao.update("执行表a_device_inspection_execut_detail批量修改操作",
+                    stringBuffer.toString(),
+                    deviceMaintainSubDto.getExecutDetailResult(),
+                    StringUtils.isEmpty(deviceMaintainSubDto.getExecutDetailResult())? null : user.getName(),
+                    StringUtils.isEmpty(deviceMaintainSubDto.getExecutDetailResult())? null : new Date(),
+                    deviceMaintainSubDto.getId());
+
+        }
+
+        stringBuffer.setLength(0);
+        stringBuffer.append(" UPDATE a_device_inspection_execut ");
+        stringBuffer.append(" SET inspection_status = ? ");
+        stringBuffer.append(" WHERE id = ? ");
+
+        Integer inspectionStatus = 2;
+        if (!bool){
+            inspectionStatus = 3;
+        }
+
+        jdbcDao.update("执行表a_device_inspection_execut修改操作", stringBuffer.toString(), inspectionStatus, deviceMaintainDto.getId());
+
+        return true;
+    }
+}

src/main/java/com/imcs/admin/dto/DeviceMaintainDto.java

@@ -0,0 +1,37 @@
+package com.imcs.admin.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.log4j.Log4j;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceMaintainDto implements Serializable {
+
+    private Long id;
+
+    private String inspectionRuleCode;
+
+    private String inspectionRuleName;
+
+    private String inspectionRuleDesc;
+
+    private String deviceId;
+
+    private String deviceCode;
+
+    private String deviceName;
+
+    private Integer inspectionType;
+
+    private List<DeviceMaintainSubDto> inspectionItem;
+    private List<DeviceMaintainSubDto> inspectionExcetcItem;
+}

src/main/java/com/imcs/admin/dto/DeviceMaintainSubDto.java

@@ -0,0 +1,27 @@
+package com.imcs.admin.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceMaintainSubDto {
+
+    private Long id;
+
+    private String executDetailPid;
+
+    private String inspectionRulesDetailContent;
+
+    private String executDetailResult;
+
+    private String executDetailUser;
+
+    private Date executDetailTime;
+}

src/main/java/com/imcs/admin/page/controller/CommonController.java

@@ -584,9 +584,15 @@ public class CommonController {
                                     continue;
                                 }
                                 if(itemFieldValue instanceof LocalDateTime){
-                                    String itemFormat = StrUtil.isBlank(itemField.getFormat()) ? "yyyy-MM-dd":formField.getFormat();
-                                    String itemRealValue = DateUtil.format((LocalDateTime) itemFieldValue, itemFormat);
-                                    itemObj.put(itemField.getField(),itemRealValue);
+                                    try{
+                                        String itemFormat = StrUtil.isBlank(itemField.getFormat()) ? "yyyy-MM-dd":formField.getFormat();
+                                        String itemRealValue = DateUtil.format((LocalDateTime) itemFieldValue, itemFormat);
+                                        itemObj.put(itemField.getField(),itemRealValue);
+                                    }catch (Exception e){
+                                        String itemFormat = StrUtil.isBlank(itemField.getFormat()) ? "yyyy-MM-dd":itemField.getFormat();
+                                        String itemRealValue = DateUtil.format((LocalDateTime) itemFieldValue, itemFormat);
+                                        itemObj.put(itemField.getField(),itemRealValue);
+                                    }
                                 }
                                 itemData.put(itemField.getField(),itemObj.get(itemField.getField()));
                             }

src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/imcs_platform?serverTimezone=GMT%2B8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.58.128:3306/imcs_platform?serverTimezone=GMT%2B8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=root
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 #spring-session-jdbc-2.6.1.jar!\org\springframework\session\jdbc\schema-mysql.sql
@@ -30,7 +30,7 @@ index-page=/admin/index.html
 # Redis数据库索引（默认为0）  开启sa-token-redis的配置
 spring.redis.database=0
 # Redis服务器地址
-spring.redis.host=127.0.0.1
+spring.redis.host=192.168.58.128
 # Redis服务器连接端口
 spring.redis.port=6379
 # Redis服务器连接密码（默认为空）