Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong

徐烜
2 parents f53ab421 d651cc0c
Showing 18 changed files with 102 additions and 35 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/UploadRfidDataService.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/entity/RfidInoutStation.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/handle/RfidSignalHandle.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataUtils.java
src/main/java/com/bsth/data/gpsdata_v2/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/resources/static/real_control_v2/js/main.js
@@ -154,7 +154,7 @@ public class XDApplication implements CommandLineRunner {
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
-        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
         sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
@@ -33,6 +33,8 @@ public class Constants {
 	//车载网关上行接口
 	public static final String UPSTREAM_URL = "/control/upstream";
+	//rfid 上传入口
+	public static final String UP_RFID_URL = "/rfid/**";
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
@@ -97,6 +97,9 @@ public class DataHandleProcess {
             try {
                 for (GpsEntity gps : list) {
                     try{
+                        if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                            continue;
+
                         gpsStateProcess.process(gps);//状态处理
                         stationInsideProcess.process(gps);//场站内外判定
                         reverseRouteProcess.process(gps);//反向路由处理
@@ -297,6 +297,19 @@ public class GeoCacheData {
         }
     }
+    /**
+     * 是否是环线
+     * @param lineId
+     * @return
+     */
+    public static boolean isLoopLine(String lineId) {
+        List<StationRoute> srs = getStationRoute(lineId , 0);
+        if(srs.get(0).getName().equals(srs.get(srs.size()- 1).getName())
+                && getStationRoute(lineId , 1).size()==2)
+            return true;
+        return false;
+    }
+
     private static class PreconditionGeoComp implements Comparator<PreconditionGeo>{
         @Override
@@ -33,6 +33,15 @@ public class GpsCacheData {
         return gpsCacheMap.get(device);
     }
+    /**
+     * 清除车辆的轨迹数据
+     * @param nbbm
+     */
+    public static void remove(String nbbm){
+        logger.info("清除车辆到离站轨迹, " + nbbm);
+        trailListMultimap.removeAll(nbbm);
+    }
+
     public static GpsExecTrail gpsExecTrail(String nbbm){
         List<GpsExecTrail> list = trailListMultimap.get(nbbm);
@@ -104,6 +113,29 @@ public class GpsCacheData {
         return null;
     }
+    /**
+     * 最后一段轨迹
+     * @param gps
+     * @return
+     */
+    public static int lastInTrailsSize(GpsEntity gps) {
+        //int size = 0;
+        List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
+        if(null == trails || trails.size() == 0)
+            return 0;
+
+        GpsExecTrail gs = trails.get(trails.size() - 1);
+        if(gs.isEnd())
+            return 0;
+
+        Set<String> set = new HashSet<>();
+        for(GpsEntity g : gs.getSrs()){
+            if(g.getInstation() == 1)
+                set.add(g.getStation().getName());
+        }
+        return set.size();
+    }
+
     public static List<StationRoute> prevMultiStation(GpsEntity gps) {
         List<StationRoute> rs = new ArrayList<>();
         List<GpsExecTrail> trails = trailListMultimap.get(gps.getNbbm());
@@ -76,18 +76,17 @@ public class InStationProcess {
      * @param prev
      */
     private void inStation(GpsEntity gps, GpsEntity prev) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         boolean flow = true;
-        //要经过一个中途站才能进
-        StationRoute s = GpsCacheData.prevStation(gps);
+        //要经过2个中途站才能进
+        int count = GpsCacheData.lastInTrailsSize(gps);
         List<StationRoute> routes = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
-        if (gps.getInstation() == 1 && routes.size() > 3
-                && null != s && s.getName().equals(gps.getStation().getName())) {
+        if (isNotInOut(sch) && gps.getInstation() == 1 && routes.size() > 4
+                && count < 2) {
             logger.info("没有进中途站，拒绝进站... -" + gps.getNbbm() + " -time:" + gps.getTimestamp());
             flow = false;
         }
-
-        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         boolean isEnd = false;
         //进终点
@@ -99,6 +98,10 @@ public class InStationProcess {
         GpsCacheData.in(gps, isEnd);
     }
+    private boolean isNotInOut(ScheduleRealInfo sch) {
+        return !sch.getBcType().equals("in") && !sch.getBcType().equals("out");
+    }
+
     /**
      * 进班次终点
      *
@@ -159,12 +162,11 @@ public class InStationProcess {
             gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
         }
-        if(null == next){
-            if (gps.isService())
-                nonService(sch, "结束@系统");//班次结束
-            else if (dayOfSchedule.emptyService(next))
-                nonService(sch, "空驶@系统");//下一班非营运
-        }
+
+        if (null == next && gps.isService())
+            nonService(sch, "结束@系统");//班次结束
+        else if (null != next && dayOfSchedule.emptyService(next))
+            nonService(sch, "空驶@系统");//下一班非营运
     }
     /**
@@ -73,7 +73,7 @@ public class OutStationProcess {
                 (sch.getQdzCode().equals(prev.getStopNo()) || sch.getQdzCode().equals(prev.getCarparkNo()))){
             //发车班次匹配
             if(!signalSchPlanMatcher.outMatch(gps, sch)){
-                //outStation(gps);
+                outStation(gps, prev);
                 return;
             }
 package com.bsth.data.gpsdata_v2.handlers;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
@@ -25,7 +26,7 @@ public class ReverseRouteProcess {
     DayOfSchedule dayOfSchedule;
     public void process(GpsEntity gps){
-        if(reversRoute(gps)){
+        if(reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
             ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
             if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
                 return;
@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
@@ -17,7 +18,7 @@ import java.util.List;
  * Created by panzhao on 2017/11/22.
  */
 @RestController
-@RequestMapping("/up/rfid")
+@RequestMapping("/rfid")
 public class UploadRfidDataService {
     @Autowired
@@ -25,9 +26,14 @@ public class UploadRfidDataService {
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    @RequestMapping("inside")
+    @RequestMapping(value = "inside", method = RequestMethod.POST)
     public void inside(@RequestBody List<RfidInoutStation> list) {
         logger.info("up rfid: " + JSON.toJSONString(list));
         rfidSignalHandle.handle(list);
     }
+
+    @RequestMapping(value = "test")
+    public int test() {
+        return 1;
+    }
 }
 \ No newline at end of file
@@ -11,8 +11,8 @@ public class RfidInoutStation {
     private String station;
     /**
-     * 0 进
-     * 1 出
+     * 2 进
+     * 4 出
      */
     private int type;
@@ -36,9 +36,9 @@ public class RfidSignalHandle {
     public void handle(List<RfidInoutStation> list){
         for(RfidInoutStation signal : list){
-            if(signal.getType()==0)
+            if(signal.getType()==2)
                 in(signal);
-            else if(signal.getType()==1)
+            else if(signal.getType()==4)
                 out(signal);
         }
     }
@@ -106,7 +106,6 @@ public class RfidSignalHandle {
                 ScheduleRealInfo next = dayOfSchedule.next(sch);
                 if(next != null){
                     dayOfSchedule.addExecPlan(next);
-                    //inStationAndInPark(sch, next);//进站既进场
                 }
                 //路牌的下一个班次，页面显示起点实际到达时间
@@ -133,7 +132,7 @@ public class RfidSignalHandle {
                 if(null == next)
                     nonService(sch, "rfid1@系统");//班次结束
-                else if(dayOfSchedule.emptyService(next))
+                else if(null != next && dayOfSchedule.emptyService(next))
                     nonService(sch, "rfid2@系统");//下一班非营运
             }
         }catch (Exception e){
@@ -40,6 +40,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
     static InStationProcess inStationProcess;
     static OutStationProcess outStationProcess;
     static AbnormalStateProcess abnormalStateProcess;
+    static ReverseRouteProcess reverseRouteProcess;
     public void recovery() {
         List<GpsEntity> list = loadData();
@@ -59,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.submit(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("S0L-065"))
+            /*if(nbbm.equals("W7C-035"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -83,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=" + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=327"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -100,6 +101,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                         gps.setLineId(rs.getString("LINE_ID"));
                         gps.setTimestamp(rs.getLong("TS"));
                         gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
+                        gps.setServerTimestamp(rs.getLong("SERVER_TS"));
                         return gps;
                     }
                 });
@@ -125,6 +127,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         inStationProcess = applicationContext.getBean(InStationProcess.class);
         outStationProcess = applicationContext.getBean(OutStationProcess.class);
         abnormalStateProcess = applicationContext.getBean(AbnormalStateProcess.class);
+        reverseRouteProcess = applicationContext.getBean(ReverseRouteProcess.class);
     }
     public static class GpsComp implements Comparator<GpsEntity> {
@@ -151,12 +154,15 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1511386080000L)
+                        /*if(gps.getTimestamp() >= 1511396220000L)
                             System.out.println("aaa");*/
+                        if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
+                            continue;
+
                         gpsStateProcess.process(gps);//状态处理
                         stationInsideProcess.process(gps);//场站内外判定
-
+                        reverseRouteProcess.process(gps);//反向路由处理
                         abnormalStateProcess.process(gps);//超速越界
@@ -25,7 +25,7 @@ public class GpsDataUtils {
         try {
             for (GpsEntity gps : list) {
-                if (gps.getValid() == 0)
+                if (gps.getValid() == 0 && Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
                     rs.add(gps);
             }
@@ -39,8 +39,8 @@ public class SignalSchPlanMatcher {
             return true;
         try{
-            //晚于待发时间 半小时 ，匹配一下最佳的班次
-            if(t - sch.getDfsjT() > 1000 * 60 * 30){
+            //晚于待发时间 10 分钟 ，匹配一下最佳的班次
+            if(t - sch.getDfsjT() > 1000 * 60 * 10){
                 ScheduleRealInfo near = searchNearOut(gps);
                 if(null != near && !near.getId().equals(sch.getId())){
@@ -3,6 +3,7 @@ package com.bsth.data.schedule.thread;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DayOfDirectives;
+import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
@@ -60,8 +61,10 @@ public class ScheduleRefreshThread extends Thread{
 						try{
 							//清除指令数据
 							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
-							for(String car : cars)
+							for(String car : cars){
 								dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
+								GpsCacheData.remove(car);
+							}
 							//清除驾驶员上报数据
 							pilotReport.clear(lineCode);
 						}catch (Exception e){
@@ -17,7 +17,7 @@ public abstract class BaseFilter implements Filter {
 	 * 白名单
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL };
 	@Override
 	public void destroy() {
@@ -33,7 +33,7 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL };
 	@Override
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-11-23',
-        text: '<h5>1、蒽... 更新了一些东西，，， 明天再写更新说明。</h5>'
+        date: '2017-11-24',
+        text: '<h5>1、修复23号下午更新后出现的部分线路班次执行问题。</h5><h5>2、尝试接入成山路停车场的RFID信号，以弥补成山路停车场高峰时GPS信号弱的问题。</h5><h5>3、报表管理里加入 “班次车辆人员日统计”</h5><h5>4、现在“历史班次调整”里可以修改烂班原因和售票员</h5>'
     };
     var storage = window.localStorage