百公里能耗接口计算规则更新，根据车辆类型分别计算三种能源车的加注量与公里数，当天无加注的车辆里程也要计算。

娄高锋
1 parent 83c27b51
Showing 1 changed file with 57 additions and 12 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -3601,39 +3601,75 @@ public class BigscreenService {
 		String date1 = dateFormat.format(m1);
 		String date2 = dateFormat.format(m2);
-		String ylbSql="SELECT yh, zlc from bsth_c_ylb where rq >= ? and rq <= ? "
-				+ " and yh is not null and yh > 0 and zlc is not null and zlc > 0 ";
+		String carSql="SELECT inside_code, sfdc, sfmix, hydrogen from bsth_c_cars ";
+		List<Map<String, Object>> carList=jdbcTemplate.query(carSql,
+				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("nbbm", rs.getString("inside_code")!=null?rs.getString("inside_code"):"");
+				m.put("sfdc", rs.getString("sfdc")!=null?rs.getString("sfdc"):0);
+				m.put("sfmix", rs.getString("sfmix")!=null?rs.getString("sfmix"):0);
+				m.put("hydrogen", rs.getString("hydrogen")!=null?rs.getString("hydrogen"):0);
+				return m;
+			}
+		});
+		Set<String> oilCar = new HashSet<String>();
+		Set<String> electricCar = new HashSet<String>();
+		Set<String> hydrogenCar = new HashSet<String>();
+		for(Map<String, Object> m : carList){
+			String nbbm = m.get("nbbm").toString();
+			String sfdc = m.get("sfdc").toString();
+			String sfmix = m.get("sfmix").toString();
+			String hydrogen = m.get("hydrogen").toString();
+			if("1".equals(hydrogen)){
+				hydrogenCar.add(nbbm);
+				if("1".equals(sfmix) || "1".equals(sfdc)){
+					electricCar.add(nbbm);
+				}
+			} else if("1".equals(sfdc)){
+				electricCar.add(nbbm);
+				if("1".equals(sfmix)){
+					oilCar.add(nbbm);
+				}
+			} else {
+				oilCar.add(nbbm);
+			}
+		}
+		
+		String ylbSql="SELECT nbbm, IFNULL(yh, 0) yh, IFNULL(zlc, 0) zlc from bsth_c_ylb where rq >= ? and rq <= ? ";
     	List<Map<String, Object>> ylbList=jdbcTemplate.query(ylbSql, 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("nbbm", rs.getString("nbbm"));
 						m.put("yh", rs.getString("yh"));
 						m.put("zlc", rs.getString("zlc"));
 						return m;
 					}
 				});
-    	String dlbSql="SELECT hd, zlc from bsth_c_dlb where rq >= ? and rq <= ? "
-				+ " and hd is not null and hd > 0 and zlc is not null and zlc > 0 ";
+    	String dlbSql="SELECT nbbm, IFNULL(hd, 0) hd, IFNULL(zlc, 0) zlc from bsth_c_dlb where rq >= ? and rq <= ? ";
     	List<Map<String, Object>> dlbList=jdbcTemplate.query(dlbSql, 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("nbbm", rs.getString("nbbm"));
 						m.put("hd", rs.getString("hd"));
 						m.put("zlc", rs.getString("zlc"));
 						return m;
 					}
 				});
-    	String qlbSql="SELECT hn, zlc from bsth_c_qlb where rq >= ? and rq <= ? "
-				+ " and hn is not null and hn > 0 and zlc is not null and zlc > 0 ";
+    	String qlbSql="SELECT nbbm, IFNULL(hn, 0) hn, IFNULL(zlc, 0) zlc from bsth_c_qlb where rq >= ? and rq <= ? ";
     	List<Map<String, Object>> qlbList=jdbcTemplate.query(qlbSql, 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("nbbm", rs.getString("nbbm"));
 						m.put("hn", rs.getString("hn"));
 						m.put("zlc", rs.getString("zlc"));
 						return m;
@@ -3683,18 +3719,27 @@ public class BigscreenService {
     				hd = new BigDecimal(0), hd_zlc = new BigDecimal(0),
     				hn = new BigDecimal(0), hn_zlc = new BigDecimal(0);
     	for(Map<String, Object> m : ylbList){
-    		yh = yh.add(new BigDecimal(m.get("yh").toString()));
-    		yh_zlc = yh_zlc.add(new BigDecimal(m.get("zlc").toString()));
+    		String nbbm = m.get("nbbm").toString();
+    		if(oilCar.contains(nbbm)){
+        		yh = yh.add(new BigDecimal(m.get("yh").toString()));
+        		yh_zlc = yh_zlc.add(new BigDecimal(m.get("zlc").toString()));
+    		}
     	}
     	for(Map<String, Object> m : dlbList){
-    		hd = hd.add(new BigDecimal(m.get("hd").toString()));
-    		hd_zlc = hd_zlc.add(new BigDecimal(m.get("zlc").toString()));
+    		String nbbm = m.get("nbbm").toString();
+    		if(electricCar.contains(nbbm)){
+	    		hd = hd.add(new BigDecimal(m.get("hd").toString()));
+	    		hd_zlc = hd_zlc.add(new BigDecimal(m.get("zlc").toString()));
+    		}
     	}
     	for(Map<String, Object> m : qlbList){
-    		hn = hn.add(new BigDecimal(m.get("hn").toString()));
-    		hn_zlc = hn_zlc.add(new BigDecimal(m.get("zlc").toString()));
+    		String nbbm = m.get("nbbm").toString();
+    		if(hydrogenCar.contains(nbbm)){
+	    		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);