单日每车加油加电接口改成单日每车油耗电耗

娄高锋
1 parent c75f40dd
Showing 1 changed file with 5 additions and 5 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
@@ -1577,7 +1577,7 @@ public class BigdataService {
     	return list;
     }
-    //单日每车加油加电
+    //单日每车油耗电耗
     @GET
     @Path("/findCarEnergySupplement/{date}")
     public Map<String, Object> findWaybill(@PathParam("date") String date) {
@@ -1585,7 +1585,7 @@ public class BigdataService {
     	date = date + " 00:00:00";
-    	String ylbSql = "select nbbm, sum(jzl) jzl from bsth_c_ylb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
+    	String ylbSql = "select nbbm, sum(yh) yh from bsth_c_ylb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
     	List<Map<String, Object>> ylbList=jdbcTemplate.query(ylbSql,
     			new Object[] {date},
 				new RowMapper<Map<String, Object>>(){
@@ -1593,12 +1593,12 @@ public class BigdataService {
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("car", rs.getString("nbbm"));
-						m.put("liters", new BigDecimal(rs.getDouble("jzl")).setScale(2, RoundingMode.HALF_UP));
+						m.put("liters", new BigDecimal(rs.getDouble("yh")).setScale(2, RoundingMode.HALF_UP));
 						return m;
 					}
 				});
-    	String dlbSql = "select nbbm, sum(cdl) cdl from bsth_c_dlb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
+    	String dlbSql = "select nbbm, sum(hd) hd from bsth_c_dlb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
     	List<Map<String, Object>> dlbList=jdbcTemplate.query(dlbSql,
     			new Object[] {date},
 				new RowMapper<Map<String, Object>>(){
@@ -1606,7 +1606,7 @@ public class BigdataService {
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("car", rs.getString("nbbm"));
-						m.put("degrees", new BigDecimal(rs.getDouble("cdl")).setScale(2, RoundingMode.HALF_UP));
+						m.put("degrees", new BigDecimal(rs.getDouble("hd")).setScale(2, RoundingMode.HALF_UP));
 						return m;
 					}
 				});