品牌分析接口加场站名称

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

@@ -11,6 +11,7 @@ import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.dto.response.OperationalAnalysis;
 import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.fitting.ProBasicOrganizeEquipment;
 import com.gyee.runeconomy.service.bmk.BenchmarkingService;
@@ -472,7 +473,7 @@ public class BenchmarkingController {
 
     @GetMapping("/operational/analysis")
     @ResponseBody
-    @ApiOperation(value = "运行分析", notes = "运行分析")
+    @ApiOperation(value = "品牌分析", notes = "品牌分析")
     public R operationalAnalysis(@RequestParam(value = "companys", required = true) String companys,
                                  @RequestParam(value = "type", required = true) String type,
                                  @RequestParam(value = "wpids", required = true) String wpids,

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/dto/response/OperationalAnalysis.java

@@ -3,6 +3,11 @@ package com.gyee.runeconomy.dto.response;
 
 public class OperationalAnalysis {
     /**
+     * 场站名称
+     */
+    private String wpsName;
+
+    /**
      * 场站
      */
     private String wpsId;
@@ -79,4 +84,12 @@ public class OperationalAnalysis {
     public void setModelId(String modelId) {
         this.modelId = modelId;
     }
+
+    public String getWpsName() {
+        return wpsName;
+    }
+
+    public void setWpsName(String wpsName) {
+        this.wpsName = wpsName;
+    }
 }

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

@@ -1562,7 +1562,7 @@ public class BenchmarkingService {
 
 
     /**
-     * 运行分析
+     * 品牌分析
      */
     public List<OperationalAnalysis> operationalAnalysis(String companys, String type, String wpids, String modelids, String beginDate, String endDate, String target, String sort) throws Exception {
         Date date1 = DateUtil.parse(beginDate);
@@ -1603,6 +1603,7 @@ public class BenchmarkingService {
         for (ProEconPowerstationInfoDay7 day7 : lpepi7) {
             String wpId = day7.getWindpowerstationId();
             OperationalAnalysis oa = new OperationalAnalysis();
+            oa.setWpsName(CacheContext.proBasicOrganizeTreesMap.get(wpids).getAname());
             oa.setWpsId(wpId);
             oa.setModelId(equipmentStationMap.get(wpId).get(0).getModelId());
             oa.setConversionRate(day7.getRnbqzhxl().doubleValue());