公司对标、阵区对标、逆变器对标

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -88,6 +88,18 @@ public class BenchmarkingController {
         }
     }
 
+    @GetMapping(value = "/wtByLnlist")
+    @ApiOperation(value = "风机列表", notes = "风机列表")
+    public R wtByLnlist(@RequestParam(value = "lnids", required = true) String lnids)  {
+
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.wtByLnlist(lnids);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
     @GetMapping(value = "/performance")
     @ApiOperation(value = "风机绩效榜", notes = "风机绩效榜")
     public R performance(@RequestParam(value = "companyid", required = true) String companyid,
@@ -151,6 +163,25 @@ public class BenchmarkingController {
         }
     }
 
+    @GetMapping("/gsdb")
+    @ResponseBody
+    @ApiOperation(value = "公司对标", notes = "公司对标")
+    public R gsdb(@RequestParam(value = "companys",required = true) String companys,
+                  @RequestParam(value = "type",required = true) String type,
+                  @RequestParam(value = "beginDate",required = true) String beginDate,
+                  @RequestParam(value = "endDate",required = true) String endDate,
+                  @RequestParam(value = "target",required = true) String target,
+                  @RequestParam(value = "sort",required = true) String sort
+    ){
+        List<WxsslVo> resultList = benchmarkingService.gsdb(companys,type,beginDate,endDate,target,sort);
+
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
     @GetMapping("/cndb")
     @ResponseBody
     @ApiOperation(value = "场内对标", notes = "场内对标")
@@ -336,6 +367,28 @@ public class BenchmarkingController {
         }
     }
 
+    @GetMapping("/zqdb")
+    @ResponseBody
+    @ApiOperation(value = "阵区对标", notes = "阵区对标")
+    public R zqdb(@RequestParam(value = "companys",required = true) String companys,
+                  @RequestParam(value = "type",required = true) String type,
+                  @RequestParam(value = "wpids",required = true) String wpids,
+                  @RequestParam(value = "projectids",required = true) String projectids,
+                  @RequestParam(value = "lineids",required = true) String lineids,
+                  @RequestParam(value = "squareids",required = true) String squareids,
+                  @RequestParam(value = "beginDate",required = true) String beginDate,
+                  @RequestParam(value = "endDate",required = true) String endDate,
+                  @RequestParam(value = "target",required = true) String target,
+                  @RequestParam(value = "sort",required = true) String sort
+    ){
+        List<WxsslVo> resultList = benchmarkingService.zqdb(companys,type,wpids,projectids,lineids,squareids,beginDate,endDate,target,sort);
+
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
 
     /**
      * 对标页面详情

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/performacompare/EquipmentPerformaCompareController.java

@@ -1,16 +1,20 @@
 package com.gyee.runeconomy.controller.performacompare;
 
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.model.auto.ProEconWtPowerCurveFitting;
+import com.gyee.runeconomy.service.bmk.BenchmarkingService;
 import com.gyee.runeconomy.service.performacompare.EquipmentPerformaCompareService;
+import com.gyee.runeconomy.util.StringUtils;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -28,13 +32,14 @@ public class EquipmentPerformaCompareController {
 
     @Autowired
     private EquipmentPerformaCompareService equipmentPerformaCompareService;
+    @Autowired
+    private BenchmarkingService benchmarkingService;
 
 
     /**
      * 单机横向对比列表
+     *
      * @param type 风场 -1 ；光伏 -2
-     * @param dateType  日 1；月 2； 年 3
-     * @param windturbineIds 设别ids
      * @param date 日期
      * @return
      */
@@ -43,23 +48,42 @@ public class EquipmentPerformaCompareController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R daydjhxdbtop(
             @RequestParam(value = "type", required = true) String type,
-            @RequestParam(value = "dateType", required = true) String dateType,
-            @RequestParam(value = "windturbineIds", required = true) String windturbineIds,
-            @RequestParam(value = "date", required = true) String date) {
+            @RequestParam(value = "companyid", required = true) String companyid,
+            @RequestParam(value = "wpids", required = true) String wpids,
+            @RequestParam(value = "projectids", required = true) String projectids,
+            @RequestParam(value = "lineids", required = true) String lineids,
+            @RequestParam(value = "wtids", required = true) String wtids,
+            @RequestParam(value = "date", required = true) String date,
+            @RequestParam(value = "target", required = false) String target,
+            @RequestParam(value = "sort", required = false) String sort) {
 
         List<Object> objects = null;
         try {
-            objects = equipmentPerformaCompareService.getEquipmentPerformaCompareList(dateType, windturbineIds, date,type);
+            if (StringUtils.isNotEmpty(wtids)) {
+                wtids = wtids;
+            } else if (StringUtils.isNotEmpty(lineids)) {
+                wtids = benchmarkingService.wtByLnlist(lineids).stream().map(ProBasicOrganizeTree::getId).collect(Collectors.joining(","));
+            } else if (StringUtils.isNotEmpty(projectids)) {
+                wtids = benchmarkingService.lnByPjlist(projectids).stream().map(ProBasicOrganizeTree::getId).collect(Collectors.joining(","));
+            } else if (StringUtils.isNotEmpty(wpids)) {
+                wtids = benchmarkingService.pjByWplist(wpids).stream().map(ProBasicOrganizeTree::getId).collect(Collectors.joining(","));
+            } else if (StringUtils.isNotEmpty(companyid)) {
+                wtids = benchmarkingService.wpByCplist(companyid, type).stream().map(ProBasicOrganizeTree::getId).collect(Collectors.joining(","));
+            } else {
+                return R.data(ResultMsg.ok(objects));
+            }
+
+            objects = equipmentPerformaCompareService.getEquipmentPerformaCompareList(wtids, date, type);
             return R.data(ResultMsg.ok(objects));
         } catch (Exception e) {
             return R.data(ResultMsg.error());
         }
-
     }
 
 
     /**
      * 实际拟合曲线
+     *
      * @param windturbineIds
      * @return
      */
@@ -67,7 +91,7 @@ public class EquipmentPerformaCompareController {
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R getWtPowerCurveFittingList(
-            @RequestParam(value = "windturbineIds", required = true) String windturbineIds ){
+            @RequestParam(value = "windturbineIds", required = true) String windturbineIds) {
 
         Map<String, List<ProEconWtPowerCurveFitting>> map = null;
         try {

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/performacompare/EquipmentPerformaCompareService.java

@@ -33,19 +33,18 @@ public class EquipmentPerformaCompareService {
 
     /**
      * 单机横向对比列表
-     * @param dateType
      * @param windturbineIds
      * @param date
      * @return
      */
-    public List<Object> getEquipmentPerformaCompareList(String dateType, String windturbineIds, String date,String type) {
+    public List<Object> getEquipmentPerformaCompareList(String windturbineIds, String date,String type) {
         List<Object> objects = new ArrayList<>();
-        if("-1".equals(type)){
-            List<ProEconWtAlysisDay>  list =  proEconWtAlysisDayService.getProEconWtAlysisDayList(windturbineIds,date);//风机性能分析数据
-            List<ProEconWtwindDayInfo> fzyList =  proEconWtwindDayInfoService.getProEconWtwindDayInfoList(windturbineIds,date);//风资源
-            List<DjhxdbtopVo> resultList = alysisConversionMethod(list,fzyList,dateType);//日月年指标转换记录
-            objects = convert(resultList);
-        }
+
+        List<ProEconWtAlysisDay>  list =  proEconWtAlysisDayService.getProEconWtAlysisDayList(windturbineIds,date);//风机性能分析数据
+        List<ProEconWtwindDayInfo> fzyList =  proEconWtwindDayInfoService.getProEconWtwindDayInfoList(windturbineIds,date);//风资源
+        List<DjhxdbtopVo> resultList = alysisConversionMethod(list,fzyList,"1");//日月年指标转换记录
+        objects = convert(resultList);
+
         return objects;
     }