Merge branch 'minhang' into pudong

潘钊
2 parents ecf3fa00 abd9f44a
Showing 3 changed files with 14 additions and 12 deletions
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9G-013"))
+            /*if(nbbm.equals("W7C-001"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
  
@@ -150,8 +150,6 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
-                    /*if(gps.getTimestamp() > 1491951840000L)
-                        System.out.print("");*/
  
                     //是否有任务
  
@@ -88,7 +88,7 @@ public class SafeDrivDataLoadThread extends Thread{
             httpClient.close();
             response.close();
         } catch (Exception e) {
-            logger.error("", e);
+            logger.error(e.getMessage());
         }
     }
 }
@@ -242,13 +242,11 @@ public class DayOfSchedule implements CommandLineRunner {
                 //计算“起点站应到”时间
                 schAttrCalculator.calcQdzTimePlan(lpScheduleMap.get(lineCode + "_" + lp));
             }
-            /*Set<String> cars = searchAllCars(list);
+            Set<String> cars = searchAllCars(list);
             for (String nbbm : cars) {
-                //计算“起点站应到”时间
-                schAttrCalculator.calcQdzTimePlan(nbbmScheduleMap.get(nbbm));
                 //车辆 ——> 要执行的班次对照
                 reCalcExecPlan(nbbm);
-            }*/
+            }
  
             // 页面 翻班通知
             //sendUtils.shiftSchedule(lineCode);
@@ -267,14 +265,14 @@ public class DayOfSchedule implements CommandLineRunner {
     /**
      * @Title: searchAllCars
      * @Description: TODO(搜索班次集合中的车辆)
-
+    */
     private Set<String> searchAllCars(List<ScheduleRealInfo> list) {
         Set<String> cars = new HashSet<>();
         for (ScheduleRealInfo sch : list)
             cars.add(sch.getClZbh());
  
         return cars;
-    }*/
+    }
  
     /**
      * @Title: searchAllCars
@@ -334,12 +332,16 @@ public class DayOfSchedule implements CommandLineRunner {
         }
  
         //清理路牌对照
+        List<String> lprms = new ArrayList<>();
         Set<String> lps = lpScheduleMap.keySet();
         for(String lp : lps){
             if(lp.indexOf(lineCode + "_") != -1)
-                lpScheduleMap.removeAll(lp);
+                lprms.add(lp);
         }
  
+        for(String lp : lprms)
+            lpScheduleMap.removeAll(lp);
+
         logger.info(lineCode + "排班清理 " + count);
     }
  
@@ -898,7 +900,9 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     public void reCalcExecPlan(String nbbm){
-        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(nbbmScheduleMap.get(nbbm)));
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
+        Collections.sort(list, schFCSJComparator);
+        carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(list));
     }
  
     /**