修正邮箱告警有不对的地方

byit-myth-core/myth-admin-core/src/main/java/com/byit/enums/EmailEnum.java

@@ -5,8 +5,8 @@ package com.byit.enums;
  */
 
 public enum EmailEnum {
-    IS_ALARM_YES("1","已经告警"),
-    IS_ALARM_NO("0","没有告警"),
+    IS_ALARM_NO("1","没有告警"),
+    IS_ALARM_YES("0","已经告警"),
 
     EMAIL_NOT_ALARML("0","不告警"),
     EMAIL_END_ALARML("1","完成时告警"),

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.byit.dto.FlowConditionDto;
 import com.byit.dto.StatisticsConditionDto;
 import com.byit.dto.web.ResponseResult;
+import com.byit.enums.EmailEnum;
 import com.byit.enums.FlowPropertyEnum;
 import com.byit.enums.JobTriggerStatusEnums;
 import com.byit.enums.NodePropertyEnum;
@@ -441,7 +442,7 @@ public class FlowServiceImpl implements FlowService {
             runRecording.setFlowStatus("4");
             runRecording.setFlowRunResult("5");
             runRecording.setEndTime(new Date());
-            runRecording.setIsAlarm("1");
+            runRecording.setIsAlarm(EmailEnum.IS_ALARM_NO.getCode());
             runRecordingMapper.updateRunRecordingById(runRecording);
         });
         //杀死所有的任务

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

@@ -3,6 +3,7 @@ package com.byit.service.mapservice.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.byit.dto.EmailMappingDto;
+import com.byit.enums.EmailEnum;
 import com.byit.model.EmailAlarm;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.RunRecording;
@@ -98,7 +99,7 @@ public class RunRecordingAndEmailServiceImpl implements RunRecordingAndEmailServ
             //保存邮箱
             emailAlarmService.saveEmailAlarm(emailAlarm);
             //修改为已告警
-            runRecording.setIsAlarm("0");
+            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
             runRecordingService.updateRunRecordingById(runRecording);
         }
 

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

@@ -114,7 +114,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                 .principal(virFlow.getPrincipal())
                 .startTime(new Date())
                 .flowNodeCount(virFlow.getFlowNodeCount())
-                .isAlarm("1")
+                .isAlarm(EmailEnum.IS_ALARM_NO.getCode())
                 .isInner(FlowPropertyEnum.IS_INNER.getCode())
                 .failFast(RunRecordingEnum.FAIL_FAST_NO.getCode())
                 .workspaceId(virFlow.getWorkspaceId())

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

@@ -126,7 +126,7 @@ public class TaskAndLogServerImpl implements TaskAndLogServer {
                     .startTime(new Date())
                     .flowNodeCount(virFlow.getFlowNodeCount())
                     //.isAlarm(mainRecording.getIsAlarm())
-                    .isAlarm("1")
+                    .isAlarm(EmailEnum.IS_ALARM_NO.getCode())
                     .isInner(FlowPropertyEnum.IS_INNER.getCode())
                     .failFast(RunRecordingEnum.FAIL_FAST_YES.getCode())
                     .workspaceId(virFlow.getWorkspaceId())

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

 package com.byit.thread.helper;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.byit.enums.EmailEnum;
 import com.byit.enums.RunRecordingEnum;
 import com.byit.model.RunRecording;
 import com.byit.service.RunRecordingService;
@@ -66,7 +67,7 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                         if (RunRecordingEnum.FLOW_STATUS_IS_END.getCode().equals(runRecording.getFlowStatus())) {
                             runRecordingAndEmailService.saveEmailAndRunRecording(runRecording);
                             //修改为已告警
-                            runRecording.setIsAlarm("0");
+                            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
                         }
                         break;
                     //失败时告警
@@ -76,7 +77,7 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                                 || RunRecordingEnum.RUN_FLOW_RE_FAILURE.getCode().equals(runRecording.getFlowRunResult())) {
                             runRecordingAndEmailService.saveEmailAndRunRecording(runRecording);
                             //修改为已告警
-                            runRecording.setIsAlarm("0");
+                            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
                         }
                         break;
                     //成功时告警
@@ -86,7 +87,7 @@ public class EndAndNotWarningThreadRunHelper extends BaseThreadRunHelper {
                                 || RunRecordingEnum.RUN_FLOW_RE_SUCCESS.getCode().equals(runRecording.getFlowRunResult())) {
                             runRecordingAndEmailService.saveEmailAndRunRecording(runRecording);
                             //修改为已告警
-                            runRecording.setIsAlarm("0");
+                            runRecording.setIsAlarm(EmailEnum.IS_ALARM_YES.getCode());
                         }
                         break;
                     default: