能耗管理--运行费用排名 修改接口

src/main/java/org/rcisoft/business/overview/controller/OverViewController.java

 package org.rcisoft.business.overview.controller;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * Created by JiChao on 2018/4/11.
  * 概览接口
  */
+@Api(tags = "能耗管理")
 @RestController
 @RequestMapping("overview")
 public class OverViewController {
@@ -61,12 +63,11 @@ public class OverViewController {
 
     @ApiOperation(value="运行费用排名", notes="运行费用排名")
     @ApiImplicitParams({@ApiImplicitParam(name = "proId", value = "项目类型主键", required = true, dataType = "字符串"),
-            @ApiImplicitParam(name = "type", value = "水电气类型，1：水，2：电，3：气", required = true, dataType = "数字"),
             @ApiImplicitParam(name = "date", value = "0：今日，-1：昨日，1：明日", required = true, dataType = "数字")
     })
     @RequestMapping("/getPriceRank")
-    public Result getPriceRank(@RequestParam String proId, @RequestParam Integer type, @RequestParam Integer date) {
-        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, overViewServiceImpl.getPriceRank(proId, type, date));
+    public Result getPriceRank(@RequestParam String proId, @RequestParam Integer date) {
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, overViewServiceImpl.getPriceRank(proId, date));
     }
 
     /** -------------用能比较--------------- */

src/main/java/org/rcisoft/business/overview/dao/EnergyCountMRepository.java

@@ -79,10 +79,8 @@ public interface EnergyCountMRepository extends BaseMapper<EnergyCountM> {
      */
     @Select("<script>select a.* from (" +
             "select e.`DAY`," +
-            "<if test=\"type == 1\">sum(e.WATER_MONEY)</if>" +
-            "<if test=\"type == 2\">sum(e.ELEC_MONEY)</if>" +
-            "<if test=\"type == 3\">sum(e.GAS_MONEY)</if>" +
-            " as MONEY from energy_count_m e where e.PRO_ID=#{proId} and e.`YEAR`=#{year} and e.MON=${mon}" +
+            "sum(e.WATER_MONEY)+sum(e.ELEC_MONEY)+sum(e.GAS_MONEY) MONEY" +
+            " from energy_count_m e where e.PRO_ID=#{proId} and e.`YEAR`=#{year} and e.MON=${mon}" +
             "<if test=\"hour != null\"> and e.HOUR &lt;= #{hour}</if>" +
             " group by e.`DAY`+0 asc) a order by a.MONEY desc</script>")
     @ResultMap("resultMapVo")

src/main/java/org/rcisoft/business/overview/service/OverViewService.java

@@ -48,11 +48,10 @@ public interface OverViewService {
     /**
      * 运行费用排名
      * @param proId
-     * @param type
      * @param date
      * @return
      */
-    Integer getPriceRank(String proId, Integer type, Integer date);
+    Integer getPriceRank(String proId, Integer date);
 
     /**
      * 建筑单位面积用量标准

src/main/java/org/rcisoft/business/overview/service/impl/OverViewServiceImpl.java

@@ -368,12 +368,11 @@ public class OverViewServiceImpl implements OverViewService {
     }
 
     @Override
-    public Integer getPriceRank(String proId, Integer type, Integer date) {
+    public Integer getPriceRank(String proId, Integer date) {
         Map<String, String> cal = this.getTime(date);
         String day = cal.get("day");
         EnergyCountMVo e = new EnergyCountMVo();
         e.setProId(proId);
-        e.setType(type);
         e.setYear(cal.get("year"));
         e.setMon(cal.get("month"));
         e.setDay(day);