修改自动生成测点功能，数据实体更新

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -262,4 +262,13 @@ public class Contant {
   public static final String DI11139 = "DI11139";
     public static final String DI10923 = "DI10923";
 
+    public static final String LLGL = "LLGL"; //理论功率
+
+
+    public static final String ZHGL = "ZHGL"; //最优功率
+
+    public static final String RKYDL = "RKYDL"; //日可用电量
+    public static final String RFDLC = "RFDLC"; //日理论发电量
+
+
 }

common/src/main/java/com/gyee/common/contant/ContantXk.java

@@ -134,6 +134,8 @@ public class ContantXk {
     public static final String  YZHD= "YZHD";//月自耗电
     public static final String  NZHD= "NZHD";//年自耗电
     public static final String  ZHD15= "ZHD15";//15分钟自耗电
+
+
     public static final String  SBZT= "SBZT";//设备状态
     public static final String  MXZT= "MXZT";//设备明细状态
     public static final String  ZTCXSJ= "ZTCXSJ";//设备当前状态下持续时间
@@ -149,6 +151,18 @@ public class ContantXk {
     public static final String  KYGL= "KYGL";//设备可用功率
 
 
+    public static final String  CJ_SSFS= "AI066";//设备风速
+    public static final String  CJ_SSGL= "AI114";//设备有功功率
+    public static final String  CJ_FDZTXZSGD= "AI061";//发电状态下的转速给定
+    public static final String  CJ_SCADA_YGSD= "AI003";//scada有功设定值
+    public static final String  CJ_YLZSGD= "AI110";//叶轮转速给定
+
+
+    public static final String TPOINT_WP_AGC = "AGC002";// agc
+    public static final String TPOINT_WP_CXGL = "AGC001";// 出线功率SSFS
+
+    public static final String FCCFTFS70 = "FCCFTFS70";//测风塔70米风速
+
 
 
 

common/src/main/java/com/gyee/common/model/PointData.java

@@ -4,6 +4,8 @@ public class PointData {
 
 	private double pointValueInDouble;
 
+	private double pointValueInDouble2;
+
 	private Long pointTime;
 
 	private String pointValue;
@@ -12,6 +14,14 @@ public class PointData {
 
 	private String ednaId;// edna全局id
 
+	public double getPointValueInDouble2() {
+		return pointValueInDouble2;
+	}
+
+	public void setPointValueInDouble2(double pointValueInDouble2) {
+		this.pointValueInDouble2 = pointValueInDouble2;
+	}
+
 	public String getEdnaId() {
 		return ednaId;
 	}