告警流程代码修正

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

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

@@ -56,7 +56,8 @@ public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowM
         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());
             return R.fail("消息转换失败");
@@ -69,33 +70,35 @@ public class AlarmHandleFlowServiceImpl extends BaseServiceImpl<AlarmHandleFlowM
         } 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());
+                //如果是误诊，把处理结果复制到误报原因
+                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 {
+                //流程结束把告警状态修改为结束
+                alarmHandleFlowEntity.setHandleWay(6L);
                 //设置处理完成
                 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()) {
                     throw new ServiceException("修改告警状态异常，请稍后重试！");
                 }
             }
+
         }
         this.updateById(alarmHandleFlowEntity);
         //推送消息中心相关消息