Merge remote-tracking branch 'origin/test' into wechat-micro2-login

src/main/java/club/joylink/rtss/services/VirtualRealityIbpService.java

@@ -100,6 +100,7 @@ public class VirtualRealityIbpService implements IVirtualRealityIbpService {
             case JJTC:
                 element.setOn(true);
                 stands.forEach(stand -> ciApiService.standEC(simulation, stand));
+                ibp.query(VirtualRealityIbp.Mean.ALARM, element.getUp()).forEach(alarm -> alarm.setOn(true));
                 break;
             case QXJJTC:
                 element.setOn(true);
@@ -265,9 +266,7 @@ public class VirtualRealityIbpService implements IVirtualRealityIbpService {
                 case KM:
                 case AXLE_RESET:
                 case PRERESET_Z:
-                    break;
                 case ALARM:
-                    element.setOn(stands.stream().anyMatch(Stand::isEmergencyClosed));
                     break;
                 case kcLight:
                     element.setOn(stands.stream().anyMatch(Stand::isIbpHoldTrain));

src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/AtpSectionService.java

@@ -178,13 +178,18 @@ public class AtpSectionService {
      * @param sectionList
      */
     public void sectionARBCheck(Simulation simulation, Section section, List<Section> sectionList) {
-        if (!simulation.getRepository().getConfig().isNoARB()) {
+        if (!section.isInvalid() && section.isNctOccupied()) {
-            if (!section.isInvalid() && section.isNctOccupied()) {
+            if (!sectionList.contains(section)) {
-                if (!sectionList.contains(section)) {
+                log.debug(String.format("区段[%s(%s)]检测为ARB故障",
-                    log.debug(String.format("区段[%s(%s)]检测为ARB故障",
+                        section.getName(), section.getCode()));
-                            section.getName(), section.getCode()));
+                section.judgeAsInvalid();
-                    section.judgeAsInvalid();
+            }
-                }
+        }
+        //ARB故障判定
+        if (Section.AxleFault.ARB.equals(section.getFault())) {
+            section.setInvalid(true);
+            for (Section logic : section.getLogicList()) {
+                logic.setInvalid(true);
             }
         }
     }

src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java

@@ -126,20 +126,15 @@ public class ZCLogicLoop {
             endList.add(end1);
             return endList;
         }
-//        // 检查车头区段是否故障
+        // 检查车头区段是否故障
-//        if (headPosition.getSection().isFault()) {
+        if (headPosition.getSection().isFault()) {
-//            endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION));
+            endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION));
-//        }
+        }
-//        //非通信车占用区段
-//        if (section.isNonCbtcOccupy()) {
-//            endList.add(new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_SECTION));
-//            return endList;
-//        }
         //非通信车占用区段
-        MovementAuthority.End nctOccupied = checkNctOccupied(train, section);
+        if (section.isNonCbtcOccupy()) {
-        if (nctOccupied != null)
+            endList.add(new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_SECTION));
-            endList.add(nctOccupied);
+            return endList;
-
+        }
         int count = 0;
         while (count < 50) {
             ++count;
@@ -184,16 +179,12 @@ public class ZCLogicLoop {
                 break;
             }
             //非通信车占用区段
-            MovementAuthority.End end = checkNctOccupied(train, temp);
+            if (temp.isNonCbtcOccupy()) {
-            if (end != null)
+                SectionPosition headPosition1 = train.getHeadPosition();
-                endList.add(end);
+                if (!temp.isSamePhysical(headPosition1.getSection().getCode())) {
-//            //非通信车占用区段
+                    endList.add(new MovementAuthority.End(temp, MovementAuthority.EndType.NCT_OCCUPIED_SECTION));
-//            if (temp.isNonCbtcOccupy()) {
+                }
-//                SectionPosition headPosition1 = train.getHeadPosition();
+            }
-//                if (!temp.isSamePhysical(headPosition1.getSection().getCode())) {
-//                    endList.add(new MovementAuthority.End(temp, MovementAuthority.EndType.NCT_OCCUPIED_SECTION));
-//                }
-//            }
             //检查关闭的区段
             MovementAuthority.End cs = checkClosedSection(section);
             if (cs != null)
@@ -221,20 +212,6 @@ public class ZCLogicLoop {
         return endList;
     }
 
-    /**
-     * 检查非通信车占用的区段
-     */
-    private MovementAuthority.End checkNctOccupied(VirtualRealityTrain train, Section section) {
-        if (train.isCBTC()) { //通信车
-            if (section.isNonCbtcOccupy() && !section.isInvalid())
-                return new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_SECTION);
-        } else { //非通信车
-            if (section.isNonCbtcOccupy())
-                return new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_SECTION);
-        }
-        return null;
-    }
-
     private MovementAuthority.End checkClosedSection(Section section) {
         if (section.isClosed()) {
             return new MovementAuthority.End(section, MovementAuthority.EndType.CLOSED_SECTION);
@@ -306,11 +283,14 @@ public class ZCLogicLoop {
         Section section = headPosition.getSection();
         int count = 0;
         while (Objects.nonNull(section) && count < 20) {
+            if (count > 1 && !CollectionUtils.isEmpty(endList))
+                break;
             ++count;
             // 信号机
             MovementAuthority.End signalEnd = checkGroundSignal(section, right);
             if (Objects.nonNull(signalEnd)) {
-                deviceEnd = signalEnd;
+                endList.add(signalEnd);
+//                deviceEnd = signalEnd;
                 break;
             }
             // 轨道尽头/问题道岔
@@ -318,15 +298,24 @@ public class ZCLogicLoop {
             if (Objects.isNull(temp)) { // 到尽头
                 if (section.isSwitchTrack()) { // 问题道岔
                     if (Objects.nonNull(section.getSectionOf(!right))) {
-                        deviceEnd = new MovementAuthority.End(section.getSectionOf(!right),
+                        endList.add(new MovementAuthority.End(section.getSectionOf(!right),
-                                MovementAuthority.EndType.FAULT_SWITCH);
+                                MovementAuthority.EndType.FAULT_SWITCH));
+//                        deviceEnd = new MovementAuthority.End(section.getSectionOf(!right),
+//                                MovementAuthority.EndType.FAULT_SWITCH);
                     }
                 } else {
-                    deviceEnd = new MovementAuthority.End(section,
+                    endList.add(new MovementAuthority.End(section,
-                            MovementAuthority.EndType.END_TRACK);
+                            MovementAuthority.EndType.END_TRACK));
+//                    deviceEnd = new MovementAuthority.End(section,
+//                            MovementAuthority.EndType.END_TRACK);
                 }
                 break;
             }
+//            else {
+//                if (temp.isNonCbtcOccupy() && temp.isInvalid()) {
+//                    endList.add(new MovementAuthority.End(temp, MovementAuthority.EndType.NCT_OCCUPIED_SECTION));
+//                }
+//            }
             section = temp;
         }
         if (Objects.nonNull(deviceEnd)) {

src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java

@@ -204,9 +204,6 @@ public class MapConfig {
     /** 服务号的位数 */
     private int figuresOfServiceNumber;
 
-    /** 没有ARB判定 */
-    private boolean noARB;
-
     private Set<SimulationMember.Type> needConfirmConnectMembers =
             Stream.of(DISPATCHER, STATION_SUPERVISOR, MAINTAINER, ELECTRIC_DISPATCHER).collect(Collectors.toSet());
 
@@ -254,7 +251,6 @@ public class MapConfig {
             setDelayWhenCancelRouteWithAbnormalInterlock(configVO.isDelayWhenCancelRouteWithAbnormalInterlock());
             setFiguresOfTripNumber(configVO.getFiguresOfTripNumber());
             setFiguresOfServiceNumber(configVO.getFiguresOfServiceNumber());
-            setNoARB(noARB);
         }
     }
 

src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -593,12 +594,12 @@ public class Section extends MayOutOfOrderDevice {
             //岔心解锁
             if (this.parent != null && this.parent.isCross()) {
                 this.parent.setRouteLock(false);
-                this.parent.setOverlapLock(false);
+//                this.parent.setOverlapLock(false);
                 this.parent.setLockRight(false);
             }
             //自身解锁
             this.routeLock = false;
-            this.overlapLock = false;
+//            this.overlapLock = false;
             this.lockRight = false;
             if (!CollectionUtils.isEmpty(this.logicList)) {
                 this.logicList.forEach(logic -> logic.routeUnlocking(right));
@@ -727,20 +728,20 @@ public class Section extends MayOutOfOrderDevice {
         if (!this.isAxleCounter()) {
             return;
         }
-        this.setInvalid(true);
+        this.setNctOccupied(true);
         if (this.isSwitchAxleCounterSection()) { // 道岔计轴区段
             List<Switch> relSwitchList = this.getRelSwitchList();
             for (Switch aSwitch : relSwitchList) {
-                aSwitch.getA().setInvalid(true);
+                aSwitch.getA().setNctOccupied(true);
                 if (aSwitch.isNormalPosition()) {
-                    aSwitch.getB().setInvalid(true);
+                    aSwitch.getB().setNctOccupied(true);
-                    aSwitch.getC().setInvalid(false);
+                    aSwitch.getC().setNctOccupied(false);
                 } else if (aSwitch.isReversePosition()) {
-                    aSwitch.getC().setInvalid(true);
+                    aSwitch.getC().setNctOccupied(true);
-                    aSwitch.getB().setInvalid(false);
+                    aSwitch.getB().setNctOccupied(false);
                 } else {
-                    aSwitch.getB().setInvalid(true);
+                    aSwitch.getB().setNctOccupied(true);
-                    aSwitch.getC().setInvalid(true);
+                    aSwitch.getC().setNctOccupied(true);
                 }
             }
             Section cross = queryCross();
@@ -749,7 +750,7 @@ public class Section extends MayOutOfOrderDevice {
             }
         } else if (!CollectionUtils.isEmpty(this.logicList)) {
             for (Section logic : this.logicList) {
-                logic.setInvalid(true);
+                logic.setNctOccupied(true);
             }
         }
 
@@ -796,7 +797,7 @@ public class Section extends MayOutOfOrderDevice {
             boolean leftSectionNctOccupied = leftSection.isNctOccupied() && leftSection.getParent().equals(this.parent);
             Section rightSection = logic.getRightSection();
             boolean rightSectionNctOccupied = rightSection.isNctOccupied() && rightSection.getParent().equals(this.parent);
-            logic.setInvalid(leftSectionNctOccupied || rightSectionNctOccupied);
+            logic.setNctOccupied(leftSectionNctOccupied || rightSectionNctOccupied);
         });
     }
 
@@ -1109,6 +1110,56 @@ public class Section extends MayOutOfOrderDevice {
                     }
                 }
             }
+        },
+
+        ARB {
+            @Override
+            public boolean apply(MayOutOfOrderDevice device) {
+                Section section = (Section) device;
+                List<Section> sections;
+                if (!section.isAxleCounter()) {
+                    if (section.getParent() != null && section.getParent().isAxleCounter()) {
+                        sections = Collections.singletonList(section.getParent());
+                    } else if (!CollectionUtils.isEmpty(section.getLogicList())) {
+                        sections = section.getLogicList();
+                    } else {
+                        sections = new ArrayList<>();
+                    }
+                } else {
+                    sections = Collections.singletonList(section);
+                }
+                boolean flag = false;
+                for (Section axleSection : sections) {
+                    if (axleSection.isAxleCounter() && !this.equals(axleSection.getFault())) {
+                        flag = true;
+                        axleSection.setFault(this);
+                    }
+                }
+                return flag;
+            }
+
+            @Override
+            public void fix(MayOutOfOrderDevice device) {
+                Section section = (Section) device;
+                List<Section> sections;
+                if (!section.isAxleCounter()) {
+                    if (section.getParent() != null && section.getParent().isAxleCounter()) {
+                        sections = Collections.singletonList(section.getParent());
+                    } else if (!CollectionUtils.isEmpty(section.getLogicList())) {
+                        sections = section.getLogicList();
+                    } else {
+                        sections = new ArrayList<>();
+                    }
+                } else {
+                    sections = Collections.singletonList(section);
+                }
+                boolean flag = false;
+                for (Section axleSection : sections) {
+                    if (this.equals(axleSection.getFault())) {
+                        axleSection.setFault(null);
+                    }
+                }
+            }
         }
     }
 }

src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java

@@ -602,6 +602,8 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
     }
 
     public void updateTBForce(float fk, float fb) {
+        if (isEB())
+            return;
         if (Fault.DRIVE_FAULT.equals(fault) && fk > 0) {
             return;
         }
@@ -983,7 +985,7 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
      * 设置紧急制动的功率和制动力
      */
     public void emergencyBreak() {
-        updateTBForce(0, 350);
+        enforceUpdateTBForce(0, 350);
     }
 
     @Getter

src/main/java/club/joylink/rtss/simulation/cbtc/robot/RobotLogicLoop.java

@@ -21,12 +21,10 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Component;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 仿真机器人逻辑循环
@@ -110,8 +108,11 @@ public class RobotLogicLoop {
             switch (train.getDriveMode()) {
                 case AM:
                 case CM:
+                    Float recommendedSpeedMax = Stream.of(train.getAtpSpeedMax(), train.getSpeedLimit() * 0.9f, train.getAtoSpeedMax())
+                            .min(Comparator.comparingDouble(Float::doubleValue)).get();
+                    distance = ATOService.calculateTargetRemainDistance(train, train.getMa());
                     speedCurve = SpeedCurve.buildTargetSpeedCurve(headPosition, tailPosition, right,
-                            distance, speed, Math.min(train.getAtpSpeedMax(), train.getSpeedLimit()) * 0.9f);
+                            distance, speed, recommendedSpeedMax);
                     break;
                 case RM:
                     speedCurve = SpeedCurve.buildTargetSpeedCurve(headPosition, tailPosition, right,

src/main/java/club/joylink/rtss/vo/map/RealLineConfigVO.java

@@ -193,9 +193,6 @@ public class RealLineConfigVO {
     /** 服务号的位数 */
     private int figuresOfServiceNumber = 3;
 
-    /** 没有ARB判定 */
-    private boolean noARB;
-
     public static RealLineConfigVO parseJsonStr(String configData) {
         if (StringUtils.hasText(configData)) {
             return JsonUtils.read(configData, RealLineConfigVO.class);