添加功率曲线基础代码

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/custom/curve/NewDataFittingService.java

@@ -144,6 +144,7 @@ public class NewDataFittingService {
                 boolean flag = FileUtil.writeFile(fileName, content);
 
                 if (flag) {  // TODO  保存数据库
+                    obj.setId(null);
                     obj.setPath(fileName);
                     obj.setFrequency(frequency);
                     obj.setSpeedavg(speed);
@@ -168,7 +169,7 @@ public class NewDataFittingService {
                 List<Double> arrayPower = new ArrayList<>();
                 List<String> line = FileUtil.readFile(processMap.get(processkey), true);
                 csvParse(line, arraySpeed, arrayPower, vo.getMins(), vo.getMaxs(), vo.getMinp(), vo.getMaxp());
-                List<ProBasicModelPower> mp = InitialRunner.modelPowerDetailNewMap.get(InitialRunner.wtNewMap.get(processkey).getModelId());
+                List<ProBasicModelPower> mp = InitialRunner.modelPowerDetailNewMap.get(InitialRunner.wtNewMap.get(list.get(0).getWindturbineId()).getModelId());
                 Double maxP = mp.stream().map(ProBasicModelPower::getEnsurePower).max(Comparator.comparing(Double::doubleValue)).get();
                 object.set(fittingMode(list, maxP, arraySpeed, arrayPower, vo.getDimension(), vo.getMode()));
 
@@ -294,7 +295,7 @@ public class NewDataFittingService {
         map.put("sjgl", sjglList);    //实际功率
         map.put("llgl", bzglList);    //保证功率
         map.put("cpz", cpzList);      //Cp值
-        map.put("obj", obj);     //对象
+        map.put("obj", obj);     //对w象
         map.put("yyd", listYY);  //有用散点
         map.put("wyd", listWY);  //无用散点
 
@@ -403,6 +404,7 @@ public class NewDataFittingService {
         }
         boolean flag = FileUtil.writeFile(fileName, content);
         if (flag) {  // TODO  保存数据库
+            obj.setId(null);
             obj.setPath(fileName);
             obj.setProcessid(processId);
             obj.setCpavg(lf.getCpAvg());