修改：进路区段故障占用时无法办理

修改：删除扣车批量操作bug

src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java

@@ -121,6 +121,7 @@ public class DraftMapRouteServiceImpl implements DraftMapRouteService {
         update.setName(routeNewVO.getName());
         update.setSetOverlapInCtc(routeNewVO.isSetOverlapInCtc());
         update.setOverlapCode(routeNewVO.getOverlapCode());
+        update.setHoldStandList(routeNewVO.getHoldStandList());
         DraftMapRoute db = update.convert2Draft();
         this.draftMapRouteDAO.updateByPrimaryKeyWithBLOBs(db);
     }

src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java

@@ -58,6 +58,12 @@ public class RouteService {
         if (!route.isCbtcMode() || route.isGround() || route.isAtp()) {
             failMessage = this.ciLevelCheck(route);
         }
+        // 进路区段是否故障占用
+        for (Section section : route.getSectionList()) {
+            if (Section.AxleFault.FAULT.equals(section.getFault())) {
+                return new Route.CheckFailMessage(Route.CheckFailReason.SectionFaultOccupied, section);
+            }
+        }
         return failMessage;
     }
 

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

@@ -611,6 +611,8 @@ public class Route extends MapNamedElement {
         SectionLockOppositeDirection,
         /** 区段不空闲 */
         SectionNotFree,
+        /** 区段故障占用 */
+        SectionFaultOccupied,
         /** 站台紧急停车按钮按下 */
         ESPEffective,
         /** 延续保护道岔/区段占用 */

src/main/resources/application.yml

@@ -86,7 +86,7 @@ springfox:
 
 ---
 spring:
-    profiles: dev
+    profiles: test
     datasource:
         url: jdbc:mysql://localhost:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: root
@@ -108,9 +108,9 @@ common:
 
 ---
 spring:
-    profiles: test
+    profiles: dev
     datasource:
-        url: jdbc:mysql://172.16.0.128:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://114.116.21.254:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: root
         password: Joylink@0503