update

娄高锋
1 parent 55edb108
Showing 1 changed file with 18 additions and 11 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -927,7 +927,7 @@ public class BigscreenService {
     @GET
     @Path("/selectData/getCompanyData")
-    public JSONObject getCompanyData(){
+    public List<Map<String, Object>> getCompanyData(){
     	List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
     	String date = sd.format(new Date());
@@ -995,7 +995,7 @@ public class BigscreenService {
     			+ " jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
     			+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-    			+ " jhszfcs,sjszfczds,szfczdl,create_date"
+    			+ " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
     			+ " from bsth_c_calc_count "
     			+ " where date >= '"+date2+"' and date <= '"+date+"'";
@@ -1044,6 +1044,9 @@ public class BigscreenService {
 						m.put("sjszfczds", rs.getString("sjszfczds"));
 						m.put("szfczdl", rs.getString("szfczdl"));
+						m.put("jhzgl", rs.getString("jhzgl"));
+						m.put("sjzgl", rs.getString("sjzgl"));
+						
 						Date date = new Date();
 						date.setTime(rs.getTimestamp("create_date").getTime());
 						m.put("createDate", sdf.format(date));
@@ -1053,17 +1056,21 @@ public class BigscreenService {
     	Map<String, Integer> sortMap = new HashMap<String, Integer>();
-    	sortMap.put("杨高", 1);
-    	sortMap.put("上南", 2);
-    	sortMap.put("金高", 3);
-    	sortMap.put("南汇", 4);
+    	sortMap.put("杨高", 0);
+    	sortMap.put("上南", 1);
+    	sortMap.put("金高", 2);
+    	sortMap.put("南汇", 3);
     	Map<String, Object> ygMap = new HashMap<String, Object>();
-    	Map<String, Object> snMap = new HashMap<String, Object>();
-    	Map<String, Object> jgMap = new HashMap<String, Object>();
-    	Map<String, Object> nhMap = new HashMap<String, Object>();
+    	ygMap.put("gs", "杨高");
     	resList.add(ygMap);
+    	Map<String, Object> snMap = new HashMap<String, Object>();
+    	snMap.put("gs", "上南");
     	resList.add(snMap);
+    	Map<String, Object> jgMap = new HashMap<String, Object>();
+    	jgMap.put("gs", "金高");
     	resList.add(jgMap);
+    	Map<String, Object> nhMap = new HashMap<String, Object>();
+    	nhMap.put("gs", "南汇");
     	resList.add(nhMap);
@@ -1071,7 +1078,7 @@ public class BigscreenService {
     		if(yyLine.contains(t.get("lineCode").toString())){
     			if(sortMap.get(t.get("gs")) != null){
 	    			Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
-	    			if(date.equals(t.get(date).toString())){
+	    			if(date.equals(t.get("date").toString())){
 	    				mapPut(m, "jhcc", t.get("jhccz").toString());
 	    				mapPut(m, "sjcc", t.get("sjcc").toString());
 	    				mapPut(m, "jhbc", t.get("jhbc").toString());
@@ -1113,7 +1120,7 @@ public class BigscreenService {
     				4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
     	}
-    	return JSON.parseObject(JSON.toJSONString(resList));
+    	return resList;
     }
     @GET