From e2991fdf3075d911f6c95794477bc2f70b9fccc9 Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Wed, 21 Feb 2024 16:54:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/inspect/src/main/resources/db/2.0.0.sql.1 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 hzims-service/inspect/src/main/resources/db/2.0.0.sql.1 diff --git a/hzims-service/inspect/src/main/resources/db/2.0.0.sql.1 b/hzims-service/inspect/src/main/resources/db/2.0.0.sql.1 new file mode 100644 index 0000000..ac96636 --- /dev/null +++ b/hzims-service/inspect/src/main/resources/db/2.0.0.sql.1 @@ -0,0 +1,3 @@ +ALTER TABLE `hzims-inspect`.`hz_st_ex_task_user` MODIFY COLUMN `CLAIM_STATUS` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '领用状态 0:未领用 1:已领用 每条任务可以存在多个用户，但是只有一个领用人' AFTER `USER_ID`; + +ALTER TABLE `hzims-inspect`.`hz_st_ex_task_user` ADD COLUMN `user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `TENANT_ID`; \ No newline at end of file From 62aa35e862c917b80c1cab2b02271fd40b8dca8e Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Wed, 21 Feb 2024 19:26:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java | 6 +++--- .../hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java index cc247c4..d21ec4f 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java @@ -57,7 +57,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl Date: Wed, 21 Feb 2024 20:01:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarm/config/entity/AlarmHandleFlowEntity.java | 2 +- .../service/impl/AlarmHandleFlowServiceImpl.java | 183 +++++++++++---------- 2 files changed, 94 insertions(+), 91 deletions(-) diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java index 270ab77..75ebc7b 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java @@ -39,7 +39,7 @@ public class AlarmHandleFlowEntity extends BaseEntity { @ApiModelProperty("告警内容") private String alarmContent; - @ApiModelProperty("告警状态 1L,2L,3L,4L,5L 误报 、延后、缺陷 、检修、处理 ") + @ApiModelProperty("告警状态 1L,2L,3L,4L,5L，6L 误报 、延后、缺陷 、检修、处理、处理完成 ") private Long handleWay; // @ApiModelProperty("处理详情ID") diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java index 0286009..f8fe32b 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java @@ -35,103 +35,106 @@ import java.util.*; @Slf4j @Service @RequiredArgsConstructor -public class AlarmHandleFlowServiceImpl extends BaseServiceImpl implements AlarmHandleFlowService{ +public class AlarmHandleFlowServiceImpl extends BaseServiceImpl implements AlarmHandleFlowService { - private final IMessageClient messageClient; + private final IMessageClient messageClient; - private final ISysClient sysClient; + private final ISysClient sysClient; - private final IFlowClient processClient; - @Autowired - private AlarmHandleMapper alarmHandleMapper; + private final IFlowClient processClient; + @Autowired + private AlarmHandleMapper alarmHandleMapper; - private final IFdpDiagnoseClient iFdpDiagnoseClient; + private final IFdpDiagnoseClient iFdpDiagnoseClient; - @Override - public R listenAndUpdate(ProcessWorkFlowResponse processWorkFlowResponse) { - long taskId; - AlarmHandleFlowEntity alarmHandleFlowEntity; - log.info("消缺消息开始转换"+processWorkFlowResponse); - try { - Map variables = (Map) processWorkFlowResponse.getVariables(); - //现象缺陷全表更新 - alarmHandleFlowEntity= JSONObject.parseObject(JSONObject.toJSONString(variables), new TypeReference(){}); - } catch (Exception e) { - log.info("消息转换失败："+e.getMessage()); - return R.fail("消息转换失败"); - } - taskId=alarmHandleFlowEntity.getId(); - //设置当前环节+当前环节处理人 - if (StringUtils.isNotEmpty(processWorkFlowResponse.getNextStepOperator())) { - alarmHandleFlowEntity.setCurrentOperator(processWorkFlowResponse.getTaskName()); - alarmHandleFlowEntity.setCurrentLinkHandler(processWorkFlowResponse.getNextStepOperator()); - }else { - alarmHandleFlowEntity.setCurrentOperator("流程结束"); - alarmHandleFlowEntity.setCurrentLinkHandler(""); - // 预警 - if(AlarmHandleConstant.EARLY_WARNING.equals(alarmHandleFlowEntity.getAlarmType())){ - Map map=new HashMap<>(); - map.put("uuid",alarmHandleFlowEntity.getAlarmId()); - map.put("result",alarmHandleFlowEntity.getHandleWay()); - if (1l==alarmHandleFlowEntity.getHandleWay()){ - //处理发现误报，修改对应状态 - map.put("result_info",alarmHandleFlowEntity.getDealDesc()); - alarmHandleMapper.update(null,Wrappers.lambdaUpdate() - .set(AlarmHandleEntity::getHandleWay, alarmHandleFlowEntity.getHandleWay()) - .set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc()) - .eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId())); + @Override + public R listenAndUpdate(ProcessWorkFlowResponse processWorkFlowResponse) { + long taskId; + AlarmHandleFlowEntity alarmHandleFlowEntity; + log.info("消缺消息开始转换" + processWorkFlowResponse); + try { + Map variables = (Map) processWorkFlowResponse.getVariables(); + //现象缺陷全表更新 + alarmHandleFlowEntity = JSONObject.parseObject(JSONObject.toJSONString(variables), new TypeReference() { + }); + } catch (Exception e) { + log.info("消息转换失败：" + e.getMessage()); + return R.fail("消息转换失败"); + } + taskId = alarmHandleFlowEntity.getId(); + //设置当前环节+当前环节处理人 + if (StringUtils.isNotEmpty(processWorkFlowResponse.getNextStepOperator())) { + alarmHandleFlowEntity.setCurrentOperator(processWorkFlowResponse.getTaskName()); + alarmHandleFlowEntity.setCurrentLinkHandler(processWorkFlowResponse.getNextStepOperator()); + } else { + alarmHandleFlowEntity.setCurrentOperator("流程结束"); + alarmHandleFlowEntity.setCurrentLinkHandler(""); + if (1l == alarmHandleFlowEntity.getHandleWay()) { + //如果是误诊，把处理结果复制到误报原因 + alarmHandleFlowEntity.setFalseAlarmDesc(alarmHandleFlowEntity.getDealDesc()); + alarmHandleMapper.update(null, Wrappers.lambdaUpdate() + .set(AlarmHandleEntity::getHandleWay, alarmHandleFlowEntity.getHandleWay()) + .set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc()) + .eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId())); + } else { + //流程结束把告警状态修改为结束 + alarmHandleFlowEntity.setHandleWay(6L); + //设置处理完成 + alarmHandleMapper.update(null, Wrappers.lambdaUpdate() + .set(AlarmHandleEntity::getHandleWay, 6l) + .set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc()) + .eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId())); + } + // 预警，调用fdp + if (AlarmHandleConstant.EARLY_WARNING.equals(alarmHandleFlowEntity.getAlarmType())) { + Map map = new HashMap<>(); + map.put("uuid", alarmHandleFlowEntity.getAlarmId()); + map.put("result", alarmHandleFlowEntity.getHandleWay()); + map.put("result_info", alarmHandleFlowEntity.getDealDesc()); + //流程结束后才，调用fdp修改状态的接口 + R r = iFdpDiagnoseClient.setFaultStatusInfo(map); + if (!r.isSuccess()) { + throw new ServiceException("修改告警状态异常，请稍后重试！"); + } + } - }else { - //设置处理完成 - alarmHandleMapper.update(null,Wrappers.lambdaUpdate() - .set(AlarmHandleEntity::getHandleWay, 6l) - .set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc()) - .eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId())); - map.put("result_info",alarmHandleFlowEntity.getDealDesc()); - } - //流程结束后才，调用fdp修改状态的接口 - R r = iFdpDiagnoseClient.setFaultStatusInfo(map); - if (!r.isSuccess()){ - throw new ServiceException("修改告警状态异常，请稍后重试！"); - } - } - } - this.updateById(alarmHandleFlowEntity); - //推送消息中心相关消息 - sendMessage(processWorkFlowResponse, alarmHandleFlowEntity,taskId); - log.info("消缺消息转换结束"+processWorkFlowResponse); - return R.success("消息保存成功"); - } + } + this.updateById(alarmHandleFlowEntity); + //推送消息中心相关消息 + sendMessage(processWorkFlowResponse, alarmHandleFlowEntity, taskId); + log.info("消缺消息转换结束" + processWorkFlowResponse); + return R.success("消息保存成功"); + } - private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, AlarmHandleFlowEntity alarmHandleFlowEntity,Long taskId) { - //推送消息 - if (processWorkFlowResponse.getTaskId() != null) { - BusinessMessageDTO message = new BusinessMessageDTO(); - message.setBusinessClassify("system"); - message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey()); - message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription()); - message.setTaskId(Optional.ofNullable(taskId).orElse(System.currentTimeMillis())); - message.setTenantId("200000"); - String countent = - "您的告警处理流程待审批！告警内容:".concat(Optional.ofNullable(alarmHandleFlowEntity.getAlarmContent()).orElse("")) - .concat("，审批环节：") - .concat(processWorkFlowResponse.getTaskName()); - message.setContent(countent); - message.setDeptId(alarmHandleFlowEntity.getCreateDept()); - R deptName = sysClient.getDeptName(alarmHandleFlowEntity.getCreateDept()); - if (deptName.isSuccess()) { - message.setDeptName(deptName.getData()); - } - String userIds = processWorkFlowResponse.getUserId(); - if (StringUtils.isBlank(userIds)) { - log.error("推送的消息不能为空哦,{}", userIds); - return; - } - message.setUserIds(userIds); - message.setCreateUser(alarmHandleFlowEntity.getCreateUser()); - messageClient.sendAppAndWsMsgByUsers(message); - } - } + private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, AlarmHandleFlowEntity alarmHandleFlowEntity, Long taskId) { + //推送消息 + if (processWorkFlowResponse.getTaskId() != null) { + BusinessMessageDTO message = new BusinessMessageDTO(); + message.setBusinessClassify("system"); + message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey()); + message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription()); + message.setTaskId(Optional.ofNullable(taskId).orElse(System.currentTimeMillis())); + message.setTenantId("200000"); + String countent = + "您的告警处理流程待审批！告警内容:".concat(Optional.ofNullable(alarmHandleFlowEntity.getAlarmContent()).orElse("")) + .concat("，审批环节：") + .concat(processWorkFlowResponse.getTaskName()); + message.setContent(countent); + message.setDeptId(alarmHandleFlowEntity.getCreateDept()); + R deptName = sysClient.getDeptName(alarmHandleFlowEntity.getCreateDept()); + if (deptName.isSuccess()) { + message.setDeptName(deptName.getData()); + } + String userIds = processWorkFlowResponse.getUserId(); + if (StringUtils.isBlank(userIds)) { + log.error("推送的消息不能为空哦,{}", userIds); + return; + } + message.setUserIds(userIds); + message.setCreateUser(alarmHandleFlowEntity.getCreateUser()); + messageClient.sendAppAndWsMsgByUsers(message); + } + } } From 8fb74ef3384a8a9dcd8440cf6ba74b3c7fb76ff1 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Thu, 22 Feb 2024 08:52:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?#=E5=91=8A=E8=AD=A6=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims-alarm/src/main/resources/db/1.0.0.sql | 76 +++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql b/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql index f3d977f..cfbc886 100644 --- a/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql +++ b/hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql @@ -207,42 +207,42 @@ CREATE TABLE `HZIMS_INTERRUPTION_ALARM` ( DROP TABLE IF EXISTS `hzims_alarm_handle_flow`; CREATE TABLE `hzims_alarm_handle_flow` ( - `ID` bigint(20) NOT NULL COMMENT '主键ID', - `ALARM_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警主键ID', - `STATION_CODE` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号', - `ALARM_TYPE` smallint(6) NULL DEFAULT NULL COMMENT '告警类型', - `ALARM_TIME` datetime(0) NULL DEFAULT NULL COMMENT '告警时间', - `ALARM_CONTENT` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警内容', - `TYPE` tinyint(1) NULL DEFAULT NULL COMMENT '类型：0-系统告警 1-智能告警', - `HANDLE_WAY` smallint(6) NULL DEFAULT NULL COMMENT '告警状态 1L,2L,3L,4L,5L 误报 、延后、缺陷 、检修、处理', - `HANDLE_USER` bigint(20) NULL DEFAULT NULL COMMENT '通知处理人', - `PHENOMENON_ID` bigint(20) NULL DEFAULT NULL COMMENT '现象ID', - `ACCESS_ID` bigint(20) NULL DEFAULT NULL COMMENT '检修ID', - `DELAY_TIME` datetime(0) NULL DEFAULT NULL COMMENT '延后时间', - `DELAY_CAUSE` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '延后原因', - `FALSE_ALARM_DESC` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '误报描述', - `FILE_PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件路径', - `DEAL_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理方式', - `DEAL_RESULT` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理结果', - `DEAL_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理描述', - `DEAL_PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理附件', - `CHECK_FLAG` tinyint(4) NULL DEFAULT NULL COMMENT '审批结果 0，不通过；1为通过', - `CHECK_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批说明', - `CURRENT_OPERATOR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前处理环节', - `CURRENT_LINK_HANDLER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前环节处理人', - `PROCESS_INSTANCE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例', - `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建用户姓名', - `HANDLE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理人姓名', - `APPROVAL_USER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批人', - `APPROVAL_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_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(0) NOT NULL COMMENT '创建时间', - `UPDATE_TIME` datetime(0) 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 DEFAULT 0 COMMENT '是否删除', - `STATUS` tinyint(4) NOT NULL DEFAULT 0 COMMENT '状态', - `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门', - `CREATE_DEPT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建机构名称', - PRIMARY KEY (`ID`) USING BTREE + `ID` bigint(20) NOT NULL COMMENT '主键ID', + `ALARM_ID` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警主键ID', + `STATION_CODE` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号', + `ALARM_TYPE` smallint(6) NULL DEFAULT NULL COMMENT '告警类型', + `ALARM_TIME` datetime(0) NULL DEFAULT NULL COMMENT '告警时间', + `ALARM_CONTENT` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '告警内容', + `TYPE` tinyint(1) NULL DEFAULT NULL COMMENT '类型：0-系统告警 1-智能告警', + `HANDLE_WAY` smallint(6) NULL DEFAULT NULL COMMENT '告警状态 1L,2L,3L,4L,5L 误报 、延后、缺陷 、检修、处理', + `HANDLE_USER` bigint(20) NULL DEFAULT NULL COMMENT '通知处理人', + `PHENOMENON_ID` bigint(20) NULL DEFAULT NULL COMMENT '现象ID', + `ACCESS_ID` bigint(20) NULL DEFAULT NULL COMMENT '检修ID', + `DELAY_TIME` datetime(0) NULL DEFAULT NULL COMMENT '延后时间', + `DELAY_CAUSE` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '延后原因', + `FALSE_ALARM_DESC` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '误报描述', + `FILE_PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件路径', + `DEAL_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理方式', + `DEAL_RESULT` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理结果', + `DEAL_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理描述', + `DEAL_PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理附件', + `CHECK_FLAG` tinyint(4) NULL DEFAULT NULL COMMENT '审批结果 0，不通过；1为通过', + `CHECK_DESC` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批说明', + `CURRENT_OPERATOR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前处理环节', + `CURRENT_LINK_HANDLER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '当前环节处理人', + `PROCESS_INSTANCE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例', + `CREATE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建用户姓名', + `HANDLE_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理人姓名', + `APPROVAL_USER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审批人', + `APPROVAL_USER_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_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(0) NOT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime(0) 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 DEFAULT 0 COMMENT '是否删除', + `STATUS` tinyint(4) NOT NULL DEFAULT 0 COMMENT '状态', + `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建部门', + `CREATE_DEPT_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建机构名称', + PRIMARY KEY (`ID`) USING BTREE ) ENGINE = INNODB CHARACTER SET = UTF8 COLLATE = UTF8_GENERAL_CI ROW_FORMAT = DYNAMIC; \ No newline at end of file From 765d7b34eaddba906cb0f455c3612b7f494f460e Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Thu, 22 Feb 2024 11:29:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?#=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java | 2 +- .../alarm/show/controller/AlarmHandleController.java | 3 ++- .../hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java | 2 +- .../hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml | 16 +++++++--------- .../hzims/alarm/show/service/AlarmHandleService.java | 2 +- .../alarm/show/service/impl/AlarmHandleServiceImpl.java | 10 +++------- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java index cc57119..e6429cc 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java +++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.operational.alert.vo; +package com.hnac.hzims.alarm.show.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java index 88f9c4e..307875d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java @@ -6,6 +6,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity; import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; import com.hnac.hzims.alarm.show.service.AlarmHandleService; +import com.hnac.hzims.alarm.show.vo.HandleQueryVo; import com.hnac.hzims.common.logs.annotation.OperationAnnotation; import com.hnac.hzims.common.logs.enums.BusinessType; import com.hnac.hzims.common.logs.enums.OperatorType; @@ -55,7 +56,7 @@ public class AlarmHandleController extends BladeController { @OperationAnnotation(moduleName = "分页查询告警处理记录", title = "查询告警处理记录", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "分页") - public R> list(com.hnac.hzims.operational.alert.vo.HandleQueryVo param, Query query) { + public R> list(HandleQueryVo param, Query query) { IPage pages = service.pageCondition(query, param); return R.data(pages); } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java index 5fd4a71..2f4527c 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java @@ -3,7 +3,7 @@ package com.hnac.hzims.alarm.show.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity; import com.hnac.hzims.alarm.config.vo.AlarmHandleVo; -import com.hnac.hzims.operational.alert.vo.HandleQueryVo; +import com.hnac.hzims.alarm.show.vo.HandleQueryVo; import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.annotation.UserDataAuth; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml index b32685f..c76c7c3 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml @@ -4,17 +4,15 @@