Browse Source

Merge remote-tracking branch 'origin/master'

zhongwei
haungxing 9 months ago
parent
commit
1260862181
  1. 2
      hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/entity/AlarmHandleFlowEntity.java
  2. 3
      hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/show/vo/HandleQueryVo.java
  3. 3
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/AlarmHandleController.java
  4. 2
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.java
  5. 16
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
  6. 2
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java
  7. 49
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java
  8. 16
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java
  9. 1
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
  10. 3
      hzims-service/inspect/src/main/resources/db/2.0.0.sql.1

2
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")

3
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;
@ -28,3 +28,4 @@ public class HandleQueryVo {
@ApiModelProperty("处理类型:1-延后 2-误报 3-缺陷 4-检修")
private Long handleWay;
}

3
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<IPage<AlarmHandleVo>> list(com.hnac.hzims.operational.alert.vo.HandleQueryVo param, Query query) {
public R<IPage<AlarmHandleVo>> list(HandleQueryVo param, Query query) {
IPage<AlarmHandleVo> pages = service.pageCondition(query, param);
return R.data(pages);
}

2
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;

16
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml

@ -4,17 +4,15 @@
<select id="selectHandlePage" resultType="com.hnac.hzims.alarm.config.vo.AlarmHandleVo">
SELECT H.*,HANDLE_USER,D.PHENOMENON_ID,D.ACCESS_ID,D.DELAY_TIME,D.DELAY_CAUSE,
D.FALSE_ALARM_DESC,D.FILE_PATH,S.NAME AS STATION_NAME,P.CHECK_PROCESS_INSTANCE_ID,A.PROCESS_INSTANCE_ID
SELECT H.*,HANDLE_USER,H.PHENOMENON_ID,H.ACCESS_ID,H.DELAY_TIME,H.DELAY_CAUSE,
H.FALSE_ALARM_DESC,H.FILE_PATH,S.NAME AS STATION_NAME,P.CHECK_PROCESS_INSTANCE_ID,A.PROCESS_INSTANCE_ID
FROM HZIMS_ALARM_HANDLE H
LEFT JOIN HZIMS_ALARM_HANDLE_DETAIL D
ON H.DETAIL_ID = D.ID
LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_STATION S
LEFT JOIN HZIMS_OPERATION.HZIMS_STATION S
ON H.STATION_CODE = S.CODE
LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_OPER_PHENOMENON P
ON D.PHENOMENON_ID = P.ID
LEFT JOIN DEV_HZIMS_OPERATION.HZIMS_OPER_ACCESS_PLAN A
ON D.ACCESS_ID = A.ID
LEFT JOIN HZIMS_OPERATION.HZIMS_OPER_PHENOMENON P
ON H.PHENOMENON_ID = P.ID
LEFT JOIN HZIMS_OPERATION.HZIMS_OPER_ACCESS_PLAN A
ON H.ACCESS_ID = A.ID
<where>
H.IS_DELETED = 0
<if test="param.stationCode != null">

2
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity;
import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity;
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.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query;
import org.springblade.system.user.entity.User;

49
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleFlowServiceImpl.java

@ -35,7 +35,7 @@ import java.util.*;
@Slf4j
@Service
@RequiredArgsConstructor
public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowMapper, AlarmHandleFlowEntity> implements AlarmHandleFlowService{
public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowMapper, AlarmHandleFlowEntity> implements AlarmHandleFlowService {
private final IMessageClient messageClient;
@ -52,60 +52,63 @@ public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowM
public R listenAndUpdate(ProcessWorkFlowResponse processWorkFlowResponse) {
long taskId;
AlarmHandleFlowEntity alarmHandleFlowEntity;
log.info("消缺消息开始转换"+processWorkFlowResponse);
log.info("消缺消息开始转换" + processWorkFlowResponse);
try {
Map<String, Object> variables = (Map<String, Object>) processWorkFlowResponse.getVariables();
//现象缺陷全表更新
alarmHandleFlowEntity= JSONObject.parseObject(JSONObject.toJSONString(variables), new TypeReference<AlarmHandleFlowEntity>(){});
alarmHandleFlowEntity = JSONObject.parseObject(JSONObject.toJSONString(variables), new TypeReference<AlarmHandleFlowEntity>() {
});
} catch (Exception e) {
log.info("消息转换失败:"+e.getMessage());
log.info("消息转换失败:" + e.getMessage());
return R.fail("消息转换失败");
}
taskId=alarmHandleFlowEntity.getId();
taskId = alarmHandleFlowEntity.getId();
//设置当前环节+当前环节处理人
if (StringUtils.isNotEmpty(processWorkFlowResponse.getNextStepOperator())) {
alarmHandleFlowEntity.setCurrentOperator(processWorkFlowResponse.getTaskName());
alarmHandleFlowEntity.setCurrentLinkHandler(processWorkFlowResponse.getNextStepOperator());
}else {
} else {
alarmHandleFlowEntity.setCurrentOperator("流程结束");
alarmHandleFlowEntity.setCurrentLinkHandler("");
// 预警
if(AlarmHandleConstant.EARLY_WARNING.equals(alarmHandleFlowEntity.getAlarmType())){
Map<String, Object> 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.<AlarmHandleEntity>lambdaUpdate()
if (1l == alarmHandleFlowEntity.getHandleWay()) {
//如果是误诊,把处理结果复制到误报原因
alarmHandleFlowEntity.setFalseAlarmDesc(alarmHandleFlowEntity.getDealDesc());
alarmHandleMapper.update(null, Wrappers.<AlarmHandleEntity>lambdaUpdate()
.set(AlarmHandleEntity::getHandleWay, alarmHandleFlowEntity.getHandleWay())
.set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc())
.eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId()));
}else {
} else {
//流程结束把告警状态修改为结束
alarmHandleFlowEntity.setHandleWay(6L);
//设置处理完成
alarmHandleMapper.update(null,Wrappers.<AlarmHandleEntity>lambdaUpdate()
alarmHandleMapper.update(null, Wrappers.<AlarmHandleEntity>lambdaUpdate()
.set(AlarmHandleEntity::getHandleWay, 6l)
.set(AlarmHandleEntity::getFalseAlarmDesc, alarmHandleFlowEntity.getDealDesc())
.eq(AlarmHandleEntity::getAlarmId, alarmHandleFlowEntity.getAlarmId()));
map.put("result_info",alarmHandleFlowEntity.getDealDesc());
}
// 预警,调用fdp
if (AlarmHandleConstant.EARLY_WARNING.equals(alarmHandleFlowEntity.getAlarmType())) {
Map<String, Object> 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()){
if (!r.isSuccess()) {
throw new ServiceException("修改告警状态异常,请稍后重试!");
}
}
}
this.updateById(alarmHandleFlowEntity);
//推送消息中心相关消息
sendMessage(processWorkFlowResponse, alarmHandleFlowEntity,taskId);
log.info("消缺消息转换结束"+processWorkFlowResponse);
sendMessage(processWorkFlowResponse, alarmHandleFlowEntity, taskId);
log.info("消缺消息转换结束" + processWorkFlowResponse);
return R.success("消息保存成功");
}
private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, AlarmHandleFlowEntity alarmHandleFlowEntity,Long taskId) {
private void sendMessage(ProcessWorkFlowResponse processWorkFlowResponse, AlarmHandleFlowEntity alarmHandleFlowEntity, Long taskId) {
//推送消息
if (processWorkFlowResponse.getTaskId() != null) {
BusinessMessageDTO message = new BusinessMessageDTO();

16
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java

@ -2,20 +2,18 @@ package com.hnac.hzims.alarm.show.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant;
import com.hnac.hzims.alarm.config.entity.AlarmHandleEntity;
import com.hnac.hzims.alarm.config.entity.AlarmHandleFlowEntity;
import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
import com.hnac.hzims.alarm.show.mapper.AlarmHandleFlowMapper;
import com.hnac.hzims.alarm.show.mapper.AlarmHandleMapper;
import com.hnac.hzims.alarm.show.service.AlarmHandleDetailService;
import com.hnac.hzims.alarm.show.service.AlarmHandleService;
import com.hnac.hzims.alarm.show.vo.HandleQueryVo;
import com.hnac.hzims.alarm.show.wrapper.HandleWrapper;
import com.hnac.hzims.alarm.config.vo.AlarmHandleVo;
import com.hnac.hzims.common.logs.utils.StringUtils;
import com.hnac.hzims.fdp.feign.IFdpDiagnoseClient;
import com.hnac.hzims.fdp.feign.IFdpMonitorClient;
import com.hnac.hzims.fdp.vo.UpdateFaultStateVo;
import com.hnac.hzims.alarm.config.constants.AlarmHandleConstant;
import com.hnac.hzims.operational.alert.vo.HandleQueryVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
@ -24,7 +22,6 @@ import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.flow.core.entity.BladeFlow;
import org.springblade.flow.core.feign.IFlowClient;
@ -34,7 +31,6 @@ import org.springblade.system.user.entity.User;
import org.springblade.system.user.feign.IUserClient;
import org.springframework.stereotype.Service;
import javax.xml.ws.WebServiceException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -57,7 +53,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
private final IUserClient userClient;
private final IFdpMonitorClient fdpMonitorClient;
// private final IFdpMonitorClient fdpMonitorClient;
private final IFlowClient processClient;
@ -106,13 +102,13 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
// entity.setAccessId(param.getAccessId());
// entity.setPhenomenonId(param.getPhenomenonId());
entity.setHandleUser(param.getHandleUser());
entity.setHandleUser(param.getHandleUser());
entity.setDelayTime(param.getDelayTime());
entity.setDelayCause(param.getDelayCause());
entity.setFalseAlarmDesc(param.getFalseAlarmDesc());
entity.setFilePath(param.getFilePath());
if (StringUtils.isNotBlank(AuthUtil.getUserName())){
entity.setCreateUserName(AuthUtil.getNickName());
entity.setCreateUserName(AuthUtil.getUserName());
param.setCreateUserName(AuthUtil.getUserName());
entity.setCreateDeptName(param.getCreateDeptName());
}
this.save(entity);

1
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java

@ -91,6 +91,7 @@ public class FdpAlarmServiceImpl implements FdpAlarmService {
entity.setDeviceCode(item.getDeviceId());
entity.setDeviceName(item.getDeviceName());
entity.setAlarmStatus(Integer.valueOf(item.getStatus()));
entity.setAlarmValue(item.getInfo());
entity.setStationId(item.getStation());
entity.setAlarmSource(EARLY_WARNING);
entity.setTenantId("200000");

3
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`;
Loading…
Cancel
Save