添加功率曲线基础代码

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/newfj/NewDataFittingController.java

@@ -28,7 +28,7 @@ public class NewDataFittingController {
      * @param newDataFittingVo
      * @return
      */
-    @GetMapping("/data")
+    @PostMapping("/data")
     public JSONObject dataFitting(@RequestBody NewDataFittingVo newDataFittingVo ) {
 
         ProEconPowerFittingAnalySis obj = newDataFittingService.newDataFitting(newDataFittingVo);

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

@@ -93,6 +93,7 @@ public class NewDataFittingService {
                 String content = prepareAssemble(result);
                 // 处理的数据保存在本地
                 String wtCode = InitialRunner.wtNewMap.get(wt).getId();
+                String wtCode2 = InitialRunner.wtNewMap.get(wt).getNemCode();
                 String fileName = config.getFilePathPrepare() + vo.getStation() + "_" + wtCode + "_" + System.currentTimeMillis() / 1000 + ".csv";
 
                 boolean flag = FileUtil.writeFile(fileName, content);
@@ -102,7 +103,7 @@ public class NewDataFittingService {
                     obj.setStation(vo.getStation());
                     obj.setStationcn(InitialRunner.stationNewMap.get(vo.getStation()));
                     obj.setWindturbineId(wt);
-                    obj.setCode(wtCode);
+                    obj.setCode(wtCode2);
                     obj.setTime(DateUtil.format(vo.getSt(), DateUtil.YYYY_MM_DD_CHN) + "-" + DateUtil.format(vo.getEt(), DateUtil.YYYY_MM_DD_CHN));
                     obj.setInterval(NumberUtil.toNum(vo.getInterval()));
                     obj.setPath(fileName);
@@ -324,7 +325,14 @@ public class NewDataFittingService {
             sb.append(DateUtil.format(data.get(i).getTs(), DateUtil.DATE_TIME_PATTERN)).append(",");
             sb.append(data.get(i).getDoubleValue()).append(",");
             for (int j = 1; j < list.size(); j++){
-                sb.append(list.get(j).get(i).getDoubleValue()).append(",");
+
+                //
+                if(null != list.get(j) && list.get(j).size()>0){
+                    sb.append(list.get(j).get(i).getDoubleValue()).append(",");
+                }else {
+                    sb.append(0).append(",");
+                }
+
             }
             sb.deleteCharAt(sb.lastIndexOf(","));
             sb.append("\n");