update...

潘钊
1 parent f5202825
Showing 4 changed files with 12 additions and 10 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/resources/static/real_control_v2/js/main.js
@@ -152,11 +152,11 @@ public class GpsCacheData {
     private static List<StationRoute> searchLinked(LinkedList<GpsEntity> list, int upDown){
         List<StationRoute> rs = new ArrayList<>();
-        Iterator<GpsEntity> iterator = list.iterator();
+
         GpsEntity gps;
         int prevCode=0;
-        while (iterator.hasNext()){
-            gps = iterator.next();
+        for(int i = list.size() - 1; i > 0; i --){
+            gps = list.get(i);
             if(gps.getInstation()!=1)
                 continue;
@@ -70,7 +70,9 @@ public class OutStationProcess {
         //起点发车
         if (null != sch &&
-                ((sch.getQdzCode().equals(prev.getStopNo()) && gps.getInstation()==0) || sch.getQdzCode().equals(prev.getCarparkNo()))){
+                ((sch.getQdzCode().equals(prev.getStopNo())
+                        && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo())))
+                        || sch.getQdzCode().equals(prev.getCarparkNo()))){
             //发车班次匹配
             if(!signalSchPlanMatcher.outMatch(gps, sch)){
                 outStation(gps, prev);
@@ -60,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("W7C-035"))
+            /*if(nbbm.equals("W1E-169"))
                 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,SERVER_TS from bsth_c_gps_info where days_year=327"; //+ 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=329"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -154,7 +154,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1511396220000L)
+                        /*if(gps.getTimestamp() >= 1511569544000L)
                             System.out.println("aaa");*/
                         if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            //showUpdateDescription();
+            showUpdateDescription();
         });
         function g_emit(id) {
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-11-24',
-        text: '<h5>1、修复23号下午更新后出现的部分线路班次执行问题。</h5><h5>2、尝试接入成山路停车场的RFID信号，以弥补成山路停车场高峰时GPS信号弱的问题。</h5><h5>3、报表管理里加入 “班次车辆人员日统计”</h5><h5>4、现在“历史班次调整”里可以修改烂班原因和售票员</h5>'
+        date: '2017-11-25_中午',
+        text: '<h5>1、修复这个版本的一个问题，这个问题导致首站和第二站重叠的时候无法发车。</h5><h5>2、修复455路因 昌邑路民生路 和 昌邑路苗圃路 站点顺序颠倒引发的上下行跳动问题。</h5><h5>3、放宽对中途站的检测机制，如果仍然有线路出现上下行乱跳的问题，及时上报管理员。</h5>'
     };
     var storage = window.localStorage