潘钊 / control_service_data_Interface · Commits

Commit 4e7fc07ec8b6d047736cbdee78ed85c0a26581cd

Authored by 娄高锋
1 parent 55504e0a
build: skipped

接口加线路出车详情

Inline Side-by-side
Showing 1 changed file with 45 additions and 24 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @4e7fc07
... ... @@ -259,7 +259,7 @@ public class BigscreenService {
259 259 }
260 260  
261 261  
262   - String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
  262 + String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,"
263 263 + " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
264 264 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
265 265 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
... ... @@ -284,7 +284,6 @@ public class BigscreenService {
284 284 m.put("jhcc", rs.getString("jhcc"));
285 285 m.put("sjcc", rs.getString("sjcc"));
286 286 m.put("ccl", rs.getString("ccl"));
287   - m.put("jhccz", rs.getString("jhccz"));
288 287  
289 288 m.put("jhyylc", rs.getString("jhyylc"));
290 289 m.put("sjyylc", rs.getString("sjyylc"));
... ... @@ -317,7 +316,8 @@ public class BigscreenService {
317 316 return m;
318 317 }
319 318 });
320   -
  319 +
  320 + List<Map<String, Object>> ccDetail = new ArrayList<Map<String,Object>>();
321 321 List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
322 322 List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
323 323 List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
... ... @@ -342,7 +342,7 @@ public class BigscreenService {
342 342 sjbcs_z += Long.valueOf(t.get("sjbc").toString());
343 343 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
344 344  
345   - jhcc += Long.valueOf(t.get("jhccz").toString());
  345 + jhcc += Long.valueOf(t.get("jhcc").toString());
346 346 sjcc += Long.valueOf(t.get("sjcc").toString());
347 347 jhbc += Long.valueOf(t.get("jhbc").toString());
348 348 sjbc += Long.valueOf(t.get("sjbc").toString());
... ... @@ -355,6 +355,13 @@ public class BigscreenService {
355 355 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
356 356 }
357 357  
  358 + Map<String, Object> cc = new HashMap<String, Object>();
  359 + cc.put("type", "线路出车详情");
  360 + cc.put("lineName", t.get("lineName").toString());
  361 + cc.put("jh", t.get("jhcc").toString());
  362 + cc.put("sj", t.get("sjcc").toString());
  363 + ccDetail.add(cc);
  364 +
358 365 Map<String, Object> bc = new HashMap<String, Object>();
359 366 bc.put("type", "班次执行详情");
360 367 bc.put("lineName", t.get("lineName").toString());
... ... @@ -392,7 +399,7 @@ public class BigscreenService {
392 399 Map<String, Object> qqMap = qqList.get(datesMap.get(d));
393 400 Map<String, Object> gpMap = gpList.get(datesMap.get(d));
394 401  
395   - ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
  402 + ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhcc").toString()));
396 403 ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
397 404 bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
398 405 bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
... ... @@ -447,6 +454,7 @@ public class BigscreenService {
447 454 zxlList.addAll(qkList);
448 455  
449 456 List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
  457 + detailsList.addAll(ccDetail);
450 458 detailsList.addAll(bcDetail);
451 459 detailsList.addAll(smDetail);
452 460 detailsList.addAll(qqDetail);
... ... @@ -692,7 +700,7 @@ public class BigscreenService {
692 700 }
693 701  
694 702  
695   - String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
  703 + String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,"
696 704 + " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
697 705 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
698 706 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
... ... @@ -717,7 +725,6 @@ public class BigscreenService {
717 725 m.put("jhcc", rs.getString("jhcc"));
718 726 m.put("sjcc", rs.getString("sjcc"));
719 727 m.put("ccl", rs.getString("ccl"));
720   - m.put("jhccz", rs.getString("jhccz"));
721 728  
722 729 m.put("jhyylc", rs.getString("jhyylc"));
723 730 m.put("sjyylc", rs.getString("sjyylc"));
... ... @@ -750,7 +757,8 @@ public class BigscreenService {
750 757 return m;
751 758 }
752 759 });
753   -
  760 +
  761 + List<Map<String, Object>> ccDetail = new ArrayList<Map<String,Object>>();
754 762 List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
755 763 List<Map<String, Object>> smDetail = new ArrayList<Map<String,Object>>();
756 764 List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
... ... @@ -775,7 +783,7 @@ public class BigscreenService {
775 783 sjbcs_z += Long.valueOf(t.get("sjbc").toString());
776 784 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
777 785  
778   - jhcc += Long.valueOf(t.get("jhccz").toString());
  786 + jhcc += Long.valueOf(t.get("jhcc").toString());
779 787 sjcc += Long.valueOf(t.get("sjcc").toString());
780 788 jhbc += Long.valueOf(t.get("jhbc").toString());
781 789 sjbc += Long.valueOf(t.get("sjbc").toString());
... ... @@ -788,6 +796,13 @@ public class BigscreenService {
788 796 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
789 797 }
790 798  
  799 + Map<String, Object> cc = new HashMap<String, Object>();
  800 + cc.put("type", "线路出车详情");
  801 + cc.put("lineName", t.get("lineName").toString());
  802 + cc.put("jh", t.get("jhcc").toString());
  803 + cc.put("sj", t.get("sjcc").toString());
  804 + ccDetail.add(cc);
  805 +
791 806 Map<String, Object> bc = new HashMap<String, Object>();
792 807 bc.put("type", "班次执行详情");
793 808 bc.put("lineName", t.get("lineName").toString());
... ... @@ -825,7 +840,7 @@ public class BigscreenService {
825 840 Map<String, Object> qqMap = qqList.get(datesMap.get(d));
826 841 Map<String, Object> gpMap = gpList.get(datesMap.get(d));
827 842  
828   - ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhccz").toString()));
  843 + ccMap.put("jh", Long.valueOf(ccMap.get("jh").toString()) + Long.valueOf(t.get("jhcc").toString()));
829 844 ccMap.put("sj", Long.valueOf(ccMap.get("sj").toString()) + Long.valueOf(t.get("sjcc").toString()));
830 845 bcMap.put("jh", Long.valueOf(bcMap.get("jh").toString()) + Long.valueOf(t.get("jhbc").toString()));
831 846 bcMap.put("sj", Long.valueOf(bcMap.get("sj").toString()) + Long.valueOf(t.get("sjbc").toString()));
... ... @@ -883,6 +898,7 @@ public class BigscreenService {
883 898 zxlList.addAll(qkList);
884 899  
885 900 List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
  901 + detailsList.addAll(ccDetail);
886 902 detailsList.addAll(bcDetail);
887 903 detailsList.addAll(smDetail);
888 904 detailsList.addAll(qqDetail);
... ... @@ -1071,7 +1087,7 @@ public class BigscreenService {
1071 1087 }
1072 1088 }
1073 1089  
1074   - String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
  1090 + String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,"
1075 1091 + " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
1076 1092 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
1077 1093 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
... ... @@ -1096,7 +1112,6 @@ public class BigscreenService {
1096 1112 m.put("jhcc", rs.getString("jhcc"));
1097 1113 m.put("sjcc", rs.getString("sjcc"));
1098 1114 m.put("ccl", rs.getString("ccl"));
1099   - m.put("jhccz", rs.getString("jhccz"));
1100 1115  
1101 1116 m.put("jhyylc", rs.getString("jhyylc"));
1102 1117 m.put("sjyylc", rs.getString("sjyylc"));
... ... @@ -1129,7 +1144,8 @@ public class BigscreenService {
1129 1144 return m;
1130 1145 }
1131 1146 });
1132   -
  1147 +
  1148 + List<Map<String, Object>> ccDetail = new ArrayList<Map<String,Object>>();
1133 1149 List<Map<String, Object>> bcDetail = new ArrayList<Map<String,Object>>();
1134 1150 List<Map<String, Object>> qqDetail = new ArrayList<Map<String,Object>>();
1135 1151 List<Map<String, Object>> gpDetail = new ArrayList<Map<String,Object>>();
... ... @@ -1144,7 +1160,7 @@ public class BigscreenService {
1144 1160 sjbcs_z += Long.valueOf(t.get("sjbc").toString());
1145 1161 yygl_z = yygl_z.add(new BigDecimal(t.get("sjyylc").toString()));
1146 1162  
1147   - jhcc += Long.valueOf(t.get("jhccz").toString());
  1163 + jhcc += Long.valueOf(t.get("jhcc").toString());
1148 1164 sjcc += Long.valueOf(t.get("sjcc").toString());
1149 1165 jhbc += Long.valueOf(t.get("jhbc").toString());
1150 1166 sjbc += Long.valueOf(t.get("sjbc").toString());
... ... @@ -1157,6 +1173,13 @@ public class BigscreenService {
1157 1173 sjgpqqzd += Long.valueOf(t.get("sjszfczds").toString());
1158 1174 }
1159 1175  
  1176 + Map<String, Object> cc = new HashMap<String, Object>();
  1177 + cc.put("type", "线路出车详情");
  1178 + cc.put("lineName", t.get("lineName").toString());
  1179 + cc.put("jh", t.get("jhcc").toString());
  1180 + cc.put("sj", t.get("sjcc").toString());
  1181 + ccDetail.add(cc);
  1182 +
1160 1183 Map<String, Object> bc = new HashMap<String, Object>();
1161 1184 bc.put("type", "班次执行详情");
1162 1185 bc.put("lineName", t.get("lineName").toString());
... ... @@ -1183,6 +1206,7 @@ public class BigscreenService {
1183 1206 }
1184 1207  
1185 1208 List<Map<String, Object>> detailsList = new ArrayList<Map<String, Object>>();
  1209 + detailsList.addAll(ccDetail);
1186 1210 detailsList.addAll(bcDetail);
1187 1211 detailsList.addAll(qqDetail);
1188 1212 detailsList.addAll(gpDetail);
... ... @@ -1742,7 +1766,7 @@ public class BigscreenService {
1742 1766 }
1743 1767  
1744 1768  
1745   - String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
  1769 + String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,"
1746 1770 + " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
1747 1771 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
1748 1772 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
... ... @@ -1767,7 +1791,6 @@ public class BigscreenService {
1767 1791 m.put("jhcc", rs.getString("jhcc"));
1768 1792 m.put("sjcc", rs.getString("sjcc"));
1769 1793 m.put("ccl", rs.getString("ccl"));
1770   - m.put("jhccz", rs.getString("jhccz"));
1771 1794  
1772 1795 m.put("jhyylc", rs.getString("jhyylc"));
1773 1796 m.put("sjyylc", rs.getString("sjyylc"));
... ... @@ -1815,7 +1838,7 @@ public class BigscreenService {
1815 1838 jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
1816 1839 sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
1817 1840  
1818   - jhcc += Long.valueOf(t.get("jhccz").toString());
  1841 + jhcc += Long.valueOf(t.get("jhcc").toString());
1819 1842 sjcc += Long.valueOf(t.get("sjcc").toString());
1820 1843 jhbc += Long.valueOf(t.get("jhbc").toString());
1821 1844 sjbc += Long.valueOf(t.get("sjbc").toString());
... ... @@ -1907,7 +1930,7 @@ public class BigscreenService {
1907 1930 }
1908 1931  
1909 1932  
1910   - String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,jhccz,"
  1933 + String sql="select xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,jhcc,sjcc,ccl,"
1911 1934 + " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
1912 1935 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
1913 1936 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
... ... @@ -1933,7 +1956,6 @@ public class BigscreenService {
1933 1956 m.put("jhcc", rs.getString("jhcc"));
1934 1957 m.put("sjcc", rs.getString("sjcc"));
1935 1958 m.put("ccl", rs.getString("ccl"));
1936   - m.put("jhccz", rs.getString("jhccz"));
1937 1959  
1938 1960 m.put("jhyylc", rs.getString("jhyylc"));
1939 1961 m.put("sjyylc", rs.getString("sjyylc"));
... ... @@ -1981,7 +2003,7 @@ public class BigscreenService {
1981 2003 jhzgl = jhzgl.add(new BigDecimal(t.get("jhzgl").toString()));
1982 2004 sjzgl = sjzgl.add(new BigDecimal(t.get("sjzgl").toString()));
1983 2005  
1984   - jhcc += Long.valueOf(t.get("jhccz").toString());
  2006 + jhcc += Long.valueOf(t.get("jhcc").toString());
1985 2007 sjcc += Long.valueOf(t.get("sjcc").toString());
1986 2008 jhbc += Long.valueOf(t.get("jhbc").toString());
1987 2009 sjbc += Long.valueOf(t.get("sjbc").toString());
... ... @@ -2095,7 +2117,7 @@ public class BigscreenService {
2095 2117  
2096 2118  
2097 2119 String sql="select gsdm,fgsdm,xl,xl_name,date,jhbc,bczxl,jhbcz,sjbc,"
2098   - + " jhcc,sjcc,ccl,jhccz,jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
  2120 + + " jhcc,sjcc,ccl,jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
2099 2121 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
2100 2122 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
2101 2123 + " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
... ... @@ -2122,7 +2144,6 @@ public class BigscreenService {
2122 2144 m.put("jhcc", rs.getString("jhcc"));
2123 2145 m.put("sjcc", rs.getString("sjcc"));
2124 2146 m.put("ccl", rs.getString("ccl"));
2125   - m.put("jhccz", rs.getString("jhccz"));
2126 2147  
2127 2148 m.put("jhyylc", rs.getString("jhyylc"));
2128 2149 m.put("sjyylc", rs.getString("sjyylc"));
... ... @@ -2209,7 +2230,7 @@ public class BigscreenService {
2209 2230 && "77".equals(t.get("gsdm").toString())){
2210 2231 if(sortMap.get(t.get("fgs")) != null){
2211 2232 Map<String, Object> m = resList.get(sortMap.get(t.get("fgs")));
2212   - mapPut(m, "jhcc", t.get("jhccz").toString());
  2233 + mapPut(m, "jhcc", t.get("jhcc").toString());
2213 2234 mapPut(m, "sjcc", t.get("sjcc").toString());
2214 2235 mapPut(m, "jhbc", t.get("jhbc").toString());
2215 2236 mapPut(m, "sjbc", t.get("sjbc").toString());
... ... @@ -2225,7 +2246,7 @@ public class BigscreenService {
2225 2246 mapPut(m, "sjzgl", t.get("sjzgl").toString());
2226 2247 }
2227 2248  
2228   - mapPut(lgMap, "jhcc", t.get("jhccz").toString());
  2249 + mapPut(lgMap, "jhcc", t.get("jhcc").toString());
2229 2250 mapPut(lgMap, "sjcc", t.get("sjcc").toString());
2230 2251 mapPut(lgMap, "jhbc", t.get("jhbc").toString());
2231 2252 mapPut(lgMap, "sjbc", t.get("sjbc").toString());
... ...