yangshj
/
zhongwei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhongwei
yang_shj 9 months ago
parent
568c3c5a2d a765b7cab8
commit
bccae84314
5 changed files with 58 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql
  2. 19
      hzims-service/hzims-alarm/src/main/resources/dict/dict.sql
  3. 5
      hzims-service/hzims-basic/src/main/resources/dict/dict.sql
  4. 6
      hzims-service/operational/src/main/resources/dict/dict.sql
  5. 25
      hzims-service/ticket/src/main/resources/db/3.0.0.sql.1

2
hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql
Unescape View File

@ -27,6 +27,8 @@ CREATE TABLE `HZIMS_ALARM` (
`ALARM_VALUE` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '告警动作数值',
`ALARM_COUNT` TINYINT(10) NULL DEFAULT NULL COMMENT '告警数量',
`ALARM_TIME` DATETIME NULL DEFAULT NULL COMMENT '告警时间',
`DIAG_REASON` VARCHAR(2048) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '初步分析原因',
`DIAG_SOLUTION` VARCHAR(2048) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '建议处置方式',
`REAL_ID` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '监测点',
`IS_RIGHT_TABULATION` TINYINT(4) NULL DEFAULT NULL COMMENT '是否集中监控右侧列表展示 : 0-展示 1-不展示',
`IS_SHOW_ALERT` TINYINT(4) NULL DEFAULT NULL COMMENT '是否集中监控弹窗展示 : 0-展示 1-不展示',

19
hzims-service/hzims-alarm/src/main/resources/dict/dict.sql
Unescape View File

@ -29,3 +29,22 @@ INSERT INTO `BLADEX`.`BLADE_DICT` (`ID`, `PARENT_ID`, `CODE`, `DICT_KEY`, `DICT_
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 (1658763247160922114, 1658763247160922111, 'HZ3000_ALARM', '5', '遥测越限', 0, '', 0, 0, 1, -1, 'HZIMS-ALARM');
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 (1658763247160922115, 1658763247160922111, 'HZ3000_ALARM', '13', '通讯中断', 0, '', 0, 0, 1, -1, 'HZIMS-ALARM');
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 (1658763247160922116, 1658763247160922111, 'HZ3000_ALARM', '14', '数据异常', 0, '', 0, 0, 1, -1, 'HZIMS-ALARM');
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 (1331514879315591273, 0, 'alarmDealType', '-1', '告警处理方式', 10, '告警处理方式', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591274, 1331514879315591273, 'alarmDealType', '1', '人工处理', 10, '简单处理', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591275, 1331514879315591273, 'alarmDealType', '2', '缺陷', 10, '缺陷', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591276, 1331514879315591273, 'alarmDealType', '3', '检修', 10, '检修', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591277, 1331514879315591273, 'alarmDealType', '4', '不做处理', 10, '不做处理', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591278, 0, 'alarmDealResult', '-1', '告警处理结果', 10, '告警处理结果', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591279, 1331514879315591278, 'alarmDealResult', '1', '确认告警，短时间无法消除', 10, '确认告警，短时间无法消除', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591280, 1331514879315591278, 'alarmDealResult', '2', '已消除告警', 10, '已消除告警', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591281, 1331514879315591278, 'alarmDealResult', '3', '误报', 10, '误报', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591282, 1331514879315591278, 'alarmDealResult', '4', '其他', 10, '其他', 0, 0, 0, 1347090334530641921, 'hzims-alarm');
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 (1331514879315591270, 0, 'faultDealType', '-1', '故障处理类型', 10, '故障处理类型', 0, 0, 0, 1347090334530641921, '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 (1331515358493851646, 1331514879315591270, 'faultDealType', '2', '延后处理', 1, '', 0, 0, 1, 1347090334530641921, '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 (1331515358493851647, 1331514879315591270, 'faultDealType', '6', '处理完成', 1, '', 0, 0, 1, 1347090334530641921, '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 (1331515358493851648, 1331514879315591270, 'faultDealType', '5', '处理中', 1, '', 0, 0, 1, 1347090334530641921, '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 (1331515358493851649, 1331514879315591270, 'faultDealType', '1', '误报', 1, '', 0, 0, 1, 1347090334530641921, 'hzims-equipment');

5
hzims-service/hzims-basic/src/main/resources/dict/dict.sql
Unescape View File

@ -0,0 +1,5 @@
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 (295549426739216388, 0, 'certificatet_type', '-1', '证书类型', 0, '证书类型', 0, 0, 1, 1347090334530641921, 'basic');
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 (296276308384317444, 295549426739216388, 'certificatet_type', '1', '电工证', 1, '电工证', 0, 0, 1, 1347090334530641921, 'basic');
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 (296276308384317445, 295549426739216388, 'certificatet_type', '2', '安全员证', 2, '安全员证', 0, 0, 1, 1347090334530641921, 'basic');
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 (296276308384317446, 295549426739216388, 'certificatet_type', '3', '登高证', 3, '登高证', 0, 0, 1, 1347090334530641921, 'basic');
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 (296276308384317447, 295549426739216388, 'certificatet_type', '4', '桥机证', 3, '桥机证', 0, 0, 1, 1347090334530641921, 'basic');

6
hzims-service/operational/src/main/resources/dict/dict.sql
Unescape View File

@ -504,3 +504,9 @@ INSERT INTO `BLADEX`.`BLADE_DICT` (`ID`, `PARENT_ID`, `CODE`, `DICT_KEY`, `DICT_
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 (1651150112910594050, 1651149948657455106, 'ALARM_HANDLE_TYPE', '3', '缺陷', 3, '', 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 (1651150146049789954, 1651149948657455106, 'ALARM_HANDLE_TYPE', '4', '检修', 4, '', 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 (1651150182032723969, 1651149948657455106, 'ALARM_HANDLE_TYPE', '5', '处理', 5, '', 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 (306144232656934401, 0, 'dutyLevel', '-1', '值班日志重要等级', 0, NULL, 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 (306144232656934402, 306144232656934401, 'dutyLevel', '1', '重要', 1, NULL, 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 (306144232656934403, 306144232656934401, 'dutyLevel', '2', '一般', 2, NULL, 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 (306144232656934404, 306144232656934401, 'dutyLevel', '3', '普通', 3, NULL, 0, 0, 0, -1, 'operational');

25
hzims-service/ticket/src/main/resources/db/3.0.0.sql.1
Unescape View File

@ -1,5 +1,30 @@
ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `create_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人姓名' AFTER `class_group_name`;
ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `update_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人姓名' AFTER `create_user_name`;
ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `issue_order_person_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发令人名称' AFTER `update_user_name`;
ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `access_order_person_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '受令人名称' AFTER `issue_order_person_name`;
ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `guardian_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '许可人名称' AFTER `access_order_person_name`;
ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `principal_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '负责人名称' AFTER `guardian_name`;
alter table `hzims_work_ticket_finish` add column `end_principal_name` varchar(50) comment '工作终结负责人';
alter table `hzims_work_ticket_finish` add column `end_licensor_name` varchar(50) comment '工作终结许可人';
alter table `hzims_work_ticket_finish` add column `finish_licensor_name` varchar(50) comment '工作票终结许可人';
alter table `hzims_work_ticket_info` add column `is_offline` tinyint(2) default 0 comment '是否线下 ： 1-线下，0-线上';
ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `signer_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签发人名称' AFTER `is_offline`;
ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `licensor_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '许可人名称' AFTER `signer_name`;
ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `watch_principal_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '值班负责人名称' AFTER `licensor_name`;
ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `implement_status` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执行状态字段：0未执行，1为执行（运行人员确认过）' AFTER `watch_principal_name`;
ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `update_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人名称' AFTER `implement_status`;
ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `create_user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人名称' AFTER `update_user_name`;
Write Preview
Loading…
Cancel
Save