潘钊 / control_service_data_Interface · Commits

Commit 2ab39513fb60c77ebab9faa946c94ed9d8160d0a

Authored by 娄高锋
1 parent 876e9bdd
build: skipped

给谢灿的首末班推送数据，筛掉了直放班次

Inline Side-by-side
Showing 1 changed file with 49 additions and 17 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @2ab3951
... ... @@ -3260,7 +3260,7 @@ public class BigscreenService {
3260 3260 Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
3261 3261 Map<String, Map<String, Object>> lineXX = new HashMap<String, Map<String, Object>>();
3262 3262 for(ScheduleRealInfo s : findAll){
3263   - if(s.getBcType().equals("region") || isInOut(s)){
  3263 + if(s.getBcType().equals("region") || s.getBcType().equals("venting") || isInOut(s)){
3264 3264 continue; //区间班次与空驶班次不做首末班统计
3265 3265 }
3266 3266 if(!("77".equals(s.getGsBm())) && yyLine.containsKey(s.getXlBm())){ //只统计营运线路
... ... @@ -3341,13 +3341,13 @@ public class BigscreenService {
3341 3341 }
3342 3342 }
3343 3343  
3344   -// if (!(s.isSflj())) {
  3344 + if (!(s.isSflj())) {
3345 3345 if (s.getXlDir().equals("0")) {
3346 3346 listjh0.add(s);
3347 3347 } else {
3348 3348 listjh1.add(s);
3349 3349 }
3350   -// }
  3350 + }
3351 3351  
3352 3352 if(s.getFcsjActual() != null && s.getFcsjActual().trim().length() > 0){
3353 3353 if (s.getXlDir().equals("0")) {
... ... @@ -3369,11 +3369,19 @@ public class BigscreenService {
3369 3369 ScheduleRealInfo jhsb = listjh0.get(0); //计划首班
3370 3370 if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
3371 3371 jhFirst++;
3372   - if(listsj0.size() > 0){
3373   - ScheduleRealInfo sjsb = listsj0.get(0); //实际首班
  3372 +// if(listsj0.size() > 0){
  3373 +// ScheduleRealInfo sjsb = listsj0.get(0); //实际首班
  3374 +// long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
  3375 +// if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
  3376 +// sjzdFirst++;
  3377 +// }
  3378 +// }
  3379 + for(int i = 0; i < listsj0.size(); i++){
  3380 + ScheduleRealInfo sjsb = listsj0.get(i); //实际首班
3374 3381 long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
3375 3382 if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
3376 3383 sjzdFirst++;
  3384 + break;
3377 3385 }
3378 3386 }
3379 3387 }
... ... @@ -3382,13 +3390,21 @@ public class BigscreenService {
3382 3390 ScheduleRealInfo jhmb = listjh0.get(listjh0.size() - 1); //计划末班
3383 3391 if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
3384 3392 jhLast++;
3385   - if(listsj0.size() > 1){
3386   - ScheduleRealInfo sjmb = listsj0.get(listsj0.size() - 1); //实际末班
3387   - long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
  3393 +// if(listsj0.size() > 1){
  3394 +// ScheduleRealInfo sjmb = listsj0.get(listsj0.size() - 1); //实际末班
  3395 +// long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
  3396 +// if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
  3397 +// sjzdLast++;
  3398 +// }
  3399 +// }
  3400 + for(int i = listsj0.size() - 1; i >= 0; i--){
  3401 + ScheduleRealInfo sjmb = listsj0.get(i); //实际末班
  3402 + long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
3388 3403 if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
3389 3404 sjzdLast++;
  3405 + break;
3390 3406 }
3391   - }
  3407 + }
3392 3408 }
3393 3409 }
3394 3410 }
... ... @@ -3398,26 +3414,42 @@ public class BigscreenService {
3398 3414 ScheduleRealInfo jhsb = listjh1.get(0); //计划首班
3399 3415 if("1".equals(sfss) ? createDate.getTime() > jhsb.getFcsjT() : true){
3400 3416 jhFirst++;
3401   - if(listsj1.size() > 0){
3402   - ScheduleRealInfo sjsb = listsj1.get(0); //实际首班
3403   - long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
  3417 +// if(listsj1.size() > 0){
  3418 +// ScheduleRealInfo sjsb = listsj1.get(0); //实际首班
  3419 +// long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
  3420 +// if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
  3421 +// sjzdFirst++;
  3422 +// }
  3423 +// }
  3424 + for(int i = 0; i < listsj1.size(); i++){
  3425 + ScheduleRealInfo sjsb = listsj1.get(i); //实际首班
  3426 + long wd = sjsb.getFcsjActualTime() - jhsb.getFcsjT(); //误点，快1慢2
3404 3427 if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
3405 3428 sjzdFirst++;
  3429 + break;
3406 3430 }
3407   - }
  3431 + }
3408 3432 }
3409 3433  
3410 3434 if(listjh1.size() > 1){
3411 3435 ScheduleRealInfo jhmb = listjh1.get(listjh1.size() - 1); //计划末班
3412 3436 if("1".equals(sfss) ? createDate.getTime() > jhmb.getFcsjT() : true){
3413 3437 jhLast++;
3414   - if(listsj1.size() > 1){
3415   - ScheduleRealInfo sjmb = listsj1.get(listsj1.size() - 1); //实际末班
3416   - long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
  3438 +// if(listsj1.size() > 1){
  3439 +// ScheduleRealInfo sjmb = listsj1.get(listsj1.size() - 1); //实际末班
  3440 +// long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
  3441 +// if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
  3442 +// sjzdLast++;
  3443 +// }
  3444 +// }
  3445 + for(int i = listsj1.size() - 1; i >= 0; i--){
  3446 + ScheduleRealInfo sjmb = listsj1.get(i); //实际末班
  3447 + long wd = sjmb.getFcsjActualTime() - jhmb.getFcsjT(); //误点，快1慢2
3417 3448 if(-1l * 1000 * 60 <= wd && wd <= 2l * 1000 * 60){
3418 3449 sjzdLast++;
  3450 + break;
3419 3451 }
3420   - }
  3452 + }
3421 3453 }
3422 3454 }
3423 3455 }
... ...