预处理模块代码合并

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LimitRateHanlderParam.java

@@ -1,7 +1,6 @@
 package com.njcn.prepare.harmonic.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import java.util.List;

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java

@@ -18,12 +18,19 @@ public class LineParam {
     @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
     private List<String> lineIds;
 
-    @ApiModelProperty(name = "type",value = "报表类型")
+    @ApiModelProperty(name = "lineType",value = "监测点类型")
-    @NotNull(message = "报表类型不可为空")
+    private Integer lineType;
+
+    @ApiModelProperty(name = "type",value = "时间类型（1年，2季，3月，4周，5日）")
+    @NotNull(message = "时间类型不可为空")
     private Integer type;
 
-    @ApiModelProperty(name = "dataDate",value = "报表时间")
+    @ApiModelProperty(name = "dataDate",value = "时间")
-    @NotBlank(message = "报表时间不可为空")
+    @NotBlank(message = "时间不可为空")
     private String dataDate;
 
+    @ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb）")
+    @NotNull(message = "数据源不可为空")
+    private Integer dataSource;
+
 }

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/PrimaryGridDataIntegrityParam.java

@@ -0,0 +1,35 @@
+package com.njcn.prepare.harmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/30  20:10【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class PrimaryGridDataIntegrityParam {
+
+    @ApiModelProperty(name = "orgIdList",value = "终端Id")
+    private List<String> deviceId;
+
+    @ApiModelProperty(name = "type",value = "报表类型,1,年，2季，3月，4周，5日")
+    @NotNull(message = "报表类型不可为空")
+    private Integer type;
+
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    @NotBlank(message = "报表时间不可为空")
+    private String dataDate;
+
+    @ApiModelProperty(name = "dataSource",value = "数据源 0:oracle;1:influxdb")
+    @NotBlank(message = "数据源")
+    private Integer dataSource;
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/PrimaryGridParam.java

@@ -0,0 +1,33 @@
+package com.njcn.prepare.harmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author clam
+ * Date: 2022/10/20  11:41
+ * @version V1.0.0
+ */
+@Data
+public class PrimaryGridParam {
+
+    @ApiModelProperty(name = "orgIdList",value = "单位Id")
+    private List<String> orgIdList;
+
+    @ApiModelProperty(name = "type",value = "报表类型,1,年，2季，3月，4周，5日")
+    @NotNull(message = "报表类型不可为空")
+    private Integer type;
+
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    @NotBlank(message = "报表时间不可为空")
+    private String dataDate;
+
+    @ApiModelProperty(name = "dataSource",value = "数据源 0:oracle;1:influxdb")
+    @NotBlank(message = "数据源")
+    private Integer dataSource;
+
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlicker.java

@@ -0,0 +1,38 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/1/12  11:31【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Measurement(
+        name = "data_flicker"
+)
+@Data
+public class DataFlicker {
+    @Column(
+            name = "time"
+    )
+    private Instant time;
+    @Column(
+            name = "line_id"
+    )
+    private String lineId;
+    @Column(
+            name = "pst_count"
+    )
+    private Integer pstCount;
+    @Column(
+            name = "plt_count"
+    )
+    private Integer pltCount;
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/AbnormalVO.java

@@ -1,7 +1,6 @@
 package com.njcn.prepare.harmonic.pojo.vo;
 
 import lombok.Data;
-import org.influxdb.annotation.Measurement;
 
 import java.io.Serializable;
 

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/DataFlickerOracleVO.java

@@ -0,0 +1,37 @@
+package com.njcn.prepare.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * DATA_V VO
+ *
+ * @author qijian
+ * @since 2022-12-01 10:11:41
+ */
+@Data
+public class DataFlickerOracleVO implements Serializable {
+    private static final long serialVersionUID = 390349030891669605L;
+
+    @ApiModelProperty("监测点ID")
+    private Integer lineid;
+
+    @ApiModelProperty("时间")
+    private Date timeid;
+
+    @ApiModelProperty("相别")
+    private String phasicType;
+
+    @ApiModelProperty("短时闪变数据个数")
+    private Integer pstCount;
+
+    @ApiModelProperty("长时闪变数据个数")
+    private Integer pltCount;
+
+
+
+}
+

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/DataVOracleVO.java

@@ -0,0 +1,74 @@
+package com.njcn.prepare.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * DATA_V VO
+ *
+ * @author qijian
+ * @since 2022-11-30 10:11:41
+ */
+@Data
+public class DataVOracleVO implements Serializable {
+    private static final long serialVersionUID = 390349030891669605L;
+
+    @ApiModelProperty("监测点ID")
+    private Integer lineid;
+
+    @ApiModelProperty("时间")
+    private Date timeid;
+
+    @ApiModelProperty("相别")
+    private String phasicType;
+
+    @ApiModelProperty("频率平均值实时量测值MAX")
+    private Double freqMax;
+
+    @ApiModelProperty("频率平均值实时量测值MIN")
+    private Double freqMin;
+
+    @ApiModelProperty("相电压有效值平均值实时量测值MAX")
+    private Double rmsMax;
+
+    @ApiModelProperty("相电压有效值平均值实时量测值MIN")
+    private Double rmsMin;
+
+    @ApiModelProperty("线电压有效值平均值实时量测值MAX")
+    private Double rmsLvrMax;
+
+    @ApiModelProperty("线电压有效值平均值实时量测值MIN")
+    private Double rmsLvrMin;
+
+    @ApiModelProperty("电压总谐波畸变率平均值实时量测值量MAX")
+    private Double vThdMax;
+
+    @ApiModelProperty("电压总谐波畸变率平均值实时量测值量MIN")
+    private Double vThdMin;
+
+    @ApiModelProperty("三相电压负序不平衡度平均值实时量测值MAX")
+    private Double vUnbalanceMax;
+
+    @ApiModelProperty("三相电压负序不平衡度平均值实时量测值MIN")
+    private Double vUnbalanceMin;
+
+    @ApiModelProperty("频率平均值数量")
+    private Integer freqCount;
+
+    @ApiModelProperty("相电压有效值平均值数量")
+    private Integer rmsCount;
+
+    @ApiModelProperty("线电压有效值平均值数量")
+    private Integer rmsLvrCount;
+
+    @ApiModelProperty("电压总谐波畸变率平均值数量")
+    private Integer vThdCount;
+
+    @ApiModelProperty("三相电压负序不平衡度平均值数量")
+    private Integer vUnbalanceCount;
+
+}
+