Browse Source

重构。

tom 5 months ago
parent
commit
69a623273d

+ 6 - 3
ruoyi-sim/src/main/java/com/ruoyi/sim/domain/TaskFault.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @date 2024-12-13
  */
 public class TaskFault extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -83,9 +84,11 @@ public class TaskFault extends BaseEntity {
     }
 
     // -------------------------------- tom add  --------------------------------
-    public static final String UNKNOWN = "7";
-    public static final String YES = "1";
-    public static final String NO = "0";
+    public interface Flag {
+        String UNKNOWN = "7";
+        String YES = "1";
+        String NO = "0";
+    }
 
     public TaskFault() {
     }

+ 1 - 1
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/FaultService.java

@@ -276,7 +276,7 @@ public class FaultService {
                                 parent.getParentFaultId().equals(parentFaultId))
                 .map(child -> {
                     if (child.getTaskFault() == null) {
-                        child.setTaskFault(new TaskFault(0L, 0L, child.getFaultId(), TaskFault.UNKNOWN));
+                        child.setTaskFault(new TaskFault(0L, 0L, child.getFaultId(), TaskFault.Flag.UNKNOWN));
                     }
                     child.setChildren(toTree(list, child.getFaultId()));
                     return child;

+ 1 - 1
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskFaultService.java

@@ -172,7 +172,7 @@ public class TaskFaultService {
         }
         TaskFault q = new TaskFault();
         q.setTaskId(taskId);
-        q.setFlag(TaskFault.YES);
+        q.setFlag(TaskFault.Flag.YES);
         List<TaskFault> list1 = selectTaskFaultList(q);
         List<TaskFault> list2 = new ArrayList<>();
         if (list1 == null || list1.isEmpty()) {

+ 6 - 6
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskService.java

@@ -142,7 +142,7 @@ public class TaskService {
         listStyleF
                 .stream()
                 .filter(vo -> hashSet.contains(vo.getFaultId()))
-                .forEach(vo -> vo.getTaskFault().setFlag(TaskFault.YES));
+                .forEach(vo -> vo.getTaskFault().setFlag(TaskFault.Flag.YES));
         if (v.getTaskId() == null || v.getTaskId() == 0) {
             tv.setTaskId(null);
         } else {
@@ -295,17 +295,17 @@ public class TaskService {
             if (StringUtils.isEmpty(flag)) {
                 return AjaxResult.error("flag empty!");
             }
-            if (!TaskFault.YES.equals(flag) &&
-                    !TaskFault.NO.equals(flag) &&
-                    !TaskFault.UNKNOWN.equals(flag)) {
+            if (!TaskFault.Flag.YES.equals(flag) &&
+                    !TaskFault.Flag.NO.equals(flag) &&
+                    !TaskFault.Flag.UNKNOWN.equals(flag)) {
                 return AjaxResult.error("flag must YES or NO,UNKNOWN!");
             }
             // todo:选中数量限制
 
             // 故障部位冲突 暂时没有故障部位冲突。
             // UNKNOWN 作为 NO 插入或修改数据。
-            if (TaskFault.UNKNOWN.equals(flag)) {
-                tf.setFlag(TaskFault.NO);
+            if (TaskFault.Flag.UNKNOWN.equals(flag)) {
+                tf.setFlag(TaskFault.Flag.NO);
             }
             tf.setTaskId(taskId);
             taskFaultService.insertOrUpdateTaskFault(tf);