From c59e89b3fb2be1d9c6467014967736b6cda0acc4 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 17 May 2023 10:54:29 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E4=B8=A4=E7=A5=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/src/main/resources/db/1.0.0.sql | 128 +++++++------ hzims-service/message/pom.xml | 5 + .../message/src/main/resources/db/1.0.0.sql | 40 ++-- .../operational/src/main/resources/db/1.0.0.sql | 208 ++++++++++----------- .../impl/StandardTicketInfoServiceImpl.java | 4 +- .../service/impl/WorkTicketInfoServiceImpl.java | 5 +- 6 files changed, 193 insertions(+), 197 deletions(-) diff --git a/hzims-service/equipment/src/main/resources/db/1.0.0.sql b/hzims-service/equipment/src/main/resources/db/1.0.0.sql index 0725615..3321415 100644 --- a/hzims-service/equipment/src/main/resources/db/1.0.0.sql +++ b/hzims-service/equipment/src/main/resources/db/1.0.0.sql @@ -1,73 +1,89 @@ SET FOREIGN_KEY_CHECKS=0; -CREATE TABLE `dev_equipment`.`hzims_em_association` ( - `ID` bigint(20) NOT NULL COMMENT '主键Id', - `EM_ID` bigint(20) NULL DEFAULT NULL COMMENT '设备Id', - `FDP_EM_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'FDP设备Id', - `FDP_EM_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'PDF设备名称', - `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', - `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', - `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', - `CREATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '创建人', - `UPDATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '修改人', - `CREATE_DEPT` bigint(64) NULL DEFAULT NULL COMMENT '创建部门', - `STATUS` int(2) NULL DEFAULT 0 COMMENT '状态', - `IS_DELETED` int(2) NULL DEFAULT 0 COMMENT '是否已删除: 0、否； 1、是', - PRIMARY KEY (`ID`) USING BTREE +CREATE TABLE `equipment`.`hzims_em_association` ( + `ID` bigint(20) NOT NULL COMMENT '主键Id', + `EM_ID` bigint(20) NULL DEFAULT NULL COMMENT '设备Id', + `FDP_EM_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'FDP设备Id', + `FDP_EM_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'PDF设备名称', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', + `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '创建人', + `UPDATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '修改人', + `CREATE_DEPT` bigint(64) NULL DEFAULT NULL COMMENT '创建部门', + `STATUS` int(2) NULL DEFAULT 0 COMMENT '状态', + `IS_DELETED` int(2) NULL DEFAULT 0 COMMENT '是否已删除: 0、否； 1、是', + PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备关联表' ROW_FORMAT = Dynamic; -CREATE TABLE `dev_equipment`.`hzims_em_association_detail` ( - `PID` bigint(20) NOT NULL COMMENT '父id', - `ID` bigint(20) NOT NULL COMMENT '主键Id', - `EM_POINT_ID` bigint(20) NOT NULL COMMENT '设备点Id', - `FDP_EM_POINT_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'FDP点Id', - `FDP_EM_POINT_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'FDP监测点名称', - `FDP_EM_POINT_ORD` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'FDP监测点位置', - `PRO_TYPE` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '属性类型：yc、yx、soe', - `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', - `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', - `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', - `CREATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '创建人', - `UPDATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '修改人', - `CREATE_DEPT` bigint(64) NULL DEFAULT NULL COMMENT '创建部门', - `STATUS` int(2) NULL DEFAULT 0 COMMENT '状态', - `IS_DELETED` int(2) NULL DEFAULT 0 COMMENT '是否已删除: 0、否； 1、是', - PRIMARY KEY (`ID`) USING BTREE +CREATE TABLE `equipment`.`hzims_em_association_detail` ( + `PID` bigint(20) NOT NULL COMMENT '父id', + `ID` bigint(20) NOT NULL COMMENT '主键Id', + `EM_POINT_ID` bigint(20) NOT NULL COMMENT '设备点Id', + `FDP_EM_POINT_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'FDP点Id', + `FDP_EM_POINT_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'FDP监测点名称', + `FDP_EM_POINT_ORD` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'FDP监测点位置', + `PRO_TYPE` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '属性类型：yc、yx、soe', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', + `CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '创建人', + `UPDATE_USER` bigint(64) NULL DEFAULT NULL COMMENT '修改人', + `CREATE_DEPT` bigint(64) NULL DEFAULT NULL COMMENT '创建部门', + `STATUS` int(2) NULL DEFAULT 0 COMMENT '状态', + `IS_DELETED` int(2) NULL DEFAULT 0 COMMENT '是否已删除: 0、否； 1、是', + PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备关联明细表' ROW_FORMAT = Dynamic; -ALTER TABLE `dev_equipment`.`hzims_em_info` ADD COLUMN `em_index` tinyint(4) NULL DEFAULT NULL COMMENT '设备序号' AFTER `CREATE_DEPT`; +ALTER TABLE `equipment`.`hzims_em_info` ADD COLUMN `em_index` tinyint(4) NULL DEFAULT NULL COMMENT '设备序号' AFTER `CREATE_DEPT`; -ALTER TABLE `dev_equipment`.`hzims_em_info` ADD COLUMN `DEVICE_INSTANCE_ID` bigint(20) NULL DEFAULT NULL COMMENT '设备实例化Id' AFTER `em_index`; +ALTER TABLE `equipment`.`hzims_em_info` ADD COLUMN `DEVICE_INSTANCE_ID` bigint(20) NULL DEFAULT NULL COMMENT '设备实例化Id' AFTER `em_index`; -ALTER TABLE `dev_equipment`.`hzims_em_info` ADD COLUMN `em_type` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备类型' AFTER `DEVICE_INSTANCE_ID`; +ALTER TABLE `equipment`.`hzims_em_info` ADD COLUMN `em_type` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备类型' AFTER `DEVICE_INSTANCE_ID`; -ALTER TABLE `dev_equipment`.`hzims_em_info` ADD COLUMN `set_type` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机组类型' AFTER `em_type`; +ALTER TABLE `equipment`.`hzims_em_info` ADD COLUMN `set_type` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机组类型' AFTER `em_type`; -ALTER TABLE `dev_equipment`.`hzims_em_info` MODIFY COLUMN `NUMBER` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备编号' AFTER `ID`; +ALTER TABLE `equipment`.`hzims_em_info` MODIFY COLUMN `NUMBER` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备编号' AFTER `ID`; -ALTER TABLE `dev_equipment`.`hzims_em_info` MODIFY COLUMN `HOME_PAGE_DISPLAY` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '首页展示' AFTER `LINKER_PHONE`; +ALTER TABLE `equipment`.`hzims_em_info` MODIFY COLUMN `HOME_PAGE_DISPLAY` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '首页展示' AFTER `LINKER_PHONE`; -ALTER TABLE `dev_equipment`.`hzims_em_info` MODIFY COLUMN `GRADE_CODE` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备等级' AFTER `MANAGER`; +ALTER TABLE `equipment`.`hzims_em_info` MODIFY COLUMN `GRADE_CODE` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备等级' AFTER `MANAGER`; -ALTER TABLE `dev_equipment`.`hzims_em_info` MODIFY COLUMN `RUN_STATUS` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '2' COMMENT '运行状态' AFTER `INS_LOCATION`; +ALTER TABLE `equipment`.`hzims_em_info` MODIFY COLUMN `RUN_STATUS` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '2' COMMENT '运行状态' AFTER `INS_LOCATION`; -CREATE TABLE `dev_equipment`.`hzims_workshop_equipment` ( - `ID` bigint(20) NOT NULL COMMENT '主键ID', - `WORKSHOP_ID` bigint(20) NOT NULL COMMENT '厂房ID', - `WORKSHOP_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '厂房名称', - `EM_ID` bigint(20) NOT NULL COMMENT '设备ID', - `EM_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备名称', - `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', - `CREATE_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', - `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人', - `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `IS_DELETED` tinyint(4) NOT NULL COMMENT '是否删除', - `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态 0-启用 1-停用', - `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门', - PRIMARY KEY (`ID`) USING BTREE +CREATE TABLE `equipment`.`hzims_workshop_equipment` ( + `ID` bigint(20) NOT NULL COMMENT '主键ID', + `WORKSHOP_ID` bigint(20) NOT NULL COMMENT '厂房ID', + `WORKSHOP_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '厂房名称', + `EM_ID` bigint(20) NOT NULL COMMENT '设备ID', + `EM_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备名称', + `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', + `CREATE_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人', + `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '更新人', + `IS_DELETED` tinyint(4) NOT NULL COMMENT '是否删除', + `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态 0-启用 1-停用', + `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门', + PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; -CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `dev_equipment`.`v_hzims_fdp_fualt` AS (select `t1`.`ID` AS `ID`,`t1`.`FDP_ID` AS `FDP_ID`,`t1`.`NAME` AS `NAME`,`t1`.`INFO` AS `INFO`,`t1`.`EM_CODE` AS `EM_CODE`,`t1`.`DETECTABILITY` AS `DETECTABILITY`,`t1`.`SEVERITY` AS `SEVERITY`,`t1`.`FDP_DEVICE_ID` AS `FDP_DEVICE_ID`,`t1`.`FDP_DEVICE_NAME` AS `FDP_DEVICE_NAME`,`t1`.`ORD` AS `ORD`,`t1`.`DISPLAY` AS `DISPLAY`,`t1`.`TENANT_ID` AS `TENANT_ID`,`t1`.`CREATE_TIME` AS `CREATE_TIME`,`t1`.`UPDATE_TIME` AS `UPDATE_TIME`,`t1`.`CREATE_USER` AS `CREATE_USER`,`t1`.`UPDATE_USER` AS `UPDATE_USER`,`t1`.`IS_DELETED` AS `IS_DELETED`,`t1`.`STATUS` AS `STATUS`,`t1`.`CREATE_DEPT` AS `CREATE_DEPT`,`t2`.`FAULT_AMOUNT` AS `FAULT_AMOUNT` from (`dev_equipment`.`hzims_fdp_fault` `t1` join (select `t`.`NAME` AS `name`,count(`t`.`NAME`) AS `FAULT_AMOUNT` from `dev_equipment`.`hzims_fdp_fault` `t` group by `t`.`NAME` order by count(`t`.`NAME`) desc) `t2`) where (`t1`.`NAME` = `t2`.`name`) order by `t2`.`FAULT_AMOUNT` desc); +CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `equipment`.`v_hzims_fdp_fualt` AS (select `t1`.`ID` AS `ID`,`t1`.`FDP_ID` AS `FDP_ID`,`t1`.`NAME` AS `NAME`,`t1`.`INFO` AS `INFO`,`t1`.`EM_CODE` AS `EM_CODE`,`t1`.`DETECTABILITY` AS `DETECTABILITY`,`t1`.`SEVERITY` AS `SEVERITY`,`t1`.`FDP_DEVICE_ID` AS `FDP_DEVICE_ID`,`t1`.`FDP_DEVICE_NAME` AS `FDP_DEVICE_NAME`,`t1`.`ORD` AS `ORD`,`t1`.`DISPLAY` AS `DISPLAY`,`t1`.`TENANT_ID` AS `TENANT_ID`,`t1`.`CREATE_TIME` AS `CREATE_TIME`,`t1`.`UPDATE_TIME` AS `UPDATE_TIME`,`t1`.`CREATE_USER` AS `CREATE_USER`,`t1`.`UPDATE_USER` AS `UPDATE_USER`,`t1`.`IS_DELETED` AS `IS_DELETED`,`t1`.`STATUS` AS `STATUS`,`t1`.`CREATE_DEPT` AS `CREATE_DEPT`,`t2`.`FAULT_AMOUNT` AS `FAULT_AMOUNT` from (`equipment`.`hzims_fdp_fault` `t1` join (select `t`.`NAME` AS `name`,count(`t`.`NAME`) AS `FAULT_AMOUNT` from `equipment`.`hzims_fdp_fault` `t` group by `t`.`NAME` order by count(`t`.`NAME`) desc) `t2`) where (`t1`.`NAME` = `t2`.`name`) order by `t2`.`FAULT_AMOUNT` desc); -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; + +-- 设备信息字典添加 +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1633016108671905794, 0, 'deviceType', '-1', '设备类型', 10, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1633016255816478722, 1633016108671905794, 'deviceType', '1', '公用', 1, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1633016338171637761, 1633016108671905794, 'deviceType', '2', '机组', 2, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638000391480205313, 1633016338171637761, 'deviceType', '3', '立式机组', 1, '', 0, 1, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638000491426275330, 1633016338171637761, 'deviceType', '4', '卧式机组', 2, '', 0, 1, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638000590814502914, 1633016338171637761, 'deviceType', '5', '灯泡贯流式', 3, '', 0, 1, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638020338327543810, 1633016108671905794, 'deviceType', '3', '其他', 3, '', 0, 0, 0, -1, 'hzims-equipment'); + +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638020560906674177, 0, 'setType', '-1', '机组类型', 7, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638020669019054082, 1638020560906674177, 'setType', '1', '立式机组', 1, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638020767178350594, 1638020560906674177, 'setType', '2', '卧式机组', 2, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1638020840851300353, 1638020560906674177, 'setType', '3', '其他', 3, '', 0, 1, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645258692320387074, 1638020560906674177, 'setType', '3', '灯泡贯流式机组', 3, '', 0, 0, 0, -1, 'hzims-equipment'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645258829365075970, 1638020560906674177, 'setType', '4', '其他', 4, '', 0, 0, 0, -1, 'hzims-equipment'); diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 5e66ba4..56dd88f 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -43,6 +43,11 @@ + redis.clients + jedis + + + org.springblade blade-common diff --git a/hzims-service/message/src/main/resources/db/1.0.0.sql b/hzims-service/message/src/main/resources/db/1.0.0.sql index 81fc953..074148b 100644 --- a/hzims-service/message/src/main/resources/db/1.0.0.sql +++ b/hzims-service/message/src/main/resources/db/1.0.0.sql @@ -1,12 +1,12 @@ SET FOREIGN_KEY_CHECKS=0; -ALTER TABLE `dev_hzims_message`.`hzims_app_log` MODIFY COLUMN `TYPE` tinyint(4) NULL DEFAULT NULL COMMENT '消息类型' AFTER `BUSINESS_CLASSIFY`; +ALTER TABLE `hzims_message`.`hzims_app_log` MODIFY COLUMN `TYPE` tinyint(4) NULL DEFAULT NULL COMMENT '消息类型' AFTER `BUSINESS_CLASSIFY`; -ALTER TABLE `dev_hzims_message`.`hzims_mail_config` ADD COLUMN `DURATION` mediumint(9) NULL DEFAULT NULL COMMENT '多长时间内的推送' AFTER `IS_DELETED`; +ALTER TABLE `hzims_message`.`hzims_mail_config` ADD COLUMN `DURATION` mediumint(9) NULL DEFAULT NULL COMMENT '多长时间内的推送' AFTER `IS_DELETED`; -ALTER TABLE `dev_hzims_message`.`hzims_mail_config` ADD COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; +ALTER TABLE `hzims_message`.`hzims_mail_config` ADD COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; -CREATE TABLE `dev_hzims_message`.`hzims_message_push_record` ( +CREATE TABLE `hzims_message`.`hzims_message_push_record` ( `ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID', `TASK_ID` bigint(20) NOT NULL COMMENT '消息类型', `TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息模板ID', @@ -43,7 +43,7 @@ CREATE TABLE `dev_hzims_message`.`hzims_message_push_record` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '消息推送记录' ROW_FORMAT = Dynamic; -CREATE TABLE `dev_hzims_message`.`hzims_message_template` ( +CREATE TABLE `hzims_message`.`hzims_message_template` ( `ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '消息类型', `TYPE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键ID', `BUSINESS_KEY` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务关键字', @@ -64,9 +64,9 @@ CREATE TABLE `dev_hzims_message`.`hzims_message_template` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '消息推送模板' ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_message`.`hzims_push_config` MODIFY COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; +ALTER TABLE `hzims_message`.`hzims_push_config` MODIFY COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; -CREATE TABLE `dev_hzims_message`.`hzims_push_message` ( +CREATE TABLE `hzims_message`.`hzims_push_message` ( `ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID', `MESSAGE_TYPE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息类型', `BUSINESS_KEY` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '业务key值', @@ -85,30 +85,12 @@ CREATE TABLE `dev_hzims_message`.`hzims_push_message` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_message`.`hzims_sms_config` MODIFY COLUMN `CONTENT_VARIABLES` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '短信模板参数变量定义' AFTER `IS_DELETED`; +ALTER TABLE `hzims_message`.`hzims_sms_config` MODIFY COLUMN `CONTENT_VARIABLES` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '短信模板参数变量定义' AFTER `IS_DELETED`; -ALTER TABLE `dev_hzims_message`.`hzims_sms_config` MODIFY COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; +ALTER TABLE `hzims_message`.`hzims_sms_config` MODIFY COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; -ALTER TABLE `dev_hzims_message`.`hzims_ws_config` ADD COLUMN `DURATION` mediumint(9) NULL DEFAULT NULL COMMENT '多长时间内的推送' AFTER `IS_DELETED`; +ALTER TABLE `hzims_message`.`hzims_ws_config` ADD COLUMN `DURATION` mediumint(9) NULL DEFAULT NULL COMMENT '多长时间内的推送' AFTER `IS_DELETED`; -ALTER TABLE `dev_hzims_message`.`hzims_ws_config` ADD COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; - -DROP TABLE `dev_hzims_message`.`hz_msg_push_record`; - -DROP TABLE `dev_hzims_message`.`hz_msg_push_record_copy1`; - -DROP TABLE `dev_hzims_message`.`hz_msg_sms_record`; - -DROP TABLE `dev_hzims_message`.`hz_msg_sms_record_copy1`; - -DROP TABLE `dev_hzims_message`.`hz_msg_ws_record`; - -DROP TABLE `dev_hzims_message`.`hz_msg_ws_record_copy1`; - -DROP TABLE `dev_hzims_message`.`hz_msg_ws_record_history`; - -DROP TABLE `dev_hzims_message`.`hz_msg_ws_record_history_copy1`; - -DROP TABLE `dev_hzims_message`.`hzims_msg_mail_record`; +ALTER TABLE `hzims_message`.`hzims_ws_config` ADD COLUMN `TIME_UNIT` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '时间单位' AFTER `DURATION`; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/hzims-service/operational/src/main/resources/db/1.0.0.sql b/hzims-service/operational/src/main/resources/db/1.0.0.sql index 9674a0a..1baa1d9 100644 --- a/hzims-service/operational/src/main/resources/db/1.0.0.sql +++ b/hzims-service/operational/src/main/resources/db/1.0.0.sql @@ -1,12 +1,12 @@ SET FOREIGN_KEY_CHECKS=0; -ALTER TABLE `dev_hzims_operation`.`hy_st_alarm_record` MODIFY COLUMN `PROCESS_TIME` datetime(0) NULL DEFAULT NULL COMMENT '处理时间' AFTER `PROCESSOR`; +ALTER TABLE `hzims_operation`.`hy_st_alarm_record` MODIFY COLUMN `PROCESS_TIME` datetime(0) NULL DEFAULT NULL COMMENT '处理时间' AFTER `PROCESSOR`; -ALTER TABLE `dev_hzims_operation`.`hy_st_alarm_record` MODIFY COLUMN `CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间' AFTER `TENANT_ID`; +ALTER TABLE `hzims_operation`.`hy_st_alarm_record` MODIFY COLUMN `CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间' AFTER `TENANT_ID`; -ALTER TABLE `dev_hzims_operation`.`hy_st_alarm_record` MODIFY COLUMN `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间' AFTER `CREATE_TIME`; +ALTER TABLE `hzims_operation`.`hy_st_alarm_record` MODIFY COLUMN `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间' AFTER `CREATE_TIME`; -CREATE TABLE `dev_hzims_operation`.`hz_ims_duty_analyse_example` ( +CREATE TABLE `hzims_operation`.`hz_ims_duty_analyse_example` ( `ID` bigint(20) NOT NULL, `SITE_ID` bigint(22) NULL DEFAULT NULL COMMENT '站点ID', `SITE_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', @@ -28,7 +28,7 @@ CREATE TABLE `dev_hzims_operation`.`hz_ims_duty_analyse_example` ( INDEX `EQUIPMENT_ID_INDEX`(`EQUIPMENT_ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `dev_hzims_operation`.`hz_ims_duty_emergency` ( +CREATE TABLE `hzims_operation`.`hz_ims_duty_emergency` ( `ID` bigint(20) NOT NULL COMMENT '突发事件登记表', `DUTY_TIME` datetime(0) NOT NULL COMMENT '值班日期', `DUTY_CLASS` bigint(20) NOT NULL COMMENT '班次', @@ -49,11 +49,11 @@ CREATE TABLE `dev_hzims_operation`.`hz_ims_duty_emergency` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_operation`.`hz_ims_duty_main` MODIFY COLUMN `DUTY_PERSON_IDS` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '值班人IDS, ID之间用^隔开' AFTER `CLASS_ID`; +ALTER TABLE `hzims_operation`.`hz_ims_duty_main` MODIFY COLUMN `DUTY_PERSON_IDS` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '值班人IDS, ID之间用^隔开' AFTER `CLASS_ID`; -ALTER TABLE `dev_hzims_operation`.`hz_ims_duty_main` MODIFY COLUMN `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID' AFTER `REMARK`; +ALTER TABLE `hzims_operation`.`hz_ims_duty_main` MODIFY COLUMN `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID' AFTER `REMARK`; -CREATE TABLE `dev_hzims_operation`.`hz_ims_duty_main_person` ( +CREATE TABLE `hzims_operation`.`hz_ims_duty_main_person` ( `ID` bigint(20) NOT NULL COMMENT '主键ID（排班计划-人员表）', `DUTY_MAIN_ID` bigint(20) NULL DEFAULT NULL COMMENT '值班-班组表ID', `DUTY_GROUP_ID` bigint(20) NULL DEFAULT NULL COMMENT '值班组id（灵活排版无ID）', @@ -75,23 +75,23 @@ CREATE TABLE `dev_hzims_operation`.`hz_ims_duty_main_person` ( INDEX `index_person`(`DUTY_PERSON`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_operation`.`hz_ims_duty_main_template` ADD COLUMN `TYPE` tinyint(4) NOT NULL DEFAULT 1 COMMENT '1 班组，2灵活排班' AFTER `TEMPLATE_NAME`; +ALTER TABLE `hzims_operation`.`hz_ims_duty_main_template` ADD COLUMN `TYPE` tinyint(4) NOT NULL DEFAULT 1 COMMENT '1 班组，2灵活排班' AFTER `TEMPLATE_NAME`; -ALTER TABLE `dev_hzims_operation`.`hz_ims_duty_main_template` ADD COLUMN `FLEXIBLE` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灵活排班人员ID' AFTER `DUTY_ARR_IDS`; +ALTER TABLE `hzims_operation`.`hz_ims_duty_main_template` ADD COLUMN `FLEXIBLE` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '灵活排班人员ID' AFTER `DUTY_ARR_IDS`; -ALTER TABLE `dev_hzims_operation`.`hz_ims_duty_main_template` MODIFY COLUMN `DUTY_ORDER_IDS` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '班组值班周期id' AFTER `TYPE`; +ALTER TABLE `hzims_operation`.`hz_ims_duty_main_template` MODIFY COLUMN `DUTY_ORDER_IDS` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '班组值班周期id' AFTER `TYPE`; -ALTER TABLE `dev_hzims_operation`.`hz_ims_duty_rec` MODIFY COLUMN `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态（1 未提交，2流程审核中，3已完成。）' AFTER `DELAY_STATUS`; +ALTER TABLE `hzims_operation`.`hz_ims_duty_rec` MODIFY COLUMN `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态（1 未提交，2流程审核中，3已完成。）' AFTER `DELAY_STATUS`; -ALTER TABLE `dev_hzims_operation`.`hzims_alarm_handle` ADD COLUMN `ALARM_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警主键ID' AFTER `ID`; +ALTER TABLE `hzims_operation`.`hzims_alarm_handle` ADD COLUMN `ALARM_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警主键ID' AFTER `ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_alarm_handle` ADD COLUMN `TYPE` tinyint(1) NULL DEFAULT NULL COMMENT '类型：0-系统告警 1-智能告警' AFTER `ALARM_CONTENT`; +ALTER TABLE `hzims_operation`.`hzims_alarm_handle` ADD COLUMN `TYPE` tinyint(1) NULL DEFAULT NULL COMMENT '类型：0-系统告警 1-智能告警' AFTER `ALARM_CONTENT`; -ALTER TABLE `dev_hzims_operation`.`hzims_alarm_handle_detail` ADD COLUMN `HANDLE_USER` bigint(20) NULL DEFAULT NULL COMMENT '通知处理人' AFTER `ID`; +ALTER TABLE `hzims_operation`.`hzims_alarm_handle_detail` ADD COLUMN `HANDLE_USER` bigint(20) NULL DEFAULT NULL COMMENT '通知处理人' AFTER `ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_app_version` MODIFY COLUMN `CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '修改时间' AFTER `IS_DELETED`; +ALTER TABLE `hzims_operation`.`hzims_app_version` MODIFY COLUMN `CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '修改时间' AFTER `IS_DELETED`; -CREATE TABLE `dev_hzims_operation`.`hzims_fill_generate` ( +CREATE TABLE `hzims_operation`.`hzims_fill_generate` ( `ID` bigint(20) NOT NULL COMMENT '主键ID', `STATION_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号', `STATION_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', @@ -109,15 +109,15 @@ CREATE TABLE `dev_hzims_operation`.`hzims_fill_generate` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_operation`.`hzims_fill_over` MODIFY COLUMN `ENCL_NAME` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件名称' AFTER `ENCL_PATH`; +ALTER TABLE `hzims_operation`.`hzims_fill_over` MODIFY COLUMN `ENCL_NAME` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件名称' AFTER `ENCL_PATH`; -ALTER TABLE `dev_hzims_operation`.`hzims_fill_over_config` MODIFY COLUMN `SORT` tinyint(4) NOT NULL COMMENT '排序' AFTER `UNIT_PRICE`; +ALTER TABLE `hzims_operation`.`hzims_fill_over_config` MODIFY COLUMN `SORT` tinyint(4) NOT NULL COMMENT '排序' AFTER `UNIT_PRICE`; -ALTER TABLE `dev_hzims_operation`.`hzims_fill_over_config` ADD UNIQUE INDEX `OVER_NAME`(`OVER_NAME`) USING BTREE; +ALTER TABLE `hzims_operation`.`hzims_fill_over_config` ADD UNIQUE INDEX `OVER_NAME`(`OVER_NAME`) USING BTREE; -ALTER TABLE `dev_hzims_operation`.`hzims_fill_power` MODIFY COLUMN `POWER_MON` double(20, 2) NULL DEFAULT 0.00 COMMENT '月发电量' AFTER `PLANNED_POWER_MON`; +ALTER TABLE `hzims_operation`.`hzims_fill_power` MODIFY COLUMN `POWER_MON` double(20, 2) NULL DEFAULT 0.00 COMMENT '月发电量' AFTER `PLANNED_POWER_MON`; -CREATE TABLE `dev_hzims_operation`.`hzims_fill_rainfall` ( +CREATE TABLE `hzims_operation`.`hzims_fill_rainfall` ( `ID` bigint(20) NOT NULL COMMENT '主键ID', `STATION_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号', `STATION_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', @@ -134,7 +134,7 @@ CREATE TABLE `dev_hzims_operation`.`hzims_fill_rainfall` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `dev_hzims_operation`.`hzims_fill_storage` ( +CREATE TABLE `hzims_operation`.`hzims_fill_storage` ( `ID` bigint(20) NOT NULL COMMENT '主键ID', `STATION_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号', `STATION_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', @@ -151,7 +151,7 @@ CREATE TABLE `dev_hzims_operation`.`hzims_fill_storage` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `dev_hzims_operation`.`hzims_fill_use` ( +CREATE TABLE `hzims_operation`.`hzims_fill_use` ( `ID` bigint(20) NOT NULL COMMENT '主键ID', `STATION_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号', `STATION_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', @@ -169,25 +169,25 @@ CREATE TABLE `dev_hzims_operation`.`hzims_fill_use` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `ALARM_ID` bigint(20) NULL DEFAULT NULL COMMENT '告警编号' AFTER `STATION_NAME`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `ALARM_ID` bigint(20) NULL DEFAULT NULL COMMENT '告警编号' AFTER `STATION_NAME`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID' AFTER `SOE_EXPLAIN`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID' AFTER `SOE_EXPLAIN`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建单位' AFTER `STATUS`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建单位' AFTER `STATUS`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `CREATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '创建人' AFTER `CREATE_DEPT`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `CREATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '创建人' AFTER `CREATE_DEPT`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '修改人' AFTER `CREATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` ADD COLUMN `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '修改人' AFTER `CREATE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `SOE_EXPLAIN` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警原因' AFTER `TYPE`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `SOE_EXPLAIN` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警原因' AFTER `TYPE`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '业务状态' AFTER `TENANT_ID`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '业务状态' AFTER `TENANT_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '修改时间' AFTER `UPDATE_USER`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '修改时间' AFTER `UPDATE_USER`; -ALTER TABLE `dev_hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除' AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_history_abnormal_alarm` MODIFY COLUMN `IS_DELETED` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否删除' AFTER `UPDATE_TIME`; -CREATE TABLE `dev_hzims_operation`.`hzims_history_level_alarm` ( +CREATE TABLE `hzims_operation`.`hzims_history_level_alarm` ( `ID` bigint(20) NOT NULL COMMENT '主键ID', `STATION_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点ID', `STATION_NAME` varchar(168) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称', @@ -210,69 +210,69 @@ CREATE TABLE `dev_hzims_operation`.`hzims_history_level_alarm` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_operation`.`hzims_main_work_bench` MODIFY COLUMN `ORD` int(11) NULL DEFAULT NULL COMMENT '排序' AFTER `ENABLE_FLAG`; +ALTER TABLE `hzims_operation`.`hzims_main_work_bench` MODIFY COLUMN `ORD` int(11) NULL DEFAULT NULL COMMENT '排序' AFTER `ENABLE_FLAG`; -ALTER TABLE `dev_hzims_operation`.`hzims_main_work_bench` MODIFY COLUMN `REF_DEPT` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属机构' AFTER `ORD`; +ALTER TABLE `hzims_operation`.`hzims_main_work_bench` MODIFY COLUMN `REF_DEPT` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属机构' AFTER `ORD`; -ALTER TABLE `dev_hzims_operation`.`hzims_month_report` MODIFY COLUMN `OBJECT` blob NULL COMMENT '报表保存对象' AFTER `TYPE`; +ALTER TABLE `hzims_operation`.`hzims_month_report` MODIFY COLUMN `OBJECT` blob NULL COMMENT '报表保存对象' AFTER `TYPE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_access_plan` MODIFY COLUMN `PHENOMENON_ID` bigint(20) NULL DEFAULT NULL COMMENT '现象ID' AFTER `DESCRIPITON`; +ALTER TABLE `hzims_operation`.`hzims_oper_access_plan` MODIFY COLUMN `PHENOMENON_ID` bigint(20) NULL DEFAULT NULL COMMENT '现象ID' AFTER `DESCRIPITON`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_access_task` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '模板id' AFTER `phenomenon_id`; +ALTER TABLE `hzims_operation`.`hzims_oper_access_task` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '模板id' AFTER `phenomenon_id`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `PROCESS_INSTANCE_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '工作流实例' AFTER `EM_CODE`; +ALTER TABLE `hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `PROCESS_INSTANCE_ID` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '工作流实例' AFTER `EM_CODE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `ticket_id` bigint(20) NULL DEFAULT NULL AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `ticket_id` bigint(20) NULL DEFAULT NULL AFTER `UPDATE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `delay_date` datetime(0) NULL DEFAULT NULL AFTER `ticket_id`; +ALTER TABLE `hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `delay_date` datetime(0) NULL DEFAULT NULL AFTER `ticket_id`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `DELAY_STATUS` tinyint(4) NULL DEFAULT NULL AFTER `delay_date`; +ALTER TABLE `hzims_operation`.`hzims_oper_access_task` MODIFY COLUMN `DELAY_STATUS` tinyint(4) NULL DEFAULT NULL AFTER `delay_date`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_fault` MODIFY COLUMN `FAULT_TYPE` tinyint(4) NULL DEFAULT NULL COMMENT '0- 标准；1 - 非标准' AFTER `FAULT_NAME`; +ALTER TABLE `hzims_operation`.`hzims_oper_fault` MODIFY COLUMN `FAULT_TYPE` tinyint(4) NULL DEFAULT NULL COMMENT '0- 标准；1 - 非标准' AFTER `FAULT_NAME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_library` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息推送模板ID' AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_library` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息推送模板ID' AFTER `UPDATE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_library` MODIFY COLUMN `em_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编码' AFTER `PROC_DEF_ID`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_library` MODIFY COLUMN `em_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编码' AFTER `PROC_DEF_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_plan` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息推送模板ID' AFTER `TASK_TYPE`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_plan` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息推送模板ID' AFTER `TASK_TYPE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_plan` MODIFY COLUMN `em_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编码' AFTER `ID`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_plan` MODIFY COLUMN `em_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编码' AFTER `ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_plan` MODIFY COLUMN `TASK_TYPE` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0：系统生成任务,1：临时任务' AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_plan` MODIFY COLUMN `TASK_TYPE` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0：系统生成任务,1：临时任务' AFTER `UPDATE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息推送模板ID' AFTER `plan_id`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` ADD COLUMN `MESSAGE_TEMPLATE_ID` bigint(20) NULL DEFAULT NULL COMMENT '消息推送模板ID' AFTER `plan_id`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `em_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编码' AFTER `ID`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `em_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编码' AFTER `ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `TASK_CODE` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `TYPE_CODE`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `TASK_CODE` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `TYPE_CODE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DISPOSER` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执行人（按，分隔）' AFTER `PROCESS_INSTANCE_ID`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DISPOSER` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执行人（按，分隔）' AFTER `PROCESS_INSTANCE_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DISPOSE_TIME` datetime(0) NOT NULL COMMENT '任务按周期生成计划开始时间' AFTER `DISPOSER`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DISPOSE_TIME` datetime(0) NOT NULL COMMENT '任务按周期生成计划开始时间' AFTER `DISPOSER`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `EXECUTE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '任务执行日期' AFTER `DISPOSE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `EXECUTE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '任务执行日期' AFTER `DISPOSE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `PUSH_MSG_STATUS` tinyint(4) NULL DEFAULT 0 COMMENT '消息推送状态 0=未推送 1=已推送' AFTER `DESCRIPTION`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `PUSH_MSG_STATUS` tinyint(4) NULL DEFAULT 0 COMMENT '消息推送状态 0=未推送 1=已推送' AFTER `DESCRIPTION`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `TASK_TYPE` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0：系统生成任务,1：临时任务' AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `TASK_TYPE` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '0：系统生成任务,1：临时任务' AFTER `UPDATE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DELAY_STATUS` tinyint(4) NULL DEFAULT NULL AFTER `TASK_TYPE`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DELAY_STATUS` tinyint(4) NULL DEFAULT NULL AFTER `TASK_TYPE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DELAY_DATE` datetime(0) NULL DEFAULT NULL AFTER `DELAY_STATUS`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `DELAY_DATE` datetime(0) NULL DEFAULT NULL AFTER `DELAY_STATUS`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `TICKET_ID` bigint(20) NULL DEFAULT NULL AFTER `DELAY_DATE`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `TICKET_ID` bigint(20) NULL DEFAULT NULL AFTER `DELAY_DATE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `PLAN_END_TIME` datetime(0) NULL DEFAULT NULL AFTER `TICKET_ID`; +ALTER TABLE `hzims_operation`.`hzims_oper_maintenance_task` MODIFY COLUMN `PLAN_END_TIME` datetime(0) NULL DEFAULT NULL AFTER `TICKET_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `EM_CODE` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编号' AFTER `NAME`; +ALTER TABLE `hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `EM_CODE` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设备编号' AFTER `NAME`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `HANDLE_TASK_ID` bigint(20) NULL DEFAULT NULL COMMENT '处理任务ID' AFTER `HANDLE_TYPE`; +ALTER TABLE `hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `HANDLE_TASK_ID` bigint(20) NULL DEFAULT NULL COMMENT '处理任务ID' AFTER `HANDLE_TYPE`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `HANDLER` bigint(20) NULL DEFAULT NULL COMMENT '处理人，处理工作流的第一个处理人' AFTER `HANDLE_TASK_ID`; +ALTER TABLE `hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `HANDLER` bigint(20) NULL DEFAULT NULL COMMENT '处理人，处理工作流的第一个处理人' AFTER `HANDLE_TASK_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人' AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_oper_phenomenon` MODIFY COLUMN `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人' AFTER `UPDATE_TIME`; -CREATE TABLE `dev_hzims_operation`.`hzims_review_standard` ( +CREATE TABLE `hzims_operation`.`hzims_review_standard` ( `id` bigint(20) NOT NULL COMMENT '主键ID', `review_id` bigint(20) NOT NULL COMMENT '评审ID', `standard_id` tinyint(4) NOT NULL COMMENT '标准ID', @@ -289,53 +289,53 @@ CREATE TABLE `dev_hzims_operation`.`hzims_review_standard` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -ALTER TABLE `dev_hzims_operation`.`hzims_station` ADD COLUMN `SEND_MESSAGE_FLAG` tinyint(4) NULL DEFAULT NULL COMMENT '0-不推送告警短信 1-推送告警短信' AFTER `CONTACTOR`; +ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `SEND_MESSAGE_FLAG` tinyint(4) NULL DEFAULT NULL COMMENT '0-不推送告警短信 1-推送告警短信' AFTER `CONTACTOR`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` ADD COLUMN `DATA_ORIGIN` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据来源: 0 - 数据采集 1 - 数据填报' AFTER `HIGHER_DEPT`; +ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `DATA_ORIGIN` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据来源: 0 - 数据采集 1 - 数据填报' AFTER `HIGHER_DEPT`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` ADD COLUMN `DATA_SOURCE` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据采集方式' AFTER `DATA_ORIGIN`; +ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `DATA_SOURCE` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据采集方式' AFTER `DATA_ORIGIN`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` ADD COLUMN `SECRET_KEY` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '实时画面绑定账号秘钥' AFTER `DATA_SOURCE`; +ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `SECRET_KEY` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '实时画面绑定账号秘钥' AFTER `DATA_SOURCE`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` ADD COLUMN `SIGNAGE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点标识-两票编码' AFTER `SECRET_KEY`; +ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `SIGNAGE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点标识-两票编码' AFTER `SECRET_KEY`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` MODIFY COLUMN `REF_DOMAIN` smallint(6) NULL DEFAULT 1 COMMENT '所属行业（来源于字典表如水电）' AFTER `ID`; +ALTER TABLE `hzims_operation`.`hzims_station` MODIFY COLUMN `REF_DOMAIN` smallint(6) NULL DEFAULT 1 COMMENT '所属行业（来源于字典表如水电）' AFTER `ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` MODIFY COLUMN `SERVE_TYPE` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点服务类型：1、云服务; 2、运维服务' AFTER `NAME`; +ALTER TABLE `hzims_operation`.`hzims_station` MODIFY COLUMN `SERVE_TYPE` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点服务类型：1、云服务; 2、运维服务' AFTER `NAME`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` MODIFY COLUMN `WATER_LEVEL_MAX` decimal(6, 2) NULL COMMENT '前池最高水位' AFTER `TYPE`; +ALTER TABLE `hzims_operation`.`hzims_station` MODIFY COLUMN `WATER_LEVEL_MAX` decimal(6, 2) NULL COMMENT '前池最高水位' AFTER `TYPE`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` MODIFY COLUMN `LIMIT_WATER_LEVEL` decimal(6, 2) NULL COMMENT '限制水位' AFTER `WATER_LEVEL_MAX`; +ALTER TABLE `hzims_operation`.`hzims_station` MODIFY COLUMN `LIMIT_WATER_LEVEL` decimal(6, 2) NULL COMMENT '限制水位' AFTER `WATER_LEVEL_MAX`; -ALTER TABLE `dev_hzims_operation`.`hzims_station` ADD UNIQUE INDEX `hzims_station_pk`(`SIGNAGE`) USING BTREE; +ALTER TABLE `hzims_operation`.`hzims_station` ADD UNIQUE INDEX `hzims_station_pk`(`SIGNAGE`) USING BTREE; -ALTER TABLE `dev_hzims_operation`.`hzims_station_attribute` ADD COLUMN `SIGNAGE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加物模型属性标识' AFTER `monitor_station_code`; +ALTER TABLE `hzims_operation`.`hzims_station_attribute` ADD COLUMN `SIGNAGE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加物模型属性标识' AFTER `monitor_station_code`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_attribute` ADD COLUMN `SIGNAGE_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加物模型属性标识名称' AFTER `SIGNAGE`; +ALTER TABLE `hzims_operation`.`hzims_station_attribute` ADD COLUMN `SIGNAGE_NAME` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '加物模型属性标识名称' AFTER `SIGNAGE`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_attribute` MODIFY COLUMN `GROUP_ID` tinyint(4) NULL DEFAULT NULL COMMENT '属性分组ID' AFTER `EM_NAME`; +ALTER TABLE `hzims_operation`.`hzims_station_attribute` MODIFY COLUMN `GROUP_ID` tinyint(4) NULL DEFAULT NULL COMMENT '属性分组ID' AFTER `EM_NAME`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` COMMENT = '站点-用户关系绑定表'; +ALTER TABLE `hzims_operation`.`hzims_station_user` COMMENT = '站点-用户关系绑定表'; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` MODIFY COLUMN `ID` bigint(20) NOT NULL COMMENT '主键' FIRST; +ALTER TABLE `hzims_operation`.`hzims_station_user` MODIFY COLUMN `ID` bigint(20) NOT NULL COMMENT '主键' FIRST; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` MODIFY COLUMN `STATION_ID` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '站点编码' AFTER `ID`; +ALTER TABLE `hzims_operation`.`hzims_station_user` MODIFY COLUMN `STATION_ID` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '站点编码' AFTER `ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` MODIFY COLUMN `USER_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户ID' AFTER `STATION_ID`; +ALTER TABLE `hzims_operation`.`hzims_station_user` MODIFY COLUMN `USER_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户ID' AFTER `STATION_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` MODIFY COLUMN `CREATE_TIME` datetime(0) NOT NULL COMMENT '创建时间' AFTER `TENANT_ID`; +ALTER TABLE `hzims_operation`.`hzims_station_user` MODIFY COLUMN `CREATE_TIME` datetime(0) NOT NULL COMMENT '创建时间' AFTER `TENANT_ID`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` MODIFY COLUMN `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人' AFTER `UPDATE_TIME`; +ALTER TABLE `hzims_operation`.`hzims_station_user` MODIFY COLUMN `CREATE_USER` bigint(20) NOT NULL COMMENT '创建人' AFTER `UPDATE_TIME`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_user` MODIFY COLUMN `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态 ' AFTER `IS_DELETED`; +ALTER TABLE `hzims_operation`.`hzims_station_user` MODIFY COLUMN `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态 ' AFTER `IS_DELETED`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_video_type` ADD COLUMN `STATION_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称' AFTER `video_type`; +ALTER TABLE `hzims_operation`.`hzims_station_video_type` ADD COLUMN `STATION_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称' AFTER `video_type`; -ALTER TABLE `dev_hzims_operation`.`hzims_station_video_type` MODIFY COLUMN `video_type` tinyint(4) NULL DEFAULT NULL COMMENT '视频类型；默认为1：清污机类型' AFTER `SORT`; +ALTER TABLE `hzims_operation`.`hzims_station_video_type` MODIFY COLUMN `video_type` tinyint(4) NULL DEFAULT NULL COMMENT '视频类型；默认为1：清污机类型' AFTER `SORT`; -ALTER TABLE `dev_hzims_operation`.`hzims_unit_running_time` MODIFY COLUMN `DATE_TIME` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '年月' AFTER `EM_CODE`; +ALTER TABLE `hzims_operation`.`hzims_unit_running_time` MODIFY COLUMN `DATE_TIME` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '年月' AFTER `EM_CODE`; -CREATE TABLE `dev_hzims_operation`.`hzims_user_feedback` ( +CREATE TABLE `hzims_operation`.`hzims_user_feedback` ( `ID` bigint(20) NOT NULL COMMENT '主键', `TENANT_ID` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户ID', `PHONE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话', @@ -354,26 +354,14 @@ CREATE TABLE `dev_hzims_operation`.`hzims_user_feedback` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户反馈表' ROW_FORMAT = Dynamic; -DROP TABLE `dev_hzims_operation`.`hzims_main_work_bench_copy1`; - -DROP TABLE `dev_hzims_operation`.`hzims_station_attribute_copy1`; - -DROP TABLE `dev_hzims_operation`.`hzims_station_attribute_copy2`; - -DROP TABLE `dev_hzims_operation`.`hzims_station_bak1110`; - -DROP TABLE `dev_hzims_operation`.`hzims_station_video_type_bak0907`; - -DROP TABLE `dev_hzims_operation`.`temp_hik_point`; - SET FOREIGN_KEY_CHECKS=1; -- 字典 -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645274950860365825, 0, 'data_origin', '-1', '数据来源类型', 10, '', 0, 0, 0, -1, 'operational'); -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645275156549033986, 1645274950860365825, 'data_origin', '0', '数据采集', 0, '', 0, 0, 0, -1, 'operational'); -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645275327714385922, 1645274950860365825, 'data_origin', '1', '数据填报', 1, '', 0, 0, 0, -1, 'operational'); - -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576353242344, 1630129576354127875, 'project_kind', '4S', 'HZ3000 v4.0.0.6以上', 3, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576354126893, 1630129576354127875, 'project_kind', '4', 'HZ3000 v4.0.0.6以下', 2, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576354127867, 1630129576354127875, 'project_kind', '3', 'HZ3000 v3.0', 1, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); -INSERT INTO `dev_bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576354127875, 0, 'project_kind', '-1', '项目-数据来源', 0, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); \ No newline at end of file +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645274950860365825, 0, 'data_origin', '-1', '数据来源类型', 10, '', 0, 0, 0, -1, 'operational'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645275156549033986, 1645274950860365825, 'data_origin', '0', '数据采集', 0, '', 0, 0, 0, -1, 'operational'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1645275327714385922, 1645274950860365825, 'data_origin', '1', '数据填报', 1, '', 0, 0, 0, -1, 'operational'); + +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576353242344, 1630129576354127875, 'project_kind', '4S', 'HZ3000 v4.0.0.6以上', 3, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576354126893, 1630129576354127875, 'project_kind', '4', 'HZ3000 v4.0.0.6以下', 2, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576354127867, 1630129576354127875, 'project_kind', '3', 'HZ3000 v3.0', 1, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); +INSERT INTO `bladex`.`blade_dict` (`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_sealed`, `is_deleted`, `dict_type`, `app_id`, `app_code`) VALUES (1630129576354127875, 0, 'project_kind', '-1', '项目-数据来源', 0, NULL, 0, 0, 0, -1, 'hzinfo-data-config'); \ No newline at end of file diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 4437116..5b528a8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity; @@ -107,7 +109,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl> queryList(StandardTicketInfoDto req, Query query) { LambdaQueryWrapper queryWrapper = this.getQueryWrapper(req); - queryWrapper.eq(StandardTicketInfoEntity::getCreateDept,req.getCreateDept()); + queryWrapper.eq(Func.isNotEmpty(req.getCreateDept()),StandardTicketInfoEntity::getCreateDept,req.getCreateDept()); queryWrapper.orderByDesc(StandardTicketInfoEntity::getCreateTime); IPage pages = super.page(Condition.getPage(query), queryWrapper); return R.data(pages.setRecords(StandardTicketInfoWrapper.build().listVO(pages.getRecords()))); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index a885c55..726e683 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -236,7 +236,10 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl> queryList(WorkTicketInfoDto req, Query query) { LambdaQueryWrapper lqw = this.getQueryWrapper(req); - lqw.eq(WorkTicketInfoEntity::getCreateDept,req.getCreateDept()); + if(ObjectUtil.isNotEmpty(req.getCreateDept())) { + lqw.eq(WorkTicketInfoEntity::getCreateDept,req.getCreateDept()); + } + lqw.orderByDesc(WorkTicketInfoEntity::getCreateTime).orderByDesc(WorkTicketInfoEntity::getUpdateTime); IPage pages = super.page(Condition.getPage(query), lqw); pages.setRecords(WorkTicketInfoWrapper.build().listVO(pages.getRecords()));