update...

潘钊
1 parent 48436fa4
Showing 6 changed files with 68 additions and 17 deletions
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
         int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
-        return timestamp - (diff * 1000);
+        return timestamp + (diff * 1000);
     }
     @Component
@@ -239,9 +239,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         long t2 = gps.getTimestamp();
         long c = sch.getDfsjT();
-        if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+        /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+            return true;
+        }*/
+        int threshold = 1000 * 60 * 5;
+        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
             return true;
         }
+        //if(Math.abs(t2 - c) < 1000 * 60 * 5 && c - t1 > 1000 * 60 * 5)
         return false;
     }
@@ -255,7 +260,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         if (config != null && config.getOutConfig() == 2) {
             //出站既出场
             ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out")
+            if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(schPrev.getQdzCode()))) {
                 schPrev.setFcsjActualAll(sch.getFcsjActualTime());
@@ -447,7 +452,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         boolean limitPark = StringUtils.isNotEmpty(park);
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
                 && (!limitPark || park.equals(next.getZdzCode()))) {
             next.setFcsjActualAll(sch.getZdsjActualTime());
@@ -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("W9H-088"))
+            /*if(nbbm.equals("W09-164"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=207";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=241";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -153,7 +153,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 boolean task;
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1500942270000L){
+                        /*if(gps.getTimestamp() >= 1503960000000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -573,7 +573,7 @@ public class DayOfSchedule {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out")
+            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
@@ -3,6 +3,8 @@ package com.bsth.data.schedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -20,20 +22,38 @@ public class ScheduleComparator {
 			return s1.getFcno() - s2.getFcno();
 		}
 	}*/
+
+	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
+
+	static{
+		bcTypeOrderMap.put("out", 0);
+		bcTypeOrderMap.put("normal", 1);
+		bcTypeOrderMap.put("region", 2);
+		bcTypeOrderMap.put("major", 3);
+		bcTypeOrderMap.put("venting", 4);
+		bcTypeOrderMap.put("ldks", 5);
+		bcTypeOrderMap.put("in", 6);
+	}
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getFcsjT() - s2.getFcsjT());
+			int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
+	private static int typeOrder(String bcType){
+		return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
+	}
+
 	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getDfsjT() - s2.getDfsjT());
+			int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
 }
@@ -7,10 +7,26 @@ var gb_schedule_table = (function () {
     var line2Schedule = {};
     //车辆应发未发车辆数
     var car_yfwf_map = {};
+
+    var bcTypeOrderMap = {
+        'out':0,
+        'normal':1,
+        'region':2,
+        'major':3,
+        'venting':4,
+        'ldks':5,
+        'in':6
+    };
+    var typeOrder = function (type) {
+        return bcTypeOrderMap[type]?bcTypeOrderMap[type]:0;
+    };
     var schedule_sort = function (s1, s2) {
-        return s1.fcsjT - s2.fcsjT;
+        var diff = s1['fcsjT'] - s2['fcsjT'];
+        return diff!=0?diff:typeOrder(s1['bcType'])-typeOrder(s2['bcType']);
     };
+
+
     /**
      * 检查是否存在重复班次
      * @param list
@@ -118,17 +134,27 @@ var gb_schedule_table = (function () {
     //计算实发时间差值
     var calc_sch_real_shift = function (sch) {
-        if (sch.fcsjActualTime) {
-            var diff = parseInt((sch.fcsjActualTime - sch.dfsjT) / 1000 / 60);
-            if (diff > 0)
-                sch.fcsj_diff = '( +' + diff + ' )';
-            else if (diff < 0)
-                sch.fcsj_diff = '( ' + diff + ' )';
+        if (sch['fcsjActualTime']){
+            var diff = sch['fcsjActualTime'] - sch['dfsjT'], fcsj_diff;
+            fcsj_diff = parseInt(diff / 60000);
+            if(diff % 60000 != 0){
+                /*if(fcsj_diff > 0)
+                    fcsj_diff ++;
+                else */if(fcsj_diff < 0)
+                    fcsj_diff --;
+            }
+
+            if(fcsj_diff > 0)
+                sch.fcsj_diff = '( +' + fcsj_diff + ' )';
+            else if (fcsj_diff < 0)
+                sch.fcsj_diff = '( ' + fcsj_diff + ' )';
             else
                 sch.fcsj_diff = '';
         }
     };
+
+
     function arrayIsNull(array) {
         return !array || array.length == 0;
     }