完成责任量化功能

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

@@ -0,0 +1,54 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.harmonic.constant.HarmonicValidMessage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2023年07月19日 09:23
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HistoryHarmParam implements Serializable {
+
+
+    @ApiModelProperty("开始时间")
+    @NotBlank(message = HarmonicValidMessage.DATA_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+    private String searchBeginTime;
+
+    @ApiModelProperty("结束时间")
+    @NotBlank(message = HarmonicValidMessage.DATA_NOT_BLANK)
+    @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+    private String searchEndTime;
+
+    @NotBlank(message = HarmonicValidMessage.DATA_NOT_BLANK)
+    @ApiModelProperty("监测点索引")
+    private String lineId;
+
+
+    @Max(1)
+    @Min(0)
+    @ApiModelProperty("0-电流 1-电压")
+    private  int type;
+
+    @Max(50)
+    @Min(2)
+    @ApiModelProperty("谐波次数")
+    private  Integer time;
+
+
+
+}

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

@@ -1,5 +1,7 @@
 package com.njcn.harmonic.pojo.po;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.njcn.common.utils.serializer.InstantDateSerializer;
 import lombok.Data;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
@@ -18,6 +20,7 @@ import java.time.Instant;
 public class LimitTarget {
 
     @Column(name = "time")
+    @JsonSerialize(using = InstantDateSerializer.class)
     private Instant time;
 
     @Column(name = "line_id")

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

@@ -1,24 +0,0 @@
-package com.njcn.harmonic.pojo.vo;
-
-import lombok.Data;
-import org.influxdb.dto.QueryResult;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author  denghuajun
- * @date  2022/3/15
- *  存值
- */
-@Data
-public class QueryResultLimitVO implements Serializable {
-    private QueryResult  queryResult;
-    private Float topLimit;
-    private Float lowerLimit;
-    private String lineName;
-    private String targetName;
-    private List<String> phaiscType;
-    private List<String> unit;
-    private Integer harmNum;
-}