代码提交

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

@@ -0,0 +1,64 @@
+package com.njcn.prepare.harmonic.pojo.mysql.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/5/26  15:52【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "r_stat_harmonic_d")
+public class RStatHarmonicDPO {
+    /**
+     * 单位ID
+     */
+    @MppMultiId(value = "org_no")
+    private String orgNo;
+
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    @MppMultiId(value = "data_date")
+    private Date dataDate;
+
+    /**
+     * 监测点类别ID、监测对象类型ID
+     */
+    @MppMultiId(value = "measurement_type_class")
+    private String measurementTypeClass;
+
+    /**
+     * 稳态指标类型Id，字典表ID
+     */
+    @MppMultiId(value = "harmonic_type")
+    private String harmonicType;
+
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @MppMultiId(value = "data_type")
+    private String dataType;
+
+    /**
+     * 超标监测点数
+     */
+    @TableField(value = "over_limit_measurement")
+    private Integer overLimitMeasurement;
+
+    /**
+     * 超标监测点数占比
+     */
+    @TableField(value = "over_limit_measurement_ratio")
+    private Double overLimitMeasurementRatio;
+}

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

@@ -2,7 +2,9 @@ package com.njcn.prepare.harmonic.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+import javax.management.loading.PrivateMLet;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
@@ -16,16 +18,23 @@ import java.util.List;
 @Data
 public class DeviceParam {
 
-    @ApiModelProperty(name = "devId",value = "终端id")
-    private String devId;
 
-    private String updateTime;
-    @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
-    private List<String> lineIds;
+    private List<DeviceDetail> detailList;
 
     @ApiModelProperty(name = "dataDate",value = "时间")
     @NotBlank(message = "报表时间不可为空")
     private String dataDate;
 
-    private String deviceStatus;
+
+    @Data
+    public static class DeviceDetail{
+        @ApiModelProperty(name = "devId",value = "终端id")
+        private String devId;
+
+        private String updateTime;
+        @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
+        private List<String> lineIds;
+
+        private String deviceStatus;
+    }
 }

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

@@ -0,0 +1,31 @@
+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 OrgParam {
+
+    @ApiModelProperty(name = "orgId",value = "单位Id")
+    private String orgId;
+
+    @ApiModelProperty(name = "type",value = "报表类型,1,年，2季，3月，4周，5日")
+    @NotNull(message = "报表类型不可为空")
+    private Integer type;
+
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    @NotBlank(message = "报表时间不可为空")
+    private String dataDate;
+
+
+
+}