Browse Source

信控功率曲线拟合

shilin 2 years ago
parent
commit
a38d3f3725

+ 3 - 0
realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittMonthMain.java

@@ -1,6 +1,8 @@
 package com.gyee.generation.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,6 +24,7 @@ public class ProEconCurveFittMonthMain extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private String id;
 
     /**

+ 2 - 1
realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittMonthSub.java

@@ -21,7 +21,8 @@ public class ProEconCurveFittMonthSub extends Model {
 
     /**
      * 编号
-     */
+
+     @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private String id;
 
     /**

+ 5 - 1
realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittingMain.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 风电机拟合曲线主表
@@ -23,6 +26,7 @@ public class ProEconCurveFittingMain extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private String id;
 
     /**

+ 5 - 1
realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconCurveFittingSub.java

@@ -1,11 +1,14 @@
 package com.gyee.generation.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 风电机拟合曲线子表
@@ -23,6 +26,7 @@ public class ProEconCurveFittingSub extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private String id;
 
     /**

+ 14 - 0
realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/PointfVo.java

@@ -0,0 +1,14 @@
+package com.gyee.generation.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PointfVo {
+
+    private Double x;
+    private Double y;
+}

File diff suppressed because it is too large
+ 1144 - 1005
realtime/generationXK-service/src/main/java/com/gyee/generation/service/PowerCurveFittingService.java


+ 1 - 1
realtime/generationXK-service/src/main/java/com/gyee/generation/util/LineUtil.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 public class LineUtil {
 
-    public static List<PointVo> BuildLine(double[] arrX, double[] arrY, int length, int dimension, double scale)
+    public static List<PointVo> buildLine(double[] arrX, double[] arrY, int length, int dimension, double scale)
     {
 
         List<PointVo> points =new ArrayList<PointVo>();