品牌对标

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

@@ -531,21 +531,17 @@ public class BenchmarkingController {
 
     @GetMapping("/ppdb")
     @ResponseBody
-    @ApiOperation(value = "品牌对标", notes = "品牌对标")
+    @ApiOperation(value = "场际对标", notes = "场际对标")
     public R ppdb(@RequestParam(value = "companys",required = true) String companys,
                   @RequestParam(value = "type",required = true) String type,
                   @RequestParam(value = "wpids",required = true) String wpids,
                   @RequestParam(value = "model",required = true) String model,
-                  @RequestParam(value = "projectids",required = true) String projectids,
-                  @RequestParam(value = "lineids",required = true) String lineids,
-                  @RequestParam(value = "squareids",required = true) String squareids,
-                  @RequestParam(value = "windturbineids",required = false) String windturbineids,
                   @RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
-                  @RequestParam(value = "target",required = false) String target,
-                  @RequestParam(value = "sort",required = false) String sort
+                  @RequestParam(value = "target",required = true) String target,
+                  @RequestParam(value = "sort",required = true) String sort
     ){
-        List<WxsslVo> resultList = benchmarkingService.ppdb(companys,type,wpids,model,projectids,lineids,squareids,windturbineids,beginDate,endDate,target,sort);
+        List<WxsslVo> resultList = benchmarkingService.ppdb(companys,type,wpids,model,beginDate,endDate,target,sort);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
@@ -554,5 +550,4 @@ public class BenchmarkingController {
         }
     }
 
-
 }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -1202,30 +1202,19 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
     /**
      * 设备对标
      */
-    public List<WxsslVo> ppdb(String companys, String type, String wpids,String model, String projectids, String lineids, String squareids, String windturbineids, String beginDate, String endDate, String target, String sort) {
+    public List<WxsslVo> ppdb(String companys, String type, String wpids,String model, String beginDate, String endDate, String target, String sort) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
-        qw.select("windturbine_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
+        qw.select("windpowerstation_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
 
         qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
-
-        if (StringUtils.isNotEmpty(windturbineids)) {
-            List<String> equipmentidsList = Arrays.asList(windturbineids.split(","));
-            qw.in("windturbine_id", equipmentidsList);
-        } else if (StringUtils.isNotEmpty(squareids)) {
-            List<String> squareidList = Arrays.asList(squareids.split(","));
-            qw.in("square_id", squareidList);
-        } else if (StringUtils.isNotEmpty(lineids)) {
-            List<String> lineList = Arrays.asList(lineids.split(","));
-            qw.in("line_id", lineList).isNotNull("square_id").ne("square_id", "");
-        } else if (StringUtils.isNotEmpty(projectids)) {
-            List<String> projectList = Arrays.asList(projectids.split(","));
-            qw.in("project_id", projectList).isNotNull("square_id").ne("square_id", "");
-        } else if (StringUtils.isNotEmpty(wpids)) {
+        if (StringUtils.isNotEmpty(wpids)) {
             List<String> wpList = Arrays.asList(wpids.split(","));
-            qw.in("windpowerstation_id", wpList).isNotNull("square_id").ne("square_id", "");
+            qw.in("windpowerstation_id", wpList);
         } else if (StringUtils.isNotEmpty(companys)) {
+
             String[] split = companys.split(",");
+
             if (companys.contains("RGN")) {
                 for (String s : split) {
                     if (s.endsWith("RGN")) {
@@ -1242,8 +1231,8 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
         } else {
             qw.like("windturbine_id", "_IN_");
         }
-        qw.groupBy("windturbine_id");
-        List<WxsslVo> wxsslVoList = getxinWxsslSortVos(qw, resultList, TYPE_WINDTURBINE,model,wpids);
+        qw.groupBy("windpowerstation_id");
+        List<WxsslVo> wxsslVoList = getxinWxsslSortVos(qw, resultList, TYPE_WIND,wpids,model);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)) {
             if (sort.equals("1")) {
                 SortUtils.sort(resultList, target, SortUtils.ASC);