修正追加日志

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/RunRecordingAndEmailService.java

@@ -9,7 +9,9 @@ import com.byit.model.RunRecording;
 public interface RunRecordingAndEmailService {
     /**
      * 将已经告警的实例修改为已高兴并且将此实例放置到邮箱列表
+     *
      * @param runRecording
+     * @return 是否保存成功
      */
-    void saveEmailAndRunRecording(RunRecording runRecording);
+    boolean saveEmailAndRunRecording(RunRecording runRecording);
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/RunRecordingAndEmailServiceImpl.java

@@ -70,7 +70,7 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
     }
 
     @Override
-    public void saveEmailAndRunRecording(RunRecording runRecording) {
+    public boolean saveEmailAndRunRecording(RunRecording runRecording) {
         //这一步是根据flowId和RunId查询对应的节点信息
         List<JobTaskRunLogWithBLOBs> jobTaskRunLogByFlowIdAndRunId = jobTaskRunLogService.findJobTaskRunLogWithBLOBsByFlowIdAndRunId(runRecording.getFlowId(), runRecording.getRunId());
         if (runRecording.getFlowNodeCount() == jobTaskRunLogByFlowIdAndRunId.size()) {
@@ -102,7 +102,9 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
             //修改为已告警
             runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
             runRecordingService.updateRunRecordingById(runRecording);
+            return true;
         }
+        return false;
 
     }
 

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/EndAndNotWarningThreadRunHelper.java

@@ -65,9 +65,12 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                     case WHEN_DONE:
                         log.debug("------工作流{},被设置为完成时告警-----",runRecording);
                         if (RunRecordingEnum.FLOW_STATUS_IS_END.getCode().equals(runRecording.getFlowStatus())) {
-                            runRecordingAndEmailService.saveEmailAndRunRecording(runRecording);
-                            //修改为已告警
-                            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
+                            if (runRecordingAndEmailService.saveEmailAndRunRecording(runRecording)) {
+                                //修改为已告警
+                                runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
+                                runRecordingService.updateRunRecordingById(runRecording);
+                            }
+
                         }
                         break;
                     //失败时告警
@@ -75,9 +78,12 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                         log.debug("------工作流{},被设置为失败时告警-----",runRecording);
                         if (RunRecordingEnum.RUN_FLOW_FAILURE.getCode().equals(runRecording.getFlowRunResult())
                                 || RunRecordingEnum.RUN_FLOW_RE_FAILURE.getCode().equals(runRecording.getFlowRunResult())) {
-                            runRecordingAndEmailService.saveEmailAndRunRecording(runRecording);
-                            //修改为已告警
-                            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
+                            if (runRecordingAndEmailService.saveEmailAndRunRecording(runRecording)) {
+                                //修改为已告警
+                                runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
+                                runRecordingService.updateRunRecordingById(runRecording);
+                            }
+
                         }
                         break;
                     //成功时告警
@@ -85,9 +91,12 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                         log.debug("------工作流{},被设置为成功时告警-----",runRecording);
                         if (RunRecordingEnum.RUN_FLOW_SUCCESS.getCode().equals(runRecording.getFlowRunResult())
                                 || RunRecordingEnum.RUN_FLOW_RE_SUCCESS.getCode().equals(runRecording.getFlowRunResult())) {
-                            runRecordingAndEmailService.saveEmailAndRunRecording(runRecording);
-                            //修改为已告警
-                            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
+                            if (runRecordingAndEmailService.saveEmailAndRunRecording(runRecording)) {
+                                //修改为已告警
+                                runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
+                                runRecordingService.updateRunRecordingById(runRecording);
+                            }
+
                         }
                         break;
                     default:
@@ -95,7 +104,7 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                         break;
                 }
 
-                runRecordingService.updateRunRecordingById(runRecording);
+
             });
         }else{
             return UNIVERSAL_WAIT_TIME;