逆变器分析接口

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

@@ -87,13 +87,11 @@ public class StationAnalysisController {
             @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 {
 
-        Page<InverterAnalysis2> resultList = windturbinegoodnessService.inverterAnalysis2(wtid, beginDate, endDate, pageSize, pageNum, target, sort);
+        List<InverterAnalysis2> resultList = windturbinegoodnessService.inverterAnalysis2(wtid, beginDate, endDate, target, sort);
 
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -1153,12 +1153,9 @@ public class WindturbinegoodnessService {
     /**
      * 逆变器分析二次页面
      */
-    public Page<InverterAnalysis2> inverterAnalysis2(String wtid, String beginDate, String endDate, Long pageSize, Long pageNum, String target, String sort) throws Exception {
+    public List<InverterAnalysis2> inverterAnalysis2(String wtid, String beginDate, String endDate, String target, String sort) throws Exception {
         Long startTs = DateUtils.parseDate1(beginDate).getTime() / 1000;
         Long endTs = DateUtils.parseDate1(endDate).getTime() / 1000;
-
-        Page<InverterAnalysis2> analysisPage = new Page<>();
-
         List<ProBasicEquipmentPoint> srg = CacheContext.proBasicEquipmentPointList.stream().filter(pbep -> "AIG010".equals(pbep.getUniformCode()) && wtid.equals(pbep.getWindturbineId())).collect(Collectors.toList());
 
         List<ProBasicEquipmentPoint> scg = CacheContext.proBasicEquipmentPointList.stream().filter(pbep -> "AIG007".equals(pbep.getUniformCode()) && wtid.equals(pbep.getWindturbineId())).collect(Collectors.toList());
@@ -1183,7 +1180,6 @@ public class WindturbinegoodnessService {
         List<PointData> historySrdDatas = edosUtil.getHistoryDatasSnap(srdTag, startTs, endTs, null, 900L);
         Map<Long, PointData> srdMap = historySrdDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
 
-
         List<InverterAnalysis2> lpds = new ArrayList<>();
         for (PointData data : historySrgDatas) {
             Long pointTime = data.getPointTime();
@@ -1204,15 +1200,7 @@ public class WindturbinegoodnessService {
             lpds.add(ia);
         }
         List<InverterAnalysis2> lias2 = lpds.stream().sorted(Comparator.comparing(InverterAnalysis2::getTime)).collect(Collectors.toList());
-        int total = lias2.size();
-        long offset = (pageNum - 1) * pageSize;
-        lias2 = lias2.stream().skip(offset).limit(pageSize).collect(Collectors.toList());
 
-        analysisPage.setRecords(lias2);
-        analysisPage.setTotal(total);
-        analysisPage.setCurrent(pageNum);
-        analysisPage.setSize(pageSize);
-
-        return analysisPage;
+        return lias2;
     }
 }