曲线拟合

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

@@ -25,16 +25,19 @@ public class MyTest implements CommandLineRunner {
     public void run(String... args) throws Exception {
         int count = inPowerCurveFittingService.count();
         if(count<10000) {
-            List<ProBasicOrganizeTree> collect = CacheContext.wtls.stream().filter(wtl -> wtl.getEleType() == "G").collect(Collectors.toList());
+            List<ProBasicOrganizeTree> collect = CacheContext.wtls.stream().filter(wtl -> wtl.getEleType().equals("G")).collect(Collectors.toList());
 
             List<ProEconInPowerCurveFitting> list = new ArrayList<>();
+            int j = 0;
             for (int i = 0; i < 1001; i++) {
                 for (ProBasicOrganizeTree tree : collect) {
+                    j++;
                     ProEconInPowerCurveFitting econ = new ProEconInPowerCurveFitting();
+                    econ.setId(i*3000+j);
                     econ.setInverterId(tree.getId());
                     econ.setIllumination((double) i);
-                    econ.setActualPower(DoubleUtils.keepPrecision(i / 60, 2));
-                    econ.setOptimalPower(DoubleUtils.keepPrecision(i / 55, 2));
+                    econ.setActualPower(DoubleUtils.getRoundingNum(i / 60, 2));
+                    econ.setOptimalPower(DoubleUtils.getRoundingNum(i / 55, 2));
                     list.add(econ);
                 }
             }

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -203,7 +203,7 @@ public class CacheContext implements CommandLineRunner {
         bnls = proBasicBranchService.list();
         //List<String> bnlids = bnls.stream().map(bnl -> bnl.getId()).collect(Collectors.toList());
         //Map<String, Object> objectMap = redisService.batchGetKeys(bnlids);
-        bnls.stream().forEach(bn -> {
+        /*bnls.stream().forEach(bn -> {
             String bnString = redisService.get(bn.getId());
             Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(bnString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
             });
@@ -216,7 +216,7 @@ public class CacheContext implements CommandLineRunner {
                 bns.add(bn);
                 wtbnmap.put(bn.getInteverId(), bns);
             }
-        });
+        });*/
 
         equipmentmodels = proEconEquipmentmodelService.list();
         equipmentmodels.stream().forEach(e -> {
@@ -403,7 +403,7 @@ public class CacheContext implements CommandLineRunner {
             wtmap.put(wt.getId(), wt);
             //标杆风机初始化
             wtstandardmap.put(wt.getId(), wt.getId());
-            String wtString = redisService.get(wt.getId());
+            /*String wtString = redisService.get(wt.getId());
             Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(wtString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
             });
             wtpAimap.put(wt.getId(), stringWindturbinetestingpointnewMap);
@@ -461,7 +461,7 @@ public class CacheContext implements CommandLineRunner {
                 Map<String, ProBasicOrganizeTree> map = new HashMap<>();
                 map.put(wt.getId(), wt);
                 cmwtmap.put(wt.getOrgType().contains("ZGS"), map);
-            }
+            }*/
         });
 
 
@@ -502,7 +502,7 @@ public class CacheContext implements CommandLineRunner {
         //期次场站树形
         pjls = proBasicOrganizeTrees.stream().filter(i -> i.getOrgType().contains("EG")).collect(Collectors.toList());
 
-        pjls.stream().forEach(p -> {
+        /*pjls.stream().forEach(p -> {
             pjmap.put(p.getId(), p);
             if (wppromap.containsKey(p.getOrgType().contains("STA"))) {
                 wppromap.get(p.getOrgType().contains("STA")).add(p);
@@ -516,23 +516,23 @@ public class CacheContext implements CommandLineRunner {
             });
             propointmap.put(p.getId(), stringWindpowerstationpointnewMap);
 
-        });
+        });*/
 
 
 
         subwpls = proBasicOrganizeTreeService.list().stream().filter(i-> i.getIsAble()==1 && i.getOrgType().contains("SBS")).collect(Collectors.toList());
-        subwpls.stream().forEach(sub->{
+        /*subwpls.stream().forEach(sub->{
 
             String subString = redisService.get(sub.getId());
             Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(subString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
             });
             subwppointmap.put(sub.getId(), stringWindpowerstationpointnewMap);
 
-        });
+        });*/
 
 
         weawpls = proBasicWeatherStationService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
-        weawpls.stream().forEach(weather -> {
+        /*weawpls.stream().forEach(weather -> {
 
             String subString = redisService.get(weather.getId());
             Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(subString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
@@ -540,13 +540,13 @@ public class CacheContext implements CommandLineRunner {
             weatherwppointmap.put(weather.getId(), stringWindpowerstationpointnewMap);
 
 
-        });
+        });*/
 
 
 
         //树形线路
         lnls = proBasicOrganizeTrees.stream().filter(i -> StringUtils.isNotNull(pjmap.get(i.getParentCode()))).collect(Collectors.toList());
-        lnls.stream().forEach(l -> {
+        /*lnls.stream().forEach(l -> {
             lnmap.put(l.getId(), l);
             if (prolinemap.containsKey(l.getOrgType().contains("EG"))) {
                 prolinemap.get(l.getOrgType().contains("EG")).add(l);
@@ -559,7 +559,7 @@ public class CacheContext implements CommandLineRunner {
             Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
             });
             linepointmap.put(l.getId(), stringWindpowerstationpointnewMap);
-        });
+        });*/
 
 
         for (ProBasicOrganizeTree wp : wpls) {
@@ -576,14 +576,14 @@ public class CacheContext implements CommandLineRunner {
             meterpointMap.put(meterpoint.getId(), meterpoint);
         });
 
-        wpls.stream().forEach(wp->{
+        /*wpls.stream().forEach(wp->{
 
             wpmap.put(wp.getId(), wp);
             String wpString = redisService.get(wp.getId());
             Map<String, ProBasicPowerstationPoint> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
             });
             wppointmap.put(wp.getId(), stringMapMap);
-        });
+        });*/
 
 
 

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/model/fitting/ProEconInPowerCurveFitting.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.model.fitting;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import org.springframework.data.annotation.Id;
 
 import java.io.Serializable;