潘钊 / control_service_data_Interface · Commits

Commit c4af1f7e8185071f7b56c861a7a7e8f8227d98da

Authored by 娄高锋
1 parent c75f40dd
build: skipped

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

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
  View file @c4af1f7
... ... @@ -1577,7 +1577,7 @@ public class BigdataService {
1577 1577 return list;
1578 1578 }
1579 1579  
1580   - //单日每车加油加电
  1580 + //单日每车油耗电耗
1581 1581 @GET
1582 1582 @Path("/findCarEnergySupplement/{date}")
1583 1583 public Map<String, Object> findWaybill(@PathParam("date") String date) {
... ... @@ -1585,7 +1585,7 @@ public class BigdataService {
1585 1585  
1586 1586 date = date + " 00:00:00";
1587 1587  
1588   - String ylbSql = "select nbbm, sum(jzl) jzl from bsth_c_ylb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
  1588 + String ylbSql = "select nbbm, sum(yh) yh from bsth_c_ylb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
1589 1589 List<Map<String, Object>> ylbList=jdbcTemplate.query(ylbSql,
1590 1590 new Object[] {date},
1591 1591 new RowMapper<Map<String, Object>>(){
... ... @@ -1593,12 +1593,12 @@ public class BigdataService {
1593 1593 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
1594 1594 Map<String, Object> m=new HashMap<String,Object>();
1595 1595 m.put("car", rs.getString("nbbm"));
1596   - m.put("liters", new BigDecimal(rs.getDouble("jzl")).setScale(2, RoundingMode.HALF_UP));
  1596 + m.put("liters", new BigDecimal(rs.getDouble("yh")).setScale(2, RoundingMode.HALF_UP));
1597 1597 return m;
1598 1598 }
1599 1599 });
1600 1600  
1601   - String dlbSql = "select nbbm, sum(cdl) cdl from bsth_c_dlb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
  1601 + String dlbSql = "select nbbm, sum(hd) hd from bsth_c_dlb where rq = str_to_date(?, '%Y-%m-%d') group by nbbm";
1602 1602 List<Map<String, Object>> dlbList=jdbcTemplate.query(dlbSql,
1603 1603 new Object[] {date},
1604 1604 new RowMapper<Map<String, Object>>(){
... ... @@ -1606,7 +1606,7 @@ public class BigdataService {
1606 1606 public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
1607 1607 Map<String, Object> m=new HashMap<String,Object>();
1608 1608 m.put("car", rs.getString("nbbm"));
1609   - m.put("degrees", new BigDecimal(rs.getDouble("cdl")).setScale(2, RoundingMode.HALF_UP));
  1609 + m.put("degrees", new BigDecimal(rs.getDouble("hd")).setScale(2, RoundingMode.HALF_UP));
1610 1610 return m;
1611 1611 }
1612 1612 });
... ...