Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1

sql/20221017-wei-project_view.sql

@@ -0,0 +1,2 @@
+alter table `joylink`.`project_view`
+drop index `mark_key`;

src/main/java/club/joylink/rtss/controller/publish/MapController.java

@@ -413,4 +413,12 @@ public class MapController {
     public Map<Simulation.Type, List<MapMemberVO>> queryMemberMap(@PathVariable long id) {
         return iMapService.queryMemberMap(id);
     }
+
+    /**
+     * 获取地图下所有车站
+     */
+    @GetMapping("/{id}/stations")
+    public List<MapStationNewVO> getMapStations(@PathVariable long id) {
+        return iMapService.getMapStations(id);
+    }
 }

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

@@ -357,4 +357,9 @@ public interface IMapService {
      * 查询地图成员Map
      */
     Map<Simulation.Type, List<MapMemberVO>> queryMemberMap(long mapId);
+
+    /**
+     * 获取地图下所有车站
+     */
+    List<MapStationNewVO> getMapStations(long mapId);
 }

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

@@ -869,6 +869,13 @@ public class MapService implements IMapService {
         return memberMap == null ? new HashMap<>() : memberMap;
     }
 
+    @Override
+    public List<MapStationNewVO> getMapStations(long mapId) {
+        MapVO mapDetail = getMapDetail(mapId);
+        List<MapStationNewVO> stationList = mapDetail.getGraphDataNew().getStationList();
+        return stationList == null ? new ArrayList<>() : stationList;
+    }
+
     /**
      * 该版本的地图数据是否存在
      */

src/main/java/club/joylink/rtss/simulation/cbtc/work/SimulationWorkServiceManager.java

@@ -63,7 +63,10 @@ public class SimulationWorkServiceManager implements ApplicationContextAware {
             }
             MapElement mapElement = null;
             if (StringUtils.hasText(memberVO.getDeviceCode())) {
-                mapElement = repository.getByCode(memberVO.getDeviceCode());
+                mapElement = repository.findByCode(memberVO.getDeviceCode());
+                if (mapElement == null) {
+                    mapElement = repository.getVRByCode(memberVO.getDeviceCode());
+                }
             }
             memberManager.addRole(simulation, memberVO.getType(), memberVO.getName(), mapElement);
         }