潘钊 / bsth_control · Commits

Commit ec6480bbb551ca461a6b1467a08666905c6e0197

Authored by 潘钊
1 parent f5202825

update...

Inline Side-by-side
Showing 4 changed files with 12 additions and 10 deletions
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
  View file @ec6480b
... ... @@ -152,11 +152,11 @@ public class GpsCacheData {
152 152  
153 153 private static List<StationRoute> searchLinked(LinkedList<GpsEntity> list, int upDown){
154 154 List<StationRoute> rs = new ArrayList<>();
155   - Iterator<GpsEntity> iterator = list.iterator();
  155 +
156 156 GpsEntity gps;
157 157 int prevCode=0;
158   - while (iterator.hasNext()){
159   - gps = iterator.next();
  158 + for(int i = list.size() - 1; i > 0; i --){
  159 + gps = list.get(i);
160 160 if(gps.getInstation()!=1)
161 161 continue;
162 162  
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
  View file @ec6480b
... ... @@ -70,7 +70,9 @@ public class OutStationProcess {
70 70  
71 71 //起点发车
72 72 if (null != sch &&
73   - ((sch.getQdzCode().equals(prev.getStopNo()) && gps.getInstation()==0) || sch.getQdzCode().equals(prev.getCarparkNo()))){
  73 + ((sch.getQdzCode().equals(prev.getStopNo())
  74 + && (gps.getInstation()==0 || !gps.getStopNo().equals(prev.getStopNo())))
  75 + || sch.getQdzCode().equals(prev.getCarparkNo()))){
74 76 //发车班次匹配
75 77 if(!signalSchPlanMatcher.outMatch(gps, sch)){
76 78 outStation(gps, prev);
... ...
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
  View file @ec6480b
... ... @@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
60 60 for (String nbbm : keys) {
61 61 Collections.sort(listMap.get(nbbm), comp);
62 62 threadPool.submit(new RecoveryThread(listMap.get(nbbm), count));
63   - /*if(nbbm.equals("W7C-035"))
  63 + /*if(nbbm.equals("W1E-169"))
64 64 new RecoveryThread(listMap.get(nbbm), count).run();*/
65 65 /*if(lineId.equals("60028"))
66 66 new RecoveryThread(listMap.get(lineId), count).run();*/
... ... @@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
84 84 Calendar calendar = Calendar.getInstance();
85 85 int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
86 86  
87   - 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;
  87 + 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;
88 88 JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
89 89  
90 90 List<GpsEntity> list =
... ... @@ -154,7 +154,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
154 154 for (GpsEntity gps : list) {
155 155 try {
156 156  
157   - /*if(gps.getTimestamp() >= 1511396220000L)
  157 + /*if(gps.getTimestamp() >= 1511569544000L)
158 158 System.out.println("aaa");*/
159 159  
160 160 if(Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
... ...
src/main/resources/static/real_control_v2/js/main.js
  View file @ec6480b
... ... @@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
47 47 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
48 48 }, 1000);
49 49 //弹出更新说明
50   - //showUpdateDescription();
  50 + showUpdateDescription();
51 51 });
52 52  
53 53 function g_emit(id) {
... ... @@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
168 168 function showUpdateDescription() {
169 169 //更新说明
170 170 var updateDescription = {
171   - date: '2017-11-24',
172   - text: '<h5>1、修复23号下午更新后出现的部分线路班次执行问题。</h5><h5>2、尝试接入成山路停车场的RFID信号，以弥补成山路停车场高峰时GPS信号弱的问题。</h5><h5>3、报表管理里加入 “班次车辆人员日统计”</h5><h5>4、现在“历史班次调整”里可以修改烂班原因和售票员</h5>'
  171 + date: '2017-11-25_中午',
  172 + text: '<h5>1、修复这个版本的一个问题，这个问题导致首站和第二站重叠的时候无法发车。</h5><h5>2、修复455路因 昌邑路民生路 和 昌邑路苗圃路 站点顺序颠倒引发的上下行跳动问题。</h5><h5>3、放宽对中途站的检测机制，如果仍然有线路出现上下行乱跳的问题，及时上报管理员。</h5>'
173 173 };
174 174  
175 175 var storage = window.localStorage
... ...