Merge remote-tracking branch 'origin/test' into test

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/vo/CtcRunPlanParam.java

@@ -4,12 +4,12 @@ import club.joylink.rtss.simulation.cbtc.CTC.data.CtcStationRunPlanLog;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalTime;
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.Collections;
+import java.util.Map;
-import java.util.List;
 import java.util.Objects;
 
 @Getter
@@ -134,7 +134,7 @@ public class CtcRunPlanParam implements Cloneable {
     /**
      * 列车运行计划作业
      */
-    private List<CtcStationRunPlanLog.RunPlanTask> runPlanTaskList = new ArrayList<>();
+    private Map<CtcStationRunPlanLog.RunPlanTask, Integer> runPlanTaskMap = new HashMap();
 
     /**
      * 删除时构造实体
@@ -146,7 +146,7 @@ public class CtcRunPlanParam implements Cloneable {
         p.setRunPlanCode(this.runPlanCode);
         p.setStationCode(this.stationCode);
         p.setTripNumber(this.tripNumber);
-        p.setRunPlanTaskList(null);
+        p.setRunPlanTaskMap(null);
         return p;
     }
 
@@ -232,10 +232,15 @@ public class CtcRunPlanParam implements Cloneable {
             change = true;
         }
         // 存在不一样的选项
-        long modifyNum = modify.getRunPlanTaskList().stream().filter(task -> !this.runPlanTaskList.contains(task)).count();
+        Map<CtcStationRunPlanLog.RunPlanTask, Integer> modifyMap = new HashMap<>();
-        if (modifyNum > 0 || (this.runPlanTaskList.size() != modify.getRunPlanTaskList().size())) { // 长度不一致直接赋值
+        modify.getRunPlanTaskMap().forEach((k, v) -> {
-            this.runPlanTaskList = modify.getRunPlanTaskList();
+            if (!this.runPlanTaskMap.containsKey(k) || !Objects.equals(this.runPlanTaskMap.get(k), v)) {
-            runPlanParam.setRunPlanTaskList(modify.getRunPlanTaskList());
+                modifyMap.put(k, v);
+            }
+        });
+        if (this.runPlanTaskMap.size() != modify.getRunPlanTaskMap().size() || !CollectionUtils.isEmpty(modifyMap)) {
+            this.runPlanTaskMap.putAll(modify.getRunPlanTaskMap());
+            runPlanParam.setRunPlanTaskMap(modifyMap);
             change = true;
         }
         return change ? runPlanParam : null;
@@ -266,9 +271,9 @@ public class CtcRunPlanParam implements Cloneable {
     public CtcRunPlanParam clone() {
         try {
             CtcRunPlanParam clone = (CtcRunPlanParam) super.clone();
-            List<CtcStationRunPlanLog.RunPlanTask> list = new ArrayList<>(this.runPlanTaskList.size());
+            Map<CtcStationRunPlanLog.RunPlanTask, Integer> map = new HashMap(this.runPlanTaskMap.size());
-            Collections.copy(list, this.runPlanTaskList);
+            map.putAll(this.runPlanTaskMap);
-            clone.setRunPlanTaskList(list);
+            clone.setRunPlanTaskMap(map);
             return clone;
         } catch (CloneNotSupportedException e) {
             throw new AssertionError();

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/runplan/CtcStationRunPlanLogService.java

@@ -19,10 +19,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -322,11 +319,6 @@ public class CtcStationRunPlanLogService {
         change = change || modifyRunPlanItemInfo(simulation, runPlanLog.getArriveRunPlan(), planParam, true);
         // 出发
         change = change || modifyRunPlanItemInfo(simulation, runPlanLog.getDepartRunPlan(), planParam, false);
-        // 存在不一样的选项
-        long modifyNum = planParam.getRunPlanTaskList().stream().filter(task -> !runPlanLog.getRunPlanTaskList().contains(task)).count();
-        if (modifyNum > 0 || (planParam.getRunPlanTaskList().size() != runPlanLog.getRunPlanTaskList().size())) { // 长度不一致直接赋值
-            runPlanLog.setRunPlanTaskList(planParam.getRunPlanTaskList());
-        }
         // 是否客运
         if (planParam.getPassenger() != null && !Objects.equals(planParam.getPassenger(), runPlanLog.getPassenger())) {
             runPlanLog.setPassenger(planParam.getPassenger());
@@ -489,9 +481,14 @@ public class CtcStationRunPlanLogService {
             original.setDepartDirectionCode(modify.getDepartDirectionCode());
         }
         // 存在不一样的选项
-        long modifyNum = modify.getRunPlanTaskList().stream().filter(task -> !original.getRunPlanTaskList().contains(task)).count();
+        Map<CtcStationRunPlanLog.RunPlanTask, Integer> modifyMap = new HashMap<>();
-        if (modifyNum > 0 || (original.getRunPlanTaskList().size() != modify.getRunPlanTaskList().size())) { // 长度不一致直接赋值
+        modify.getRunPlanTaskMap().forEach((k, v) -> {
-            original.setRunPlanTaskList(modify.getRunPlanTaskList());
+            if (!original.getRunPlanTaskMap().containsKey(k) && !Objects.equals(original.getRunPlanTaskMap().get(k), v)) {
+                modifyMap.put(k, v);
+            }
+        });
+        if (original.getRunPlanTaskMap().size() != modify.getRunPlanTaskMap().size() || !CollectionUtils.isEmpty(modifyMap)) {
+            original.getRunPlanTaskMap().putAll(modify.getRunPlanTaskMap());
         }
         if (!Objects.equals(original.getStatus(), modify.getStatus())) {
             original.setStatus(modify.getStatus());

src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlanLog.java

@@ -9,13 +9,14 @@ import club.joylink.rtss.simulation.cbtc.data.map.StationDirection;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalTime;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * Ctc 车站运行计划日志
@@ -73,9 +74,9 @@ public class CtcStationRunPlanLog {
     private String planProperties;
 
     /**
-     * 列车运行计划作业
+     * 列车运行作业
      */
-    private List<RunPlanTask> runPlanTaskList = new ArrayList<>();
+    private Map<RunPlanTask, RunPlanTaskItem> runPlanTaskItemMap;
 
     /**
      * 是否原始数据
@@ -117,9 +118,6 @@ public class CtcStationRunPlanLog {
      */
     private TransfiniteType transfinite;
 
-    public CtcStationRunPlanLog() {
-    }
-
     public CtcStationRunPlanLog(CtcRunPlanParam paramInfo) {
         this.planParam = paramInfo;
         this.code = paramInfo.getRunPlanCode();
@@ -127,20 +125,28 @@ public class CtcStationRunPlanLog {
         this.trackSectionCode = paramInfo.getTrackSectionCode();
         this.remark = paramInfo.getRemark();  // 记事
         this.lateReason = paramInfo.getLateReason(); // 晚点原因
-        this.runPlanTaskList = paramInfo.getRunPlanTaskList();
         this.passenger = paramInfo.getPassenger(); // 是否客运
         this.keyTrains = paramInfo.getKeyTrains(); // 重点列车
         this.military = paramInfo.getMilitary();    // 是否军用
         this.trackDiscordant = paramInfo.getTrackDiscordant();  // 运行股道与基本径路不一致
         this.entryOutDiscordant = paramInfo.getEntryOutDiscordant(); // 出入口与基本径路不一致
         this.transfinite = paramInfo.getTransfinite(); // 超限等级
+        if (CollectionUtils.isEmpty(paramInfo.getRunPlanTaskMap())) { // 运行计划任务
+            this.runPlanTaskItemMap = paramInfo.getRunPlanTaskMap().keySet().stream()
+                    .collect(Collectors.toMap(t -> t, t -> new RunPlanTaskItem(t)));
+        } else {
+            this.runPlanTaskItemMap = new HashMap<>(0);
+        }
     }
 
     public void reset() {
         this.remark = null;
         this.lateReason = null;
         this.planProperties = null;
-        this.runPlanTaskList = new ArrayList<>();
+        // 运行任务复位
+        if (!CollectionUtils.isEmpty(this.runPlanTaskItemMap)) {
+            this.runPlanTaskItemMap.forEach((k, v) -> v.reset());
+        }
         if (this.arriveRunPlan != null) {
             this.arriveRunPlan.setRunModel(StationDirection.ReceiveAndDeliverModel.R);
             this.arriveRunPlan.reset();
@@ -336,9 +342,6 @@ public class CtcStationRunPlanLog {
             this.processTypeMap = new HashMap<>(ProcessType.values().length);
         }
 
-        public RunPlanItem() {
-        }
-
         public void reset() {
             this.stationDirection = this.defaultStationDirection;
             this.station = this.defaultStation;
@@ -455,7 +458,7 @@ public class CtcStationRunPlanLog {
     }
 
     /**
-     * 运行作业
+     * 运行作业类型
      */
     public enum RunPlanTask {
         // 技术停点
@@ -500,6 +503,59 @@ public class CtcStationRunPlanLog {
         }
     }
 
+    /**
+     * 运行作业详细信息
+     */
+    @Getter
+    @Setter
+    public static class RunPlanTaskItem implements Cloneable {
+        private RunPlanTask type;
+
+        private RunPlanTaskStatus status;
+
+        public RunPlanTaskItem(RunPlanTask type) {
+            this.type = type;
+            this.status = RunPlanTaskStatus.NO;
+        }
+
+        /**
+         * 判断是否变化
+         *
+         * @param modifyItem 修改实体
+         * @param statusItem 状态实体
+         * @return 是否变化
+         */
+        public boolean compareAndChange(RunPlanTaskItem modifyItem, RunPlanTaskItem statusItem) {
+            boolean change = false;
+            if (!Objects.equals(modifyItem.getStatus(), this.status)) {
+                this.status = modifyItem.status;
+                statusItem.setStatus(modifyItem.getStatus());
+                change = true;
+            }
+            return change;
+        }
+
+        public void reset() {
+            this.status = RunPlanTaskStatus.NO;
+        }
+
+        @Override
+        public RunPlanTaskItem clone() {
+            try {
+                return (RunPlanTaskItem) super.clone();
+            } catch (CloneNotSupportedException e) {
+                throw new AssertionError();
+            }
+        }
+
+        /**
+         * 行车计划状态
+         */
+        public enum RunPlanTaskStatus {
+            NO
+        }
+    }
+
     /**
      * 超限类型
      */

src/main/java/club/joylink/rtss/vo/client/ctc/CtcRunPlanVO.java

@@ -3,9 +3,11 @@ package club.joylink.rtss.vo.client.ctc;
 import club.joylink.rtss.simulation.cbtc.CTC.data.CtcStationRunPlanLog;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalTime;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -102,7 +104,7 @@ public class CtcRunPlanVO {
     /**
      * 列车运行计划作业
      */
-    private List<CtcStationRunPlanLog.RunPlanTask> runPlanTaskList;
+    private Map<CtcStationRunPlanLog.RunPlanTask, CtcStationRunPlanLog.RunPlanTaskItem> runPlanTaskItemMap;
 
     public CtcRunPlanVO(String stationCode, String code) {
         this.stationCode = stationCode;
@@ -125,7 +127,7 @@ public class CtcRunPlanVO {
         this.trackDiscordant = ctcStationRunPlanLog.getTrackDiscordant(); // 运行股道与基本径路不一致
         this.entryOutDiscordant = ctcStationRunPlanLog.getEntryOutDiscordant(); // 出入口与基本径路不一致
         this.passenger = ctcStationRunPlanLog.getPassenger(); // 客运车
-        this.runPlanTaskList = ctcStationRunPlanLog.getRunPlanTaskList(); // 列车运行计划作业
+        this.runPlanTaskItemMap = ctcStationRunPlanLog.getRunPlanTaskItemMap(); // 列车运行计划作业
         if (ctcStationRunPlanLog.getArriveRunPlan() != null) { // 到达计划
             this.arriveRunPlan = new RunPlanItem(ctcStationRunPlanLog.getArriveRunPlan());
             if (ctcStationRunPlanLog.getArriveRunPlan().getElectrical() != null) {
@@ -158,10 +160,22 @@ public class CtcRunPlanVO {
             change = true;
         }
         // 存在不一样的选项
-        long modifyNum = runPlanLog.getRunPlanTaskList().stream().filter(task -> !this.runPlanTaskList.contains(task)).count();
+        Map<CtcStationRunPlanLog.RunPlanTask, CtcStationRunPlanLog.RunPlanTaskItem> modifyMap = new HashMap<>();
-        if (modifyNum > 0 || (runPlanLog.getRunPlanTaskList().size() != this.runPlanTaskList.size())) { // 长度不一致直接赋值
+        runPlanLog.getRunPlanTaskItemMap().forEach((k, v) -> {
-            this.runPlanTaskList = runPlanLog.getRunPlanTaskList();
+            CtcStationRunPlanLog.RunPlanTaskItem statusItem = null;
-            changeCtcRunPlanVO.setRunPlanTaskList(runPlanLog.getRunPlanTaskList());
+            if (!this.getRunPlanTaskItemMap().containsKey(k)) {
+                statusItem = v.clone();
+                modifyMap.put(k, statusItem);
+                this.getRunPlanTaskItemMap().put(k, statusItem);
+            } else {
+                statusItem = new CtcStationRunPlanLog.RunPlanTaskItem(k);
+                if (this.getRunPlanTaskItemMap().get(k).compareAndChange(v, statusItem)) {
+                    modifyMap.put(k, statusItem);
+                }
+            }
+        });
+        if (runPlanLog.getRunPlanTaskItemMap().size() != this.getRunPlanTaskItemMap().size() || !CollectionUtils.isEmpty(modifyMap)) {
+            changeCtcRunPlanVO.setRunPlanTaskItemMap(modifyMap);
             change = true;
         }
         // 是否客运