潘钊 / control_service_data_Interface · Commits

Commit edc8ae4973d19f78c66fee353f877759f798b2df

Authored by 王通
2 parents 09ba3d3d 686187b9
build: skipped

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @edc8ae4
... ... @@ -1981,6 +1981,7 @@ public class BigscreenService {
1981 1981 mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
1982 1982 mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
1983 1983 mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
  1984 + mapPut(m, "bcs", t.get("jhbc").toString());
1984 1985 if(gpSet.contains(t.get("lineCode").toString())){
1985 1986 mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
1986 1987 mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
... ... @@ -1997,6 +1998,7 @@ public class BigscreenService {
1997 1998 mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString());
1998 1999 mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString());
1999 2000 mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString());
  2001 + mapPut(pjMap, "bcs", t.get("jhbc").toString());
2000 2002 if(gpSet.contains(t.get("lineCode").toString())){
2001 2003 mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString());
2002 2004 mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString());
... ... @@ -2010,13 +2012,13 @@ public class BigscreenService {
2010 2012 if(yyLine.contains(t.get("lineCode").toString())){
2011 2013 if(sortMap.get(t.get("gs")) != null){
2012 2014 Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
2013   - mapPut(m, "bcs", t.get("bcs").toString());
  2015 +// mapPut(m, "bcs", t.get("bcs").toString());
2014 2016 mapPut(m, "qks", t.get("qks").toString());
2015 2017 // mapPut(m, "rkgzs", t.get("rkgzs").toString());
2016 2018 // mapPut(m, "ckgzs", t.get("ckgzs").toString());
2017 2019 }
2018 2020  
2019   - mapPut(pjMap, "bcs", t.get("bcs").toString());
  2021 +// mapPut(pjMap, "bcs", t.get("bcs").toString());
2020 2022 mapPut(pjMap, "qks", t.get("qks").toString());
2021 2023 // mapPut(pjMap, "rkgzs", t.get("rkgzs").toString());
2022 2024 // mapPut(pjMap, "ckgzs", t.get("ckgzs").toString());
... ...