百公里能耗接口增加总能耗与总公里字段

娄高锋
1 parent 15d1a154
Showing 1 changed file with 54 additions and 0 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -3640,6 +3640,45 @@ public class BigscreenService {
 					}
 				});
+    	String sql="select xl, xl_name, sjyylc, sjkslc, sjzgl "
+				+ " from bsth_c_calc_count "
+				+ " where date >= ? and date <= ? ";
+		
+		List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date1, date2},
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+
+						m.put("lineCode", rs.getString("xl"));
+						m.put("lineName", rs.getString("xl_name"));
+						
+						m.put("sjyylc", rs.getString("sjyylc"));
+						m.put("sjkslc", rs.getString("sjkslc"));
+						m.put("sjzgl", rs.getString("sjzgl"));
+						
+						return m;
+					}
+				});
+		
+		String yyxlSql="SELECT line_code from bsth_c_line "
+				+ " where nature in ('yxl','cgxl','gjxl','csbs','cctxl')";
+    	List<Map<String, Object>> yyxlList=jdbcTemplate.query(yyxlSql,
+				new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m=new HashMap<String,Object>();
+						m.put("lineCode", rs.getString("line_code"));
+						return m;
+					}
+				});
+		Set<String> yyLine = new HashSet<String>();
+		for(Map<String, Object> t : yyxlList){
+			if(t.get("lineCode") != null){
+				yyLine.add(t.get("lineCode").toString());
+			}
+		}
+    	
     	BigDecimal yh = new BigDecimal(0), yh_zlc = new BigDecimal(0),
     				hd = new BigDecimal(0), hd_zlc = new BigDecimal(0),
     				hn = new BigDecimal(0), hn_zlc = new BigDecimal(0);
@@ -3657,6 +3696,15 @@ public class BigscreenService {
     		hn = hn.add(new BigDecimal(m.get("hn").toString()));
     		hn_zlc = hn_zlc.add(new BigDecimal(m.get("zlc").toString()));
     	}
+    	
+    	BigDecimal yygl = new BigDecimal(0), ksgl = new BigDecimal(0), zgl = new BigDecimal(0);
+    	for(Map<String, Object> m : list){
+    		if(yyLine.contains(m.get("lineCode").toString())){
+	    		yygl = yygl.add(new BigDecimal(m.get("sjyylc").toString()));
+	    		ksgl = ksgl.add(new BigDecimal(m.get("sjkslc").toString()));
+	    		zgl = zgl.add(new BigDecimal(m.get("sjzgl").toString()));
+    		}
+    	}
     	if(yh_zlc.compareTo(new BigDecimal(0)) > 0){
     		resMap.put("oil", yh.divide(yh_zlc, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue());
@@ -3674,6 +3722,12 @@ public class BigscreenService {
     		resMap.put("hydrogen", 0);
     	}
+    	resMap.put("oilSum", yh.doubleValue());
+    	resMap.put("electricitySum", hd.doubleValue());
+    	resMap.put("hydrogenSum", hn.doubleValue());
+    	resMap.put("realMileageSum", zgl.doubleValue());
+    	resMap.put("realMileageService", yygl.doubleValue());
+    	resMap.put("realMileageEmpty", ksgl.doubleValue());
 		return resMap;