From 450c33ea7464225340bed7ccefe6fb49742fb9cb Mon Sep 17 00:00:00 2001
From: walker-sheng <shengxuqiang@joylink.club>
Date: Fri, 23 Jul 2021 09:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9Fats=E9=87=8D=E6=9E=84-?=
 =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=86=B2=E7=AA=81=E6=A3=80=E6=9F=A5=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=9B=9E=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbtc/data/status/RouteStatus.java         | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/RouteStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/RouteStatus.java
index 067aca933..8f837b685 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/RouteStatus.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/RouteStatus.java
@@ -88,6 +88,23 @@ public class RouteStatus extends DeviceStatus {
         this.checkConflict = route.isCheckConflict();
     }
 
+    @Override
+    public DeviceStatusVO convert2VO(MapElement device) {
+        RouteStatusVO statusVO = new RouteStatusVO((Route) device);
+        statusVO.setCbtcMode(cbtcMode);
+        statusVO.setAtsControl(atsControl);
+        statusVO.setFleetMode(fleetMode);
+        statusVO.setCiControl(ciControl);
+        statusVO.setSettable(settable);
+        statusVO.setSetting(setting);
+        statusVO.setSettingGuide(settingGuide);
+        statusVO.setLock(lock);
+        statusVO.setCanceling(canceling);
+        statusVO.setNormalUnlock(normalUnlock);
+        statusVO.setCheckConflict(checkConflict);
+        return statusVO;
+    }
+
     @Override
     public boolean compareAndChange(MapElement device, DeviceStatusVO statusVO) {
         Route route = (Route) device;
@@ -158,20 +175,4 @@ public class RouteStatus extends DeviceStatus {
         return change;
     }
 
-    @Override
-    public DeviceStatusVO convert2VO(MapElement device) {
-        RouteStatusVO statusVO = new RouteStatusVO((Route) device);
-        statusVO.setNormalUnlock(normalUnlock);
-        statusVO.setCanceling(canceling);
-        statusVO.setLock(lock);
-        statusVO.setSettingGuide(settingGuide);
-        statusVO.setSettable(settable);
-        statusVO.setSetting(setting);
-        statusVO.setCiControl(ciControl);
-        statusVO.setFleetMode(fleetMode);
-        statusVO.setAtsControl(atsControl);
-        statusVO.setCbtcMode(cbtcMode);
-        return statusVO;
-    }
-
 }