潘钊 / control_service_data_Interface · Commits

Commit 090ef0895b5ba09eb6830fda15ae5bcc3f3e27b3

Authored by 王通
2 parents 839bcb4f 9a16686b
build: skipped

Merge branch 'master' of http://192.168.168.201:8888/panzhaov5/control_service_data_Interface

Inline Side-by-side
Showing 2 changed files with 14 additions and 7 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
  View file @090ef08
@@ -1318,7 +1318,8 @@ public class BigdataService { @@ -1318,7 +1318,8 @@ public class BigdataService {
1318 + " from bsth_c_s_sp_info_real r left join bsth_c_cars c on r.cl_zbh = c.inside_code " 1318 + " from bsth_c_s_sp_info_real r left join bsth_c_cars c on r.cl_zbh = c.inside_code "
1319 + " where schedule_date_str >= ? and schedule_date_str <= ? " 1319 + " where schedule_date_str >= ? and schedule_date_str <= ? "
1320 + " and ((adjust_exps like '%肇事%' and status = '-1') " 1320 + " and ((adjust_exps like '%肇事%' and status = '-1') "
1321 - + " or remarks = '肇事' or remarks like '%;肇事%' or remarks like '%肇事;%') " 1321 + + " or remarks = '肇事' or remarks like '%;肇事%' or remarks like '%肇事;%'"
  1322 + + " or remarks like '%肇事,%') "
1322 + " order by real_exec_date, schedule_date_str, fcsj"; 1323 + " order by real_exec_date, schedule_date_str, fcsj";
1323 1324
1324 List<Map<String, Object>> list=(List<Map<String, Object>>) jdbcTemplate.query(sql, 1325 List<Map<String, Object>> list=(List<Map<String, Object>>) jdbcTemplate.query(sql,
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @090ef08
@@ -369,7 +369,8 @@ public class BigscreenService { @@ -369,7 +369,8 @@ public class BigscreenService {
369 sjsmbc += Long.valueOf(t.get("sjsmbczds").toString()); 369 sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
370 jhqqbc += Long.valueOf(t.get("jhszfcs").toString()); 370 jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
371 sjqqzd += Long.valueOf(t.get("sjszfczds").toString()); 371 sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
372 - bcs_qk += Long.valueOf(t.get("jhbc").toString()); 372 +// bcs_qk += Long.valueOf(t.get("jhbc").toString());
  373 + bcs_qk += Long.valueOf(t.get("sjbc").toString());
373 if(gpSet.contains(t.get("lineCode").toString())){ 374 if(gpSet.contains(t.get("lineCode").toString())){
374 jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString()); 375 jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
375 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString()); 376 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
@@ -421,7 +422,8 @@ public class BigscreenService { @@ -421,7 +422,8 @@ public class BigscreenService {
421 smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString())); 422 smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
422 qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); 423 qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
423 qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); 424 qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
424 - qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString())); 425 +// qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
  426 + qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("sjbc").toString()));
425 if(gpSet.contains(t.get("lineCode").toString())){ 427 if(gpSet.contains(t.get("lineCode").toString())){
426 gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); 428 gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
427 gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); 429 gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
@@ -807,7 +809,8 @@ public class BigscreenService { @@ -807,7 +809,8 @@ public class BigscreenService {
807 sjsmbc += Long.valueOf(t.get("sjsmbczds").toString()); 809 sjsmbc += Long.valueOf(t.get("sjsmbczds").toString());
808 jhqqbc += Long.valueOf(t.get("jhszfcs").toString()); 810 jhqqbc += Long.valueOf(t.get("jhszfcs").toString());
809 sjqqzd += Long.valueOf(t.get("sjszfczds").toString()); 811 sjqqzd += Long.valueOf(t.get("sjszfczds").toString());
810 - bcs_qk += Long.valueOf(t.get("jhbc").toString()); 812 +// bcs_qk += Long.valueOf(t.get("jhbc").toString());
  813 + bcs_qk += Long.valueOf(t.get("sjbc").toString());
811 if(gpSet.contains(t.get("lineCode").toString())){ 814 if(gpSet.contains(t.get("lineCode").toString())){
812 jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString()); 815 jhgpqqbc += Long.valueOf(t.get("jhszfcs").toString());
813 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString()); 816 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
@@ -859,7 +862,8 @@ public class BigscreenService { @@ -859,7 +862,8 @@ public class BigscreenService {
859 smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString())); 862 smMap.put("sj", Long.valueOf(smMap.get("sj").toString()) + Long.valueOf(t.get("sjsmbczds").toString()));
860 qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); 863 qqMap.put("jh", Long.valueOf(qqMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
861 qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); 864 qqMap.put("sj", Long.valueOf(qqMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
862 - qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString())); 865 +// qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
  866 + qkMap.put("jh", Long.valueOf(qkMap.get("jh").toString()) + Long.valueOf(t.get("sjbc").toString()));
863 if(gpSet.contains(t.get("lineCode").toString())){ 867 if(gpSet.contains(t.get("lineCode").toString())){
864 gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString())); 868 gpMap.put("jh", Long.valueOf(gpMap.get("jh").toString()) + Long.valueOf(t.get("jhszfcs").toString()));
865 gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString())); 869 gpMap.put("sj", Long.valueOf(gpMap.get("sj").toString()) + Long.valueOf(t.get("sjszfczds").toString()));
@@ -2164,7 +2168,8 @@ public class BigscreenService { @@ -2164,7 +2168,8 @@ public class BigscreenService {
2164 mapPut(m, "sjsmbc", t.get("sjsmbczds").toString()); 2168 mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
2165 mapPut(m, "jhqqbc", t.get("jhszfcs").toString()); 2169 mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
2166 mapPut(m, "sjqqzd", t.get("sjszfczds").toString()); 2170 mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
2167 - mapPut(m, "bcs", t.get("jhbc").toString()); 2171 +// mapPut(m, "bcs", t.get("jhbc").toString());
  2172 + mapPut(m, "bcs", t.get("sjbc").toString());
2168 if(gpSet.contains(t.get("lineCode").toString())){ 2173 if(gpSet.contains(t.get("lineCode").toString())){
2169 mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString()); 2174 mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
2170 mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString()); 2175 mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
@@ -2181,7 +2186,8 @@ public class BigscreenService { @@ -2181,7 +2186,8 @@ public class BigscreenService {
2181 mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString()); 2186 mapPut(pjMap, "sjsmbc", t.get("sjsmbczds").toString());
2182 mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString()); 2187 mapPut(pjMap, "jhqqbc", t.get("jhszfcs").toString());
2183 mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString()); 2188 mapPut(pjMap, "sjqqzd", t.get("sjszfczds").toString());
2184 - mapPut(pjMap, "bcs", t.get("jhbc").toString()); 2189 +// mapPut(pjMap, "bcs", t.get("jhbc").toString());
  2190 + mapPut(pjMap, "bcs", t.get("sjbc").toString());
2185 if(gpSet.contains(t.get("lineCode").toString())){ 2191 if(gpSet.contains(t.get("lineCode").toString())){
2186 mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString()); 2192 mapPut(pjMap, "jhgpqqbc", t.get("jhszfcs").toString());
2187 mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString()); 2193 mapPut(pjMap, "sjgpqqzd", t.get("sjszfczds").toString());