逆变器分析接口

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/goodness/StationAnalysisController.java

@@ -69,7 +69,7 @@ public class StationAnalysisController {
 
     ) throws Exception {
 
-        Map<String, Page<InverterAnalysis>> resultList = windturbinegoodnessService.inverterAnalysis(companys, type, wpid, pageSize, pageNum, target, sort);
+         Page<InverterAnalysis> resultList = windturbinegoodnessService.inverterAnalysis(companys, type, wpid, pageSize, pageNum, target, sort);
 
         if (com.gyee.common.model.StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
@@ -79,4 +79,30 @@ public class StationAnalysisController {
     }
 
 
+    /**
+     * 逆变器分析二次页面
+     */
+   /* @GetMapping("/analyse/stationAnalyse")
+    @ResponseBody
+    @ApiOperation(value = "场站性能分析", notes = "场站性能分析")
+    public R inverterAnalysis2(
+            @RequestParam(value = "wtid", required = true) String wtid,
+            @RequestParam(value = "beginDate", required = true) String beginDate,
+            @RequestParam(value = "endDate", required = true) String endDate,
+            @RequestParam(value = "pageSize", required = true) Long pageSize,
+            @RequestParam(value = "pageNum", required = true) Long pageNum,
+            @RequestParam(value = "target", required = false) String target,
+            @RequestParam(value = "sort", required = false) String sort
+    ) throws Exception {
+
+       Map<String, List<StationAnalysis>> resultList = windturbinegoodnessService.inverterAnalysis2(wtid, beginDate, endDate, pageSize, pageNum, 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/service/goodness/WindturbinegoodnessService.java

@@ -1079,12 +1079,10 @@ public class WindturbinegoodnessService {
     /**
      * 逆变器分析
      */
-    public Map<String, Page<InverterAnalysis>> inverterAnalysis(String companys, String type, String wpid, long pageSize, long pageNum, String target, String sort) throws Exception {
-        Map<String, Page<InverterAnalysis>> resultMap = new HashMap<>();
+    public Page<InverterAnalysis> inverterAnalysis(String companys, String type, String wpid, long pageSize, long pageNum, String target, String sort) throws Exception {
+        Page<InverterAnalysis> analysisPage = new Page<>();
         if ("-1".equals(type)) {
-            resultMap.put("list", new Page<>());
-            resultMap.put("chanrt", new Page<>());
-            return resultMap;
+            return new Page<>();
         }
         List<InverterAnalysis> lias = new ArrayList<>();
 
@@ -1125,11 +1123,6 @@ public class WindturbinegoodnessService {
             ia.setInputPower(srgRealDataMap.get(srgEquipmentIdMap.get(epid)));
             ia.setOutputPower(scgRealDataMap.get(scgEquipmentIdMap.get(epid)));
             ia.setInputVoltage(srdRealDataMap.get(srdEquipmentIdMap.get(epid)));
-            /*if (srgRealDataMap.get(srgEquipmentIdMap.get(epid)) == null || srgRealDataMap.get(srgEquipmentIdMap.get(epid)) == 0.0) {
-                ia.setConversionRate(0.0);
-            } else {
-                ia.setConversionRate(scgRealDataMap.get(scgEquipmentIdMap.get(epid)) / srgRealDataMap.get(srgEquipmentIdMap.get(epid)) * 100);
-            }*/
             if (!srgEquipmentIdMap.containsKey(epid) || !srgRealDataMap.containsKey(srgEquipmentIdMap.get(epid)) || Objects.equals(srgRealDataMap.get(srgEquipmentIdMap.get(epid)), 0.0)) {
                 ia.setConversionRate(0.0);
             } else {
@@ -1144,17 +1137,20 @@ public class WindturbinegoodnessService {
             lias.add(ia);
         }
 
-        Page<InverterAnalysis> analysisPage = new Page<>();
         analysisPage.setRecords(lias);
         analysisPage.setTotal(lias.size());
         analysisPage.setCurrent(pageNum);
         analysisPage.setSize(pageSize);
 
-        resultMap.put("list", analysisPage);
-        resultMap.put("chanrt", analysisPage);
-
-        return resultMap;
+        return analysisPage;
     }
 
 
+    /**
+     * 逆变器分析二次页面
+     */
+   /* public Map<String, List<StationAnalysis>> inverterAnalysis2(String wtid, String beginDate, String endDate, Long pageSize, Long pageNum, String target, String sort) {
+
+
+    }*/
 }