功率曲线功能修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/performance/PerformanceCurvefittingController.java

@@ -42,7 +42,7 @@ public class PerformanceCurvefittingController {
         if (null != curvefitting) {
             return R.data(ResultMsg.ok(curvefitting));
         } else {
-            return R.error(ResultMsg.error());
+            return R.data(ResultMsg.error());
         }
     }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/ZllglDTO.java

@@ -0,0 +1,14 @@
+package com.gyee.runeconomy.dto;
+
+import lombok.Data;
+
+@Data
+public class ZllglDTO {
+
+    private String id;
+    private String modelId;
+    private double speed;
+    private double theoryPower;
+    private double ensurePower;
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/PerformanceCurvefittingService.java

@@ -6,6 +6,7 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.curve.CurveVo;
+import com.gyee.runeconomy.dto.ZllglDTO;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingMonthService;
@@ -40,22 +41,22 @@ public class PerformanceCurvefittingService {
         Map<String, List<CurveVo>> resultMap = new HashMap<>();
         Map<String, ProBasicEquipment> wtmap = CacheContext.wtmap;
 
-        String zbzgl = redisService.get("ZBZGL");
-        Map<String, Map<Double, Double>> zbzglMap = JSONObject.parseObject(zbzgl, new TypeReference<Map<String, Map<Double, Double>>>() {
+        String zbzgl = redisService.get("ZLLGL");
+        Map<String, Map<Double, ZllglDTO>>  zbzglMap = JSONObject.parseObject(zbzgl, new TypeReference<Map<String, Map<Double, ZllglDTO>>>() {
         });
-        Map<String,Map<Double,Double>> zzsglMap = getWtCurveFitting(windpowerstationIds,dateType);
+        Map<String,Map<Double,Double>> znhglMap = getWtCurveFitting(windpowerstationIds,dateType);
         if (type.equals("0")){
             List<CurveVo> tempList = new ArrayList<>();
-            if (zzsglMap.containsKey(windpowerstationIds)){
-                Map<Double, Double> zsglmap = zzsglMap.get(windpowerstationIds);
-                Map<Double, Double> bzglmap = zbzglMap.get(wtmap.get(windpowerstationIds).getModelId());
+            if (znhglMap.containsKey(windpowerstationIds)){
+                Map<Double, Double> zsglmap = znhglMap.get(windpowerstationIds);
+                Map<Double, ZllglDTO> bzglmap = zbzglMap.get(wtmap.get(windpowerstationIds).getModelId());
                 Set<Double> speeds = zsglmap.keySet();
                 speeds.stream().forEach(speed->{
                     CurveVo vo = new CurveVo();
                     vo.setWtid(windpowerstationIds);
                     vo.setSpeed(speed);
                     vo.setTheorypower(DoubleUtils.keepPrecision(zsglmap.get(speed),2));
-                    vo.setEnsurepower(DoubleUtils.keepPrecision(bzglmap.containsKey(speed)?bzglmap.get(speed):zsglmap.get(speed),2));
+                    vo.setEnsurepower(DoubleUtils.keepPrecision(bzglmap.containsKey(speed)?bzglmap.get(speed).getEnsurePower():zsglmap.get(speed),2));
                     tempList.add(vo);
                 });
                 SortUtils.sort(tempList,"speed",SortUtils.ASC);
@@ -65,9 +66,9 @@ public class PerformanceCurvefittingService {
             String[] wts = windpowerstationIds.split(",");
             Arrays.stream(wts).forEach(wt->{
                 List<CurveVo> tempList = new ArrayList<>();
-                if(zzsglMap.get(wt) == null || zzsglMap.size() == 0)
+                if(znhglMap.get(wt) == null || znhglMap.size() == 0)
                     return;
-                Map<Double, Double> zsglmap = zzsglMap.get(wt);
+                Map<Double, Double> zsglmap = znhglMap.get(wt);
                 Set<Double> speeds = zsglmap.keySet();
                 speeds.stream().forEach(speed->{
                     CurveVo vo = new CurveVo();
@@ -81,7 +82,7 @@ public class PerformanceCurvefittingService {
             });
         }
 
-        return null;
+        return resultMap;
     }
 
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WpwindDayInfoService.java

@@ -29,8 +29,8 @@ public class WpwindDayInfoService {
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
 
             list = proEconWpwindDayInfoService.list().stream().filter(i->
-                    i.getWindpowerstationid().equals(wpId)
-                            && i.getRecorddate().compareTo(DateUtils.truncate(recorddate)) ==0
+                    i.getWindpowerstationId().equals(wpId)
+                            && i.getRecordDate().compareTo(DateUtils.truncate(recorddate)) ==0
             ).collect(Collectors.toList());