潘钊 / control_service_data_Interface · Commits

Commit e20f1eb7b5426d86682c67c8a7c22c86dc4d4aaf

Authored by 娄高锋
1 parent 55edb108
build: skipped

update

Inline Side-by-side
Showing 1 changed file with 18 additions and 11 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @e20f1eb
... ... @@ -927,7 +927,7 @@ public class BigscreenService {
927 927  
928 928 @GET
929 929 @Path("/selectData/getCompanyData")
930   - public JSONObject getCompanyData(){
  930 + public List<Map<String, Object>> getCompanyData(){
931 931 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
932 932  
933 933 String date = sd.format(new Date());
... ... @@ -995,7 +995,7 @@ public class BigscreenService {
995 995 + " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
996 996 + " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
997 997 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
998   - + " jhszfcs,sjszfczds,szfczdl,create_date"
  998 + + " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
999 999 + " from bsth_c_calc_count "
1000 1000 + " where date >= '"+date2+"' and date <= '"+date+"'";
1001 1001  
... ... @@ -1044,6 +1044,9 @@ public class BigscreenService {
1044 1044 m.put("sjszfczds", rs.getString("sjszfczds"));
1045 1045 m.put("szfczdl", rs.getString("szfczdl"));
1046 1046  
  1047 + m.put("jhzgl", rs.getString("jhzgl"));
  1048 + m.put("sjzgl", rs.getString("sjzgl"));
  1049 +
1047 1050 Date date = new Date();
1048 1051 date.setTime(rs.getTimestamp("create_date").getTime());
1049 1052 m.put("createDate", sdf.format(date));
... ... @@ -1053,17 +1056,21 @@ public class BigscreenService {
1053 1056  
1054 1057  
1055 1058 Map<String, Integer> sortMap = new HashMap<String, Integer>();
1056   - sortMap.put("杨高", 1);
1057   - sortMap.put("上南", 2);
1058   - sortMap.put("金高", 3);
1059   - sortMap.put("南汇", 4);
  1059 + sortMap.put("杨高", 0);
  1060 + sortMap.put("上南", 1);
  1061 + sortMap.put("金高", 2);
  1062 + sortMap.put("南汇", 3);
1060 1063 Map<String, Object> ygMap = new HashMap<String, Object>();
1061   - Map<String, Object> snMap = new HashMap<String, Object>();
1062   - Map<String, Object> jgMap = new HashMap<String, Object>();
1063   - Map<String, Object> nhMap = new HashMap<String, Object>();
  1064 + ygMap.put("gs", "杨高");
1064 1065 resList.add(ygMap);
  1066 + Map<String, Object> snMap = new HashMap<String, Object>();
  1067 + snMap.put("gs", "上南");
1065 1068 resList.add(snMap);
  1069 + Map<String, Object> jgMap = new HashMap<String, Object>();
  1070 + jgMap.put("gs", "金高");
1066 1071 resList.add(jgMap);
  1072 + Map<String, Object> nhMap = new HashMap<String, Object>();
  1073 + nhMap.put("gs", "南汇");
1067 1074 resList.add(nhMap);
1068 1075  
1069 1076  
... ... @@ -1071,7 +1078,7 @@ public class BigscreenService {
1071 1078 if(yyLine.contains(t.get("lineCode").toString())){
1072 1079 if(sortMap.get(t.get("gs")) != null){
1073 1080 Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
1074   - if(date.equals(t.get(date).toString())){
  1081 + if(date.equals(t.get("date").toString())){
1075 1082 mapPut(m, "jhcc", t.get("jhccz").toString());
1076 1083 mapPut(m, "sjcc", t.get("sjcc").toString());
1077 1084 mapPut(m, "jhbc", t.get("jhbc").toString());
... ... @@ -1113,7 +1120,7 @@ public class BigscreenService {
1113 1120 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
1114 1121 }
1115 1122  
1116   - return JSON.parseObject(JSON.toJSONString(resList));
  1123 + return resList;
1117 1124 }
1118 1125  
1119 1126 @GET
... ...