潘钊 / control_service_data_Interface · Commits

Commit 53d9cf73fe09a99821c1b94d2c40fbca4ef8a2dc

Authored by 娄高锋
1 parent dc120153
build: skipped

计划出车数改用实时计划数量。

Inline Side-by-side
Showing 1 changed file with 13 additions and 12 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @53d9cf7
@@ -357,7 +357,7 @@ public class BigscreenService { @@ -357,7 +357,7 @@ public class BigscreenService {
357 sjbcs_z += Long.valueOf(t.get("sjbc").toString()); 357 sjbcs_z += Long.valueOf(t.get("sjbc").toString());
358 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString())); 358 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
359 359
360 - jhcc += Long.valueOf(t.get("jhccz").toString()); 360 + jhcc += Long.valueOf(t.get("jhcc").toString());
361 sjcc += Long.valueOf(t.get("sjcc").toString()); 361 sjcc += Long.valueOf(t.get("sjcc").toString());
362 jhbc += Long.valueOf(t.get("jhbc").toString()); 362 jhbc += Long.valueOf(t.get("jhbc").toString());
363 sjbc += Long.valueOf(t.get("sjbc").toString()); 363 sjbc += Long.valueOf(t.get("sjbc").toString());
@@ -407,7 +407,7 @@ public class BigscreenService { @@ -407,7 +407,7 @@ public class BigscreenService {
407 Map<String, Object> qqMap = qqList.get(datesMap.get(d)); 407 Map<String, Object> qqMap = qqList.get(datesMap.get(d));
408 Map<String, Object> gpMap = gpList.get(datesMap.get(d)); 408 Map<String, Object> gpMap = gpList.get(datesMap.get(d));
409 409
410 - ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString())); 410 + ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhcc").toString()));
411 ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString())); 411 ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
412 bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString())); 412 bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
413 bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString())); 413 bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
@@ -793,7 +793,7 @@ public class BigscreenService { @@ -793,7 +793,7 @@ public class BigscreenService {
793 sjbcs_z += Long.valueOf(t.get("sjbc").toString()); 793 sjbcs_z += Long.valueOf(t.get("sjbc").toString());
794 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString())); 794 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
795 795
796 - jhcc += Long.valueOf(t.get("jhccz").toString()); 796 + jhcc += Long.valueOf(t.get("jhcc").toString());
797 sjcc += Long.valueOf(t.get("sjcc").toString()); 797 sjcc += Long.valueOf(t.get("sjcc").toString());
798 jhbc += Long.valueOf(t.get("jhbc").toString()); 798 jhbc += Long.valueOf(t.get("jhbc").toString());
799 sjbc += Long.valueOf(t.get("sjbc").toString()); 799 sjbc += Long.valueOf(t.get("sjbc").toString());
@@ -843,7 +843,7 @@ public class BigscreenService { @@ -843,7 +843,7 @@ public class BigscreenService {
843 Map<String, Object> qqMap = qqList.get(datesMap.get(d)); 843 Map<String, Object> qqMap = qqList.get(datesMap.get(d));
844 Map<String, Object> gpMap = gpList.get(datesMap.get(d)); 844 Map<String, Object> gpMap = gpList.get(datesMap.get(d));
845 845
846 - ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString())); 846 + ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhcc").toString()));
847 ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString())); 847 ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
848 bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString())); 848 bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
849 bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString())); 849 bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
@@ -1164,7 +1164,7 @@ public class BigscreenService { @@ -1164,7 +1164,7 @@ public class BigscreenService {
1164 sjbcs_z += Long.valueOf(t.get("sjbc").toString()); 1164 sjbcs_z += Long.valueOf(t.get("sjbc").toString());
1165 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString())); 1165 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
1166 1166
1167 - jhcc += Long.valueOf(t.get("jhccz").toString()); 1167 + jhcc += Long.valueOf(t.get("jhcc").toString());
1168 sjcc += Long.valueOf(t.get("sjcc").toString()); 1168 sjcc += Long.valueOf(t.get("sjcc").toString());
1169 jhbc += Long.valueOf(t.get("jhbc").toString()); 1169 jhbc += Long.valueOf(t.get("jhbc").toString());
1170 sjbc += Long.valueOf(t.get("sjbc").toString()); 1170 sjbc += Long.valueOf(t.get("sjbc").toString());
@@ -1351,7 +1351,7 @@ public class BigscreenService { @@ -1351,7 +1351,7 @@ public class BigscreenService {
1351 for(Map<String, Object> t : list){ 1351 for(Map<String, Object> t : list){
1352 if(yyLine.contains(t.get("lineCode").toString())){ 1352 if(yyLine.contains(t.get("lineCode").toString())){
1353 1353
1354 - Long plan = Long.valueOf(t.get("jhccz").toString()); 1354 + Long plan = Long.valueOf(t.get("jhcc").toString());
1355 Long real = Long.valueOf(t.get("sjcc").toString()); 1355 Long real = Long.valueOf(t.get("sjcc").toString());
1356 1356
1357 jh += plan; 1357 jh += plan;
@@ -2534,7 +2534,7 @@ public class BigscreenService { @@ -2534,7 +2534,7 @@ public class BigscreenService {
2534 jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString())); 2534 jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
2535 sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString())); 2535 sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
2536 2536
2537 - jhcc += Long.valueOf(t.get("jhccz").toString()); 2537 + jhcc += Long.valueOf(t.get("jhcc").toString());
2538 sjcc += Long.valueOf(t.get("sjcc").toString()); 2538 sjcc += Long.valueOf(t.get("sjcc").toString());
2539 jhbc += Long.valueOf(t.get("jhbc").toString()); 2539 jhbc += Long.valueOf(t.get("jhbc").toString());
2540 sjbc += Long.valueOf(t.get("sjbc").toString()); 2540 sjbc += Long.valueOf(t.get("sjbc").toString());
@@ -2699,7 +2699,7 @@ public class BigscreenService { @@ -2699,7 +2699,7 @@ public class BigscreenService {
2699 jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString())); 2699 jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
2700 sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString())); 2700 sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
2701 2701
2702 - jhcc += Long.valueOf(t.get("jhccz").toString()); 2702 + jhcc += Long.valueOf(t.get("jhcc").toString());
2703 sjcc += Long.valueOf(t.get("sjcc").toString()); 2703 sjcc += Long.valueOf(t.get("sjcc").toString());
2704 jhbc += Long.valueOf(t.get("jhbc").toString()); 2704 jhbc += Long.valueOf(t.get("jhbc").toString());
2705 sjbc += Long.valueOf(t.get("sjbc").toString()); 2705 sjbc += Long.valueOf(t.get("sjbc").toString());
@@ -2903,7 +2903,7 @@ public class BigscreenService { @@ -2903,7 +2903,7 @@ public class BigscreenService {
2903 if(yyLine.contains(t.get("lineCode").toString())){ 2903 if(yyLine.contains(t.get("lineCode").toString())){
2904 if(sortMap.get(t.get("gs")) != null){ 2904 if(sortMap.get(t.get("gs")) != null){
2905 Map<String, Object> m = resList.get(sortMap.get(t.get("gs"))); 2905 Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
2906 - mapPut(m, "jhcc", t.get("jhccz").toString()); 2906 + mapPut(m, "jhcc", t.get("jhcc").toString());
2907 mapPut(m, "sjcc", t.get("sjcc").toString()); 2907 mapPut(m, "sjcc", t.get("sjcc").toString());
2908 mapPut(m, "jhbc", t.get("jhbc").toString()); 2908 mapPut(m, "jhbc", t.get("jhbc").toString());
2909 mapPut(m, "sjbc", t.get("sjbc").toString()); 2909 mapPut(m, "sjbc", t.get("sjbc").toString());
@@ -2919,7 +2919,7 @@ public class BigscreenService { @@ -2919,7 +2919,7 @@ public class BigscreenService {
2919 mapPut(m, "sjzgl", t.get("sjzgl").toString()); 2919 mapPut(m, "sjzgl", t.get("sjzgl").toString());
2920 } 2920 }
2921 2921
2922 - mapPut(pjMap, "jhcc", t.get("jhccz").toString()); 2922 + mapPut(pjMap, "jhcc", t.get("jhcc").toString());
2923 mapPut(pjMap, "sjcc", t.get("sjcc").toString()); 2923 mapPut(pjMap, "sjcc", t.get("sjcc").toString());
2924 mapPut(pjMap, "jhbc", t.get("jhbc").toString()); 2924 mapPut(pjMap, "jhbc", t.get("jhbc").toString());
2925 mapPut(pjMap, "sjbc", t.get("sjbc").toString()); 2925 mapPut(pjMap, "sjbc", t.get("sjbc").toString());
@@ -3607,7 +3607,7 @@ public class BigscreenService { @@ -3607,7 +3607,7 @@ public class BigscreenService {
3607 return resList; 3607 return resList;
3608 } 3608 }
3609 3609
3610 - /** 按日期查询出车的早未到情况 */ 3610 + /** 按日期查询出车的早未到情况(人未到) */
3611 @GET 3611 @GET
3612 @Path("/selectData/getNotYet/{date}") 3612 @Path("/selectData/getNotYet/{date}")
3613 public Map<String, Object> getNotYet(@PathParam("date") String date){ 3613 public Map<String, Object> getNotYet(@PathParam("date") String date){
@@ -3669,7 +3669,8 @@ public class BigscreenService { @@ -3669,7 +3669,8 @@ public class BigscreenService {
3669 } 3669 }
3670 3670
3671 for(ScheduleRealInfo s : list_s){ 3671 for(ScheduleRealInfo s : list_s){
3672 - if(!isInOut(s) && !s.isCcService()){ 3672 +// if(!isInOut(s) && !s.isCcService()){
  3673 + if("out".equals(s.getBcType()) && !s.isCcService()){
3673 String[] split = s.getFcsj().split(":"); 3674 String[] split = s.getFcsj().split(":");
3674 Long time = Long.valueOf(split[0]) * 60 + Long.valueOf(split[1]); 3675 Long time = Long.valueOf(split[0]) * 60 + Long.valueOf(split[1]);
3675 String minfcsj = minfcsjMap.get(s.getXlBm())!=null?minfcsjMap.get(s.getXlBm()).toString():"02:00"; 3676 String minfcsj = minfcsjMap.get(s.getXlBm())!=null?minfcsjMap.get(s.getXlBm()).toString():"02:00";