运管处时刻表调整

zq
1 parent 3af89ead
Showing 1 changed file with 19 additions and 27 deletions
src/main/java/com/bsth/data/BasicData.java
@@ -70,7 +70,7 @@ public class BasicData implements CommandLineRunner {
     public static Map<String, String> allPerson;
  
     //站点名和运管处编号 对照
-    public static Map<String, Map<String, Map>> stationName2YgcNumber;
+    public static Map<String,Integer> stationName2YgcNumber;
  
  
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
@@ -233,13 +233,6 @@ public class BasicData implements CommandLineRunner {
          * @Description: TODO(加载线路相关信息)
          */
         public void loadLineInfo(){
-            List<StationRoute> stationsList = null;// 站点路由集
-            StationRoute stationRoute = null;
-            int size = 0;
-            Map<String, Integer> station2Number ;
-            Map<String, Map> dirs2Statioin ;
-            int[] dirs = {0,1};// 运行方向  上下行
-            int num = 1;
             Iterator<Line> iterator = lineRepository.findAll().iterator();
  
             Line line;
@@ -247,7 +240,7 @@ public class BasicData implements CommandLineRunner {
             Map<String, String> code2name = new HashMap<>();
             Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
             Map<String, String> code2SHcode = new HashMap<String, String>();
-            Map<String, Map<String, Map>> tempStationName2YgcNumber = new HashMap<String, Map<String, Map>>();
+            Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
  
             while(iterator.hasNext()){
                 line = iterator.next();
@@ -259,27 +252,26 @@ public class BasicData implements CommandLineRunner {
                 /**
                  * 加载运管处的站点及序号
                  * 上行从1开始，下行顺序续编
-
-                num = 1;
-                dirs2Statioin = new HashMap<String, Map>();
-                for (int i = 0; i < dirs.length; i++) {
-                    // 分别取得上下行的站点
-                    stationsList = stationRouteRepository.findByLine(line.getLineCode(), dirs[i]);
-                    size = stationsList == null ? 0 :stationsList.size();
-                    if(size > 0 ){
-                        station2Number = new HashMap<String, Integer>();
-                        for (int j = 0; j < size; j++) {
-                            stationRoute = stationsList.get(j);
-                            // map保存为（站点名称 -->序号）
-                            station2Number.put(stationRoute.getStationName(), num++);
+                 */
+                List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
+                if(ygcLines != null && ygcLines.size() > 0){
+                    int size = ygcLines.size();
+                    Object[] tempArray ;
+                    int num = 1;
+                    String key;
+                    String lineCode = "";
+                    for (int i = 0; i < size; i ++){
+                        tempArray = ygcLines.get(i);
+                        if(lineCode.equals("")){
+                            lineCode = tempArray[0]+"";
+                        }else if(!lineCode.equals(tempArray[0]+"")){
+                            num = 1;
+                            lineCode = tempArray[0]+"";
                         }
-                        // 保存两个数据，（0 --> station2Number）（1 --> station2Number） 0上行 1 下行
-                        dirs2Statioin.put(dirs[i]+"", station2Number);
+                        key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
+                        tempStationName2YgcNumber.put(key,num++);
                     }
                 }
-                // 保存(站点编码 --> dirs2Statioin)
-                tempStationName2YgcNumber.put(line.getLineCode(), dirs2Statioin);
-                 */
             }
  
             lineId2CodeMap = biMap;