update...

潘钊
1 parent c667f4ec
Showing 9 changed files with 93 additions and 22 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/StationInsideHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/static/real_control_v2/js/common.js
src/main/resources/static/real_control_v2/js/data/data_basic.js
@@ -488,7 +488,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		long t = new Date().getTime();
 		if(c != 1)
 		 	t -= ONE_DAY - (1000 * 60 * 60 * 2);
-		for(int i = 0; i < 10; i ++){
+		for(int i = 0; i < 3; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
 		}
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
  * @date 2016年5月11日 下午4:32:07
  *
  */
-public class GpsEntity {
+public class GpsEntity implements Cloneable{
 	/** 公司代码 */
 	private Short companyCode;
@@ -98,6 +98,14 @@ public class GpsEntity {
 	 */
 	private int source = -1;
+	public Object clone() {
+		try {
+			return super.clone();
+		} catch (CloneNotSupportedException e) {
+			return null;
+		}
+	}
+
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -41,7 +41,7 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    static ExecutorService threadPool = Executors.newFixedThreadPool(20);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(25);
     public static long st;
     public static CountDownLatch count;
@@ -90,6 +90,11 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(prev.getInstation() > 0 && gps.getInstation() > 0
                 && !prev.getStopNo().equals(gps.getStopNo()))
             return true;
+
+        //在被起点站覆盖的情况下出场
+        if(isOutPark(gps, prev)){
+            return true;
+        }
         return false;
     }
@@ -110,11 +115,15 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(prev.getInstation() == 2 && gps.getInstation() == 1){
             return true;
         }
+
+        //被起点站覆盖的情况下进场
+        if(isInPark(gps, prev))
+            return true;
         return false;
     }
     /**
-     * 出站
+     * 出站/出场
      * @param gps 当前点
      * @param prev 上一个点
      */
@@ -133,7 +142,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             return;
         //起点发车
-        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
+        if(qdzCode != null
+                && prev.getStopNo().equals(qdzCode)
+                && gps.getInstation()==0
                 && !willDepart(gps, prev, sch)){
             //发车班次匹配
@@ -168,6 +179,21 @@ public class InOutStationSignalHandle extends SignalHandle{
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
         else if(sch.getBcType().equals("out")){
+            //有出场动作（起点站覆盖停车场时，并且不设置出站既出场，逻辑可能会走到这里）
+            try{
+                if(isOutPark(gps, prev)){
+                    if(prev.getCarparkNo().equals(sch.getQdzCode())){
+                        //再试一下出场
+                        GpsEntity prevClone = (GpsEntity) prev.clone(),
+                                gpsClone = (GpsEntity) gps.clone();
+                        prevClone.setStopNo(prevClone.getCarparkNo());
+                        gpsClone.setInstation(0);
+                        outStation(gpsClone, prevClone);
+                        return;
+                    }
+                }
+            }catch (Exception e){logger.error("",e);}
+
             ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
             //如果下一个班次是区间，并且是环线
             if(next != null && next.getBcType().equals("region")){
@@ -255,7 +281,8 @@ public class InOutStationSignalHandle extends SignalHandle{
     private void inStation(GpsEntity gps, GpsEntity prev){
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
-        if(gps.getStopNo().equals(sch.getZdzCode())){
+        if(gps.getStopNo().equals(sch.getZdzCode())
+                && !gps.getStopNo().equals(prev.getStopNo())){
             int diff = 0;
             try{
@@ -336,6 +363,25 @@ public class InOutStationSignalHandle extends SignalHandle{
                 scheduleSignalState.signalRetrospect(gps, sch);
             }
 */
+            //被起点站覆盖的情况下进场，没有设置出站既是出场，逻辑会走到这里（模拟进站信号）
+            if(sch.getBcType().equals("in")){
+                try{
+                    if(isInPark(gps, prev)){
+                        if(gps.getCarparkNo().equals(sch.getZdzCode())){
+                            //再试一下进场
+                            GpsEntity gpsClone = (GpsEntity) gps.clone(),
+                                prevClone = (GpsEntity) prev.clone();
+                            gpsClone.setStopNo(gpsClone.getCarparkNo());
+                            prevClone.setStopNo(null);
+                            inStation(gpsClone, prevClone);
+                            return;
+                        }
+                    }
+                }catch (Exception e){
+                    logger.error("", e);
+                }
+            }
+
             //如果当前班次是出场，并且进的是下一个班次的终点
             if(sch.getBcType().equals("out")){
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -447,4 +493,16 @@ public class InOutStationSignalHandle extends SignalHandle{
         }*/
         return false;
     }
+
+    private boolean isOutPark(GpsEntity gps, GpsEntity prve){
+        if(StringUtils.isNotEmpty(prve.getCarparkNo()) && StringUtils.isEmpty(gps.getCarparkNo()))
+            return true;
+        return false;
+    }
+
+    private boolean isInPark(GpsEntity gps, GpsEntity prve){
+        if(StringUtils.isNotEmpty(gps.getCarparkNo()) && StringUtils.isEmpty(prve.getCarparkNo()))
+            return true;
+        return false;
+    }
 }
 \ No newline at end of file
@@ -25,6 +25,7 @@ public class StationInsideHandle extends SignalHandle {
         if (parkCode != null) {
             gps.setInstation(2);
             gps.setStopNo(parkCode);
+            gps.setCarparkNo(parkCode);
         }
         //是否在站内
@@ -48,8 +48,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
         //按线路分组数据
         ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
         for (GpsEntity gps : list) {
-            if (gps.getLineId() != null)
-                listMap.put(gps.getLineId(), gps);
+            if (gps.getNbbm() != null)
+                listMap.put(gps.getNbbm(), gps);
         }
@@ -57,10 +57,10 @@ public class GpsDataRecovery implements ApplicationContextAware {
         CountDownLatch count = new CountDownLatch(keys.size());
         GpsComp comp = new GpsComp();
-        for (String lineId : keys) {
-            Collections.sort(listMap.get(lineId), comp);
-            threadPool.execute(new RecoveryThread(listMap.get(lineId), count));
-            /*if(nbbm.equals("W7E-016"))
+        for (String nbbm : keys) {
+            Collections.sort(listMap.get(nbbm), comp);
+            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+            /*if(nbbm.equals("W9H-088"))
                 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=194";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=206";// + 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() >= 1495512240000L){
+                        /*if(gps.getTimestamp() >= 1500942270000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -884,8 +884,12 @@ public class DayOfSchedule {
     }
     public void addExecPlan(ScheduleRealInfo sch) {
-        if (sch != null)
-            carExecutePlanMap.put(sch.getClZbh(), sch);
+        if (sch != null){
+            if(sch.getStatus()==2)
+                reCalcExecPlan(sch.getClZbh());
+            else
+                carExecutePlanMap.put(sch.getClZbh(), sch);
+        }
         else
             carExecutePlanMap.remove(sch.getClZbh());
     }
@@ -232,8 +232,8 @@ var gb_common = (function () {
             data.push({
                 value: name,
                 code: code,
-                fullChars: pinyin.getFullChars(name).toLocaleLowerCase(),
-                camelChars: pinyin.getCamelChars(name).toLocaleLowerCase()
+                fullChars: pinyin.getFullChars(name),
+                camelChars: pinyin.getCamelChars(name)
             });
         }
         init_autocom_pinyin(element, data);
@@ -271,7 +271,7 @@ var gb_common = (function () {
             minLength: 1,
             delay: 50,
             source: function (release) {
-                var q = $('input', element).val().toLocaleLowerCase(),
+                var q = $('input', element).val().toUpperCase(),
                     rs = [],
                     count = 0;
@@ -295,7 +295,7 @@ var gb_common = (function () {
             minLength: 1,
             delay: 50,
             source: function (release) {
-                var q = $('input', element).val().toLocaleLowerCase(),
+                var q = $('input', element).val().toUpperCase(),
                     rs = [],
                     count = 0;
@@ -63,8 +63,8 @@ var gb_data_basic = (function () {
                 code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
                 data.push({
                     value: code + '/' + p.name,
-                    fullChars: p.fullChars,
-                    camelChars: p.camelChars
+                    fullChars: p.fullChars.toUpperCase(),
+                    camelChars: p.camelChars.toUpperCase()
                 });
             }
             cb && cb(data);