Merge branch 'minhang' into pudong

潘钊
2 parents 6650455b 44442ea4
Showing 3 changed files with 4 additions and 4 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/resources/static/real_control_v2/js/main.js
@@ -144,7 +144,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         //起点发车
         if(qdzCode != null
                 && prev.getStopNo().equals(qdzCode)
-                && gps.getInstation()==0
+                && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo()))
                 && !willDepart(gps, prev, sch)){
  
             //发车班次匹配
@@ -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=206";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=207";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
  
         List<GpsEntity> list =
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-07-21',
-        text: '<h5>1、修复一个蛮严肃的问题，这个问题有极低的概率导致个别班次的操作不会同步到路单！！！</h5>'
+        date: '2017-07-26',
+        text: '<h5>1、修复一个临时性的小问题，这个问题导致26号上午，起点站和第2站缓冲区重叠的几条线路发不出去！</h5>'
     };
  
     var storage = window.localStorage