Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 0c40bf1d bf1ff552
Showing 8 changed files with 57 additions and 28 deletions
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.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/entity/realcontrol/ScheduleRealInfo.java
src/main/resources/application-prod.properties
@@ -131,7 +131,7 @@ public class BasicDataController {
 	 */
 	@RequestMapping("/nbbm2PlateNo")
 	public Map<String, String> nbbm2PlateNo(){
-		return basicData.getNbbm2PlateNo();
+		return basicData.nbbmCompanyPlateMap;
 	}
@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -82,7 +81,7 @@ public class BasicData {
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
-    @Autowired
+/*    @Autowired
     JdbcTemplate jdbcTemplate;
     public Map<String, String> getNbbm2PlateNo(){
         List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
@@ -92,7 +91,7 @@ public class BasicData {
             rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
         }
         return rs;
-    }
+    }*/
     @Component
     public static class BasicDataLoader extends Thread {
@@ -206,8 +206,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             }
             if(next != null && prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
+                if(dayOfSchedule.addExecPlan(next))
+                    outStation(gps, prev);
             }
         }
         //当前班次是区间
@@ -219,8 +219,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             //是环线
             if(prev.getStopNo().equals(next.getQdzCode())){
                 //发下一个班次
-                dayOfSchedule.addExecPlan(next);
-                outStation(gps, prev);
+                if(dayOfSchedule.addExecPlan(next))
+                    outStation(gps, prev);
             }
         }
     }
@@ -260,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") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().equals(0))
+            if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().intValue()==0)
                     && (!limitPark || park.equals(schPrev.getQdzCode()))) {
                 schPrev.setFcsjActualAll(sch.getFcsjActualTime());
@@ -402,9 +402,8 @@ public class InOutStationSignalHandle extends SignalHandle{
                     if(nearSch != null){
                         //直接跳到这个班次
-                        dayOfSchedule.addExecPlan(nearSch);
-                        //重新进站
-                        inStation(gps, prev);
+                        if(dayOfSchedule.addExecPlan(nearSch))
+                            inStation(gps, prev);//重新进站
                     }
                 }
             }
@@ -429,7 +428,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         String stopId = gps.getStopNo();
         for(int i = 0; i < halfList.size(); i ++){
             sch = halfList.get(i);
-            if(!sch.getZdzCode().equals(stopId))
+            if(!sch.getZdzCode().equals(stopId) || sch.getStatus()==2)
                 continue;
             if(sch.getZdsjT() < gps.getTimestamp())
@@ -69,8 +69,8 @@ public class SignalSchPlanMatcher {
         double s = (int) (next.getDfsjT() - sch.getDfsjT());
         double r = (int) (t - sch.getDfsjT());
         if(r / s > 0.7){
-            dayOfSchedule.addExecPlan(next);
-            outMatch(outSigal, next);
+            if(dayOfSchedule.addExecPlan(next))
+                outMatch(outSigal, next);
         }
     }
@@ -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("W09-164"))
+            /*if(nbbm.equals("S0K-004"))
                 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=241";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=246";// + 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() >= 1503960000000L){
+                        /*if(gps.getTimestamp() >= 1504298280000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -592,7 +592,7 @@ public class DayOfSchedule {
      * @param sch  当前班次
      * @return
      */
-    private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
+    private ScheduleRealInfo next2_lp(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
         int outConfig = -1;
         LineConfig config = lineConfigData.get(sch.getXlBm());
         if (config != null)
@@ -605,8 +605,35 @@ public class DayOfSchedule {
                 flag = true;
                 continue;
             }
-            //忽略烂班
-            if (temp.isDestroy())
+
+            if (flag) {
+                next = temp;
+                break;
+            }
+        }
+        return next;
+    }
+
+    private ScheduleRealInfo next3_lp(Collection<ScheduleRealInfo> list, ScheduleRealInfo sch) {
+        int outConfig = -1;
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null)
+            outConfig = config.getOutConfig();
+
+        //限定出站既出场的停车场
+        String park = config.getTwinsPark();
+        boolean limitPark = StringUtils.isNotEmpty(park);
+        boolean flag = false;
+        ScheduleRealInfo next = null;
+        for (ScheduleRealInfo temp : list) {
+            if (temp.getId() == sch.getId()) {
+                flag = true;
+                continue;
+            }
+
+            //出站既出场，忽略出场班次
+            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
+                    && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
             if (flag) {
@@ -885,7 +912,8 @@ public class DayOfSchedule {
         return nbbmScheduleMap.values();
     }
-    public void addExecPlan(ScheduleRealInfo sch) {
+    public boolean addExecPlan(ScheduleRealInfo sch) {
+        ScheduleRealInfo oldExec = executeCurr(sch.getClZbh());
         if (sch != null){
             if(sch.getStatus()==2)
                 reCalcExecPlan(sch.getClZbh());
@@ -894,6 +922,8 @@ public class DayOfSchedule {
         }
         else
             carExecutePlanMap.remove(sch.getClZbh());
+
+        return executeCurr(sch.getClZbh()) != oldExec;
     }
     public void removeExecPlan(String clzbh) {
@@ -950,6 +980,7 @@ public class DayOfSchedule {
     }
     public void reCalcExecPlan(String nbbm) {
+        logger.info("reCalcExecPlan...: " + nbbm);
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
@@ -1121,7 +1152,7 @@ public class DayOfSchedule {
     public ScheduleRealInfo nextByLp(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
         Collections.sort(list, schFCSJComparator);
-        return next(list, sch);
+        return next3_lp(list, sch);
     }
     /**
@@ -1133,7 +1164,7 @@ public class DayOfSchedule {
     public ScheduleRealInfo nextByLp2(ScheduleRealInfo sch) {
         List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
         Collections.sort(list, schFCSJComparator);
-        return next2(list, sch);
+        return next2_lp(list, sch);
     }
     public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap() {
@@ -223,7 +223,7 @@ public class ScheduleRealInfo {
 	 * 2：到站漂移
 	 * 3：中途漂移
 	 */
-	private int driftStatus = 0;
+	private Integer driftStatus = 0;
 	public boolean isDfAuto() {
 		return dfAuto;
@@ -942,11 +942,11 @@ public class ScheduleRealInfo {
 		this.siginCompate = siginCompate;
 	}
-	public int getDriftStatus() {
+	public Integer getDriftStatus() {
 		return driftStatus;
 	}
-	public void setDriftStatus(int driftStatus) {
+	public void setDriftStatus(Integer driftStatus) {
 		this.driftStatus = driftStatus;
 	}
 }
@@ -2,7 +2,7 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
-spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.ddl-auto= none
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL