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
49919a1c5a af5977eb50
commit
d85b0a860e
3 changed files with 68 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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      hzims-service/hzims-middle/src/main/resources/db/4.0.0.sql
  2. 58
      hzims-service/safeproduct/src/main/resources/db/2.0.0.sql.1
  3. 6
      hzims-service/safeproduct/src/main/resources/dict/dict.sql

3
hzims-service/hzims-middle/src/main/resources/db/4.0.0.sql
Unescape View File

@ -1 +1,4 @@
INSERT INTO `PROCESS_DICT` (`DICT_CODE`, `DICT_SORT`, `DICT_KEY`, `DICT_VALUE`, `DICT_LABEL`, `DICT_TYPE`, `IS_DEFAULT`, `STATUS`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `REMARK`) VALUES (9, 9, 'WORK_TASK', 'WORK_TASK', '工作任务单V4', '工作任务单', 'Y', 0, NULL, '2023-07-25 18:35:01', '2024-01-09 14:48:18', '工作任务单流程'); INSERT INTO `PROCESS_DICT` (`DICT_CODE`, `DICT_SORT`, `DICT_KEY`, `DICT_VALUE`, `DICT_LABEL`, `DICT_TYPE`, `IS_DEFAULT`, `STATUS`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `REMARK`) VALUES (9, 9, 'WORK_TASK', 'WORK_TASK', '工作任务单V4', '工作任务单', 'Y', 0, NULL, '2023-07-25 18:35:01', '2024-01-09 14:48:18', '工作任务单流程');
INSERT INTO `process_dict`(`dict_code`, `dict_sort`, `dict_key`, `dict_value`, `dict_label`, `dict_type`, `is_default`, `status`, `create_dept`, `create_time`, `update_time`, `remark`) VALUES (10, 10, 'hazard_risk', 'hazard_risk', '风险排查', '风险排查', 'Y', 0, NULL, '2023-07-25 18:35:01', '2023-09-19 22:35:40', '风险排查流程');
INSERT INTO `process_dict`(`dict_code`, `dict_sort`, `dict_key`, `dict_value`, `dict_label`, `dict_type`, `is_default`, `status`, `create_dept`, `create_time`, `update_time`, `remark`) VALUES (11, 11, 'dealAlarm', 'dealAlarm', '告警处理流程', '告警处理流程', 'Y', 0, NULL, '2024-02-19 16:56:10', '2024-02-19 16:56:34', '告警处理流程');
INSERT INTO `process_dict`(`dict_code`, `dict_sort`, `dict_key`, `dict_value`, `dict_label`, `dict_type`, `is_default`, `status`, `create_dept`, `create_time`, `update_time`, `remark`) VALUES (12, 12, 'hiddenDangerCheck', 'hiddenDangerCheck', '隐患排查', '隐患排查', 'Y', 0, NULL, '2023-07-25 18:35:01', '2023-07-25 18:35:01', '隐患排查流程');

58
hzims-service/safeproduct/src/main/resources/db/2.0.0.sql.1
Unescape View File

@ -597,4 +597,62 @@ 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 (1812414974824267715, 1810414848933404673, 'hazard_station_type', '2', '闸门', 1, NULL, 0, 0, 1, -1, 'hzims_safeproduct'); 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 (1812414974824267715, 1810414848933404673, 'hazard_station_type', '2', '闸门', 1, NULL, 0, 0, 1, -1, 'hzims_safeproduct');
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 (1812414974824467714, 1810414848933404673, 'hazard_station_type', '1', '水库', 2, NULL, 0, 0, 1, -1, 'hzims_safeproduct'); 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 (1812414974824467714, 1810414848933404673, 'hazard_station_type', '1', '水库', 2, NULL, 0, 0, 1, -1, 'hzims_safeproduct');
DROP TABLE IF EXISTS `hzims_inner_danger_info`;
CREATE TABLE `hzims_inner_danger_info` (
`id` bigint(20) NOT NULL,
`code` varchar(255) NOT NULL COMMENT '隐患编码',
`station_code` varchar(255) DEFAULT NULL COMMENT '站点编码',
`process_instance_id` varchar(64) DEFAULT NULL COMMENT '流程实例',
`risk_point_id` varchar(20) DEFAULT NULL COMMENT '风险点Id',
`risk_point_name` varchar(255) DEFAULT NULL COMMENT '风险点名称',
`investigation` varchar(255) DEFAULT NULL COMMENT '排查项目',
`risk_point_type` varchar(255) DEFAULT NULL COMMENT '风险点类型',
`hidden_danger_dept` bigint(20) DEFAULT NULL COMMENT '隐患责任部门',
`hidden_danger_dept_name` varchar(255) DEFAULT NULL COMMENT '隐患责任部门名称',
`hidden_danger_addr` varchar(255) DEFAULT NULL COMMENT '隐患地点',
`hidden_danger_name` varchar(255) DEFAULT NULL COMMENT '隐患名称',
`hidden_danger_type` varchar(255) DEFAULT NULL COMMENT '隐患类别',
`hidden_danger_pic` varchar(2048) DEFAULT NULL COMMENT '隐患照片地址',
`registrant` bigint(20) DEFAULT NULL COMMENT '登记人',
`registrant_name` varchar(255) DEFAULT NULL COMMENT '登记人姓名',
`registrant_time` datetime DEFAULT NULL COMMENT '登记时间',
`current_link_handler` varchar(255) DEFAULT NULL COMMENT '当前环节处理人',
`current_operator` varchar(255) DEFAULT NULL COMMENT '当前环节',
`judge` bigint(20) DEFAULT NULL COMMENT '判定人',
`judge_name` varchar(255) DEFAULT NULL COMMENT '判定人姓名',
`judge_res` bigint(4) DEFAULT NULL COMMENT '判定结果(0不是隐患，1是隐患)',
`judge_context` varchar(255) DEFAULT NULL COMMENT '判定内容',
`hidden_danger_level` int(4) DEFAULT NULL COMMENT '隐患等级（核查）（1.低风险；2一般风险；3较大风险；4重大风险）',
`check_view` varchar(255) DEFAULT NULL COMMENT '核查意见',
`measures` varchar(255) DEFAULT NULL COMMENT '核查治理措施',
`check_people` bigint(20) DEFAULT NULL COMMENT '核查人',
`check_people_name` varchar(255) DEFAULT NULL COMMENT '核查人姓名',
`check_time` datetime DEFAULT NULL COMMENT '核查时间',
`rectifier` bigint(20) DEFAULT NULL COMMENT '整改责任人',
`rectifier_name` varchar(255) DEFAULT NULL COMMENT '整改责任人姓名',
`rectifier_dept` bigint(20) DEFAULT NULL COMMENT '整改责任部门ID',
`rectifier_dept_name` varchar(255) DEFAULT NULL COMMENT '整改责任部门名称',
`rectifier_type` tinyint(4) DEFAULT NULL COMMENT '整改类型：1立即整改、2停产停业整改、3限期整改',
`dead_line` varchar(255) DEFAULT NULL COMMENT '完成期限',
`rectifier_id` bigint(20) DEFAULT NULL COMMENT '整改通知单号',
`rectifier_reason` varchar(255) DEFAULT NULL COMMENT '隐患存在原因',
`rectifier_pic` varchar(4096) DEFAULT NULL COMMENT '治理后的效果图',
`rectifier_time` datetime DEFAULT NULL COMMENT '反馈时间',
`conclusion_res` tinyint(4) DEFAULT NULL COMMENT '验收结果（1完成，0未完成)',
`conclusion_people` bigint(20) DEFAULT NULL COMMENT '验收人',
`conclusion_people_name` varchar(255) DEFAULT NULL COMMENT '验收人姓名',
`conclusion_view` varchar(255) DEFAULT NULL COMMENT '验收意见',
`conclusion_time` datetime DEFAULT NULL COMMENT '验收时间',
`TENANT_ID` varchar(12) CHARACTER SET utf8 DEFAULT NULL COMMENT '租户ID',
`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATE_TIME` datetime DEFAULT NULL COMMENT '更新时间',
`CREATE_USER` bigint(20) DEFAULT NULL COMMENT '创建人',
`UPDATE_USER` bigint(20) DEFAULT NULL COMMENT '更新人',
`IS_DELETED` tinyint(4) NOT NULL COMMENT '是否删除',
`STATUS` tinyint(4) DEFAULT NULL COMMENT '状态 ',
`CREATE_DEPT` bigint(20) DEFAULT NULL COMMENT '创建部门',
`task_id` varchar(255) DEFAULT NULL COMMENT '任务Id',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
alter table `hzims_inner_danger_info` add COLUMN `task_id` VARCHAR(100) comment '平台任务Id'; alter table `hzims_inner_danger_info` add COLUMN `task_id` VARCHAR(100) comment '平台任务Id';

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

@ -34,3 +34,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 (1531958998432034818, 1531958665853087745, 'ACCIDENTTYPE', '2', '较大质量事故', 2, '', 0, 0, 0, -1, 'HZIMS_SAFEPRODUCT'); 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 (1531958998432034818, 1531958665853087745, 'ACCIDENTTYPE', '2', '较大质量事故', 2, '', 0, 0, 0, -1, 'HZIMS_SAFEPRODUCT');
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 (1531959051192184833, 1531958665853087745, 'ACCIDENTTYPE', '3', '重大质量事故', 3, '', 0, 0, 0, -1, 'HZIMS_SAFEPRODUCT'); 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 (1531959051192184833, 1531958665853087745, 'ACCIDENTTYPE', '3', '重大质量事故', 3, '', 0, 0, 0, -1, 'HZIMS_SAFEPRODUCT');
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 (1531959109291683842, 1531958665853087745, 'ACCIDENTTYPE', '4', '特大质量事故', 4, '', 0, 0, 0, -1, 'HZIMS_SAFEPRODUCT'); 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 (1531959109291683842, 1531958665853087745, 'ACCIDENTTYPE', '4', '特大质量事故', 4, '', 0, 0, 0, -1, 'HZIMS_SAFEPRODUCT');
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 (1810401848933404699, 0, 'inner_danger_type', '-1', '隐患类别', 4, '', 0, 0, 1, -1, 'hzims_safeproduct');
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 (1811421133117767766, 1810401848933404699, 'inner_danger_type', '1', '人的不安全行为', 5, '', 0, 0, 1, -1, 'hzims_safeproduct');
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 (1811421133117767767, 1810401848933404699, 'inner_danger_type', '2', '环境的不安全行为', 5, '', 0, 0, 1, -1, 'hzims_safeproduct');
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 (1811421133117767768, 1810401848933404699, 'inner_danger_type', '3', '物的不安全行为', 5, '', 0, 0, 1, -1, 'hzims_safeproduct');
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 (1811421133117767769, 1810401848933404699, 'inner_danger_type', '4', '管理因素', 5, '', 0, 0, 1, -1, 'hzims_safeproduct');
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 (1811421133117767770, 1810401848933404699, 'inner_danger_type', '5', '其他', 5, '', 0, 0, 1, -1, 'hzims_safeproduct');

Write Preview
Loading…
Cancel
Save