Merge branch 'minhang' into jiading

潘钊
2 parents 4fbb34d8 221d3f90
Showing 10 changed files with 43 additions and 15 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/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
@@ -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());
 		}
 	}
 }
@@ -124,7 +124,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                     // poi读
                     String cellContent = PoiUtils.getStringValueFromCell(
                             poi_sheet.getRow(i).getCell(j)
-                    );
+                    ).replaceAll("\\s*", "");
                     // jxl写
                     sheet1.addCell(new Label(j, i, cellContent));
                 }
@@ -278,6 +278,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         Date start2 = new Date();
         ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
         Date end2 = new Date();
+
+        logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
+
         // 3、计划输出
         Date start3 = new Date();
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
@@ -251,7 +251,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
                         Row row = sheet.getRow(i);
                         for (int j = 1; j < colNums; j++) { // 从第2列开始
-                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))); // trimToEmpty
+                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
                             if (StringUtils.isNotEmpty(bcell_con)) {
                                 Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
@@ -44,7 +44,7 @@ public class TTInfo_input implements Comparable&lt;TTInfo_input&gt; {
         this.ttInfoId = String.valueOf(ttInfo.getId());
         this.xlId = String.valueOf(ttInfo.getXl().getId());
         String[] days = ttInfo.getRule_days().split(",");
-        System.out.println(days.length);
+//        System.out.println(days.length);
         for (int i = 0; i < 7; i++) {
             if ("1".equals(days[i])) {
                 weekdays.add(true);
@@ -47,14 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
     @Override
     public Serializable createContext() {
-        System.out.println("create");
+//        System.out.println("create");
         return new RepeatBcInfo();
     }
     @Override
     public void init(Serializable serializable) throws Exception {
         // TODO：
-        System.out.println("init");
+//        System.out.println("init");
     }
     @Override