Merge remote-tracking branch 'origin/master'

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java

@@ -13,6 +13,8 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
+import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.vo.DoubleUserVO;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import io.swagger.annotations.ApiImplicitParam;
@@ -42,5 +44,13 @@ public interface DistributionMonitorClient {
     @PostMapping("/getDoubleUserByDept")
     HttpResult<List<DoubleUserVO>> getDoubleUserByDept(@RequestParam("orgId")String orgId);
 
+    /**
+     * 获取配网监测点数据
+     * @author cdf
+     * @date 2022/11/29
+     */
+    @PostMapping("distributionMonitorList")
+    HttpResult<List<DistributionMonitor>> distributionMonitorList(@RequestBody List<String> monitorIds);
+
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java

@@ -9,6 +9,7 @@ import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
@@ -58,4 +59,13 @@ public interface MonitorClient {
     HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id);
 
 
+    /**
+     * 获取主网监测点数据
+     * @author cdf
+     * @date 2022/11/29
+     */
+    @PostMapping("getMonitorList")
+    HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds);
+
+
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/DistributionMonitorClientFallbackFactory.java

@@ -9,12 +9,14 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
 import com.njcn.device.pms.pojo.vo.DoubleUserVO;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -45,6 +47,13 @@ public class DistributionMonitorClientFallbackFactory implements FallbackFactory
             }
 
 
+            @Override
+            public HttpResult<List<DistributionMonitor>> distributionMonitorList(List<String> monitorIds) {
+                log.error("{}异常，降级处理，异常为：{}", "获取配网监测点", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+
         };
     }
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java

@@ -10,6 +10,7 @@ import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import feign.hystrix.FallbackFactory;
@@ -54,6 +55,12 @@ public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClie
                 log.error("{}异常，降级处理，异常为：{}", "根据监测点Id获取限值  ", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<Monitor>> getMonitorList(List<String> monitorIds) {
+                log.error("{}异常，降级处理，异常为：{}", "获取主网监测点数据  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java

@@ -22,8 +22,24 @@ public enum PmsDeviceResponseEnum {
     NO_USER_TYPE("A00364","未查询字典用户类型"),
     NO_STATION("A00365","未查询指定电站信息"),
 
+    NO_LINE_SORT("A00366","未查询到字典监测点类别"),
+
     GENERATRIXWIRE_NAME_REPEAT("A00368","同一母线下存在相同名称线路"),
     GENERATRIX_NAME_REPEAT("A00369","同一电站下存在相同名称母线"),
+    POWERGENERATIONUSER_SAME("A00370","发电用户名称或编号重复"),
+    POWERCLINET_SAME("A00371","用电用户名称或编号重复"),
+    WIRE_SAME("A00372","线路编号重复"),
+    GENWIRE_SAME("A00373","母线编号重复"),
+    POWER_CODE_SAME("A00374","台区名称或编号重复"),
+    POWER_CLIENT_DIS_EMPTY("A00375","发电用电用户参数不可为空"),
+
+
+    POWER_CLIENT_NOT_FIND("A00380","查无此用电用户"),
+    POWER_GEN_NOT_FIND("A00381","查无此发电用户"),
+    POWER_DIS_NOT_FIND("A00382","查无此台区信息"),
+    ONE_MONITOR_NOT_FIND("A00383","查无此I类监测点信息"),
+    TWO_MONITOR_NOT_FIND("A00384","查无此II类监测点信息"),
+    THREE_MONITOR_NOT_FIND("A00385","查无此III类监测点信息"),
 
 
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java

@@ -25,26 +25,17 @@ public class DistributionMonitorParam {
     /**
      * 监测点ID
      */
-
+    @ApiModelProperty(value = "监测点类别(字典)")
+    @NotBlank(message = "监测点类别不能为空")
     private String monitorId;
 
-    /**
-     * 电压等级(字典)
-     */
-    private String voltageLevel;
-
-    /**
-     * 是否发电用户：0-否；1-是；
-     */
-    private Boolean ifPowerUser;
-
     /**
      * 监测点状态(字典)
      */
+    @ApiModelProperty(value = "监测点状态(字典)")
+    @NotBlank(message = "监测点状态不能为空")
     private String monitorState;
 
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createdDate;
+    @ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电")
+    private Integer smallType;
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java

@@ -17,6 +17,15 @@ import java.time.LocalDateTime;
 @Data
 public class MonitorParam {
 
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测线路ID
+     */
+    @ApiModelProperty(value = "监测点编号")
+    @NotBlank(message = "监测点编号不可为空")
+    private String id;
+
     /**
      * 监测点名称
      */
@@ -32,6 +41,13 @@ public class MonitorParam {
     @NotBlank(message = "组织机构ID不能为空")
     private String orgId;
 
+    /**
+     * 组织机构名称(外键)
+     */
+    @ApiModelProperty(value = "组织机构名称(外键)")
+    @NotBlank(message = "组织机构名称不能为空")
+    private String orgName;
+
 
     /**
      * 运维单位ID(外键)
@@ -40,6 +56,13 @@ public class MonitorParam {
     @NotBlank(message = "运维单位ID不能为空")
     private String operationId;
 
+    /**
+     * 运维单位名称
+     */
+    @ApiModelProperty(value = "运维单位名称")
+    @NotBlank(message = "运维单位名称不能为空")
+    private String operationName;
+
 
     /**
      * 电站ID(外键)
@@ -49,12 +72,26 @@ public class MonitorParam {
     private String powerrId;
 
     /**
-     * 母线ID(外键)
+     * 电站名称
      */
-    @ApiModelProperty(value = "母线ID(外键)")
-    @NotBlank(message = "母线ID不能为空")
+    @ApiModelProperty(value = "电站名称")
+    @NotBlank(message = "电站名称不能为空")
+    private String powerrName;
+
+    /**
+     * 母线编号(外键)
+     */
+    @ApiModelProperty(value = "母线编号(外键)")
+    @NotBlank(message = "母线编号不能为空")
     private String generatrixId;
 
+    /**
+     * 母线名称
+     */
+    @ApiModelProperty(value = "母线名称")
+    @NotBlank(message = "母线名称不能为空")
+    private String generatrixName;
+
     /**
      * 监测线路名称
      */
@@ -143,8 +180,8 @@ public class MonitorParam {
      * 是否用户专线(字典)
      */
     @ApiModelProperty(value = "是否用户专线(字典)")
-    @NotBlank(message = "是否用户专线不可为空")
-    private String isSpecialSupplyElectricity;
+    @NotNull(message = "是否用户专线不可为空")
+    private Integer isSpecialSupplyElectricity;
 
     /**
      * 监测点标签
@@ -203,16 +240,6 @@ public class MonitorParam {
     private Integer isUpToGrid;
 
 
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdateMonitorParam extends MonitorParam{
 
-        /**
-         * 监测线路ID
-         */
-        @ApiModelProperty(value = "监测点ID")
-        @NotBlank(message = "监测点ID不可为空")
-        private String id;
-    }
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pms.pojo.param;
 
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -65,10 +66,12 @@ public class PmsTerminalParam {
 
     @ApiModelProperty(name = "verificationDate", value = "检定日期")
     @NotBlank(message = "检定日期不能为空")
+    @DateTimeStrValid(message = "检定日期格式有误")
     private String verificationDate;
 
     @ApiModelProperty(name = "useDate", value = "投用日期")
     @NotBlank(message = "投用日期不能为空")
+    @DateTimeStrValid(message = "投用日期格式有误")
     private String useDate;
 
     @ApiModelProperty(name = "inputType", value = "测量信号输入形式")

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java

@@ -39,6 +39,12 @@ public class PowerClientParam {
     @NotBlank(message = "组织机构ID不可为空")
     private String orgId;
 
+    /**
+     * 组织机构名称
+     */
+    @ApiModelProperty(value = " 组织机构名称",required = true)
+    @NotBlank(message = "组织机构名称不可为空")
+    private String orgName;
 
 
     /**
@@ -48,6 +54,13 @@ public class PowerClientParam {
     @NotBlank(message = "运维单位ID不可为空")
     private String operationId;
 
+    /**
+     * 运维单位名称
+     */
+    @ApiModelProperty(value = "运维单位名称",required = true)
+    @NotBlank(message = "运维单位名称不可为空")
+    private String operationName;
+
     /**
      * 用户分类(字典)
      */

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java

@@ -39,6 +39,13 @@ public class PowerGenerationUserParam {
     @NotBlank(message = "组织机构ID不可为空")
     private String orgId;
 
+    /**
+     * 组织名称
+     */
+    @ApiModelProperty(value = "组织名称",required = true)
+    @NotBlank(message = "组织名称不可为空")
+    private String orgName;
+
 
     /**
      * 运维单位ID(外键)
@@ -47,6 +54,13 @@ public class PowerGenerationUserParam {
     @NotBlank(message = "运维单位ID不可为空")
     private String operationId;
 
+    /**
+     * 运维单位名称
+     */
+    @ApiModelProperty(value = "运维单位名称",required = true)
+    @NotBlank(message = "运维单位名称不可为空")
+    private String operationName;
+
     /**
      * 电源类别(字典)
      */

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerUserParam.java

@@ -0,0 +1,20 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author xiaoyao
+ * @version 1.0.0
+ * @createTime 2022/11/30 13:52
+ */
+
+@Data
+public class PowerUserParam {
+    /**
+     * 用户编号
+     */
+    @ApiModelProperty(value = "用户编号",required = true)
+    private String id;
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java

@@ -30,10 +30,14 @@ public class StatationStatParam {
     private String powerName;
 
 
-    @ApiModelProperty(value = "单位组织id",required = true)
-    @NotBlank(message = "单位组织id不可为空")
+    @ApiModelProperty(value = "单位组织编号",required = true)
+    @NotBlank(message = "单位组织编号不可为空")
     private String orgId;
 
+
+    @ApiModelProperty(value = "单位组织名称",required = true)
+    @NotBlank(message = "单位组织名称")
+    private String orgName;
     /**
      * 应设点数量
      */
@@ -48,4 +52,16 @@ public class StatationStatParam {
     @NotBlank(message = "电压等级不可为空")
     private String voltageLevel;
 
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    /**
+     * 维度
+     */
+    @ApiModelProperty(value = "维度")
+    private Double latitude;
+
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TaiZhangDelParam.java

@@ -0,0 +1,25 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/12/5
+ */
+@Data
+public class TaiZhangDelParam {
+    @ApiModelProperty(name = "1.I类监测点 2.II类监测点 3.III类监测")
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+    @ApiModelProperty(name = "监测点集合")
+    @NotEmpty(message = "监测点集合不能为空")
+    private List<String> ids;
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TaiZhangParam.java

@@ -0,0 +1,42 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/11/23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TaiZhangParam extends BaseParam {
+
+    @NotBlank(message = "组织部门编号不可为空")
+    @ApiModelProperty(value = "组织部门编号",required = true)
+    private String orgId;
+
+    @NotNull(message = "数据类型不可为空")
+    @ApiModelProperty(value = "数据类型 0.主网 1.配网",required = true)
+    private Integer dataType;
+
+    @ApiModelProperty(value = "监测点类别(字典 I II III 监测点)" ,required = true)
+    private String lineType;
+
+    @ApiModelProperty(value = "三类监测点小类 0用电 1发电")
+    private Integer treeType;
+
+
+
+
+
+
+
+
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java

@@ -1,74 +1,89 @@
 package com.njcn.device.pms.pojo.param;
 
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 @Data
 public class TractionStationParam {
 
     @ApiModelProperty(name = "id",value = "牵引站编号")
+    @NotBlank(message = "牵引站编号不可为空")
     private String id;
 
-    @ApiModelProperty(name = "Name", value = "牵引站名称")
-    private String Name;
+    @ApiModelProperty(name = "name", value = "牵引站名称")
+    @NotBlank(message = "牵引站名称不可为空")
+    private String name;
 
-    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
-    private String OrgName;
+    @ApiModelProperty(name = "orgName", value = "组织机构名称")
+    @NotBlank(message = "组织机构名称不可为空")
+    private String orgName;
 
-    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
-    private String OrgId;
+    @ApiModelProperty(name = "orgId", value = "组织机构编号")
+    @NotBlank(message = "组织机构编号不可为空")
+    private String orgId;
 
-    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
-    private String OperationName;
+    @ApiModelProperty(name = "operationName", value = "运维单位名称")
+    @NotBlank(message = "运维单位名称不可为空")
+    private String operationName;
 
-    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
-    private String OperationId;
+    @ApiModelProperty(name = "operationId", value = "运维单位编号")
+    @NotBlank(message = "运维单位编号不可为空")
+    private String operationId;
 
-    @ApiModelProperty(name = "VoltageLevel", value = "供电电压等级")
-    private String VoltageLevel;
+    @ApiModelProperty(name = "voltageLevel", value = "供电电压等级")
+    @NotBlank(message = "供电电压等级不可为空")
+    private String voltageLevel;
 
-    @ApiModelProperty(name = "RailwayLineId", value = "铁路线路编号")
-    private String RailwayLineId;
+    @ApiModelProperty(name = "railwayLineId", value = "铁路线路编号")
+    @NotBlank(message = "铁路线路编号不可为空")
+    private String railwayLineId;
 
-    @ApiModelProperty(name = "RailwayLineName", value = "铁路线路名称")
-    private String RailwayLineName;
+    @ApiModelProperty(name = "railwayLineName", value = "铁路线路名称")
+    @NotBlank(message = "铁路线路名称不可为空")
+    private String railwayLineName;
 
-    @ApiModelProperty(name = "ConnetGroupWay", value = "牵引站变压器接线方式")
-    private String ConnetGroupWay;
+    @ApiModelProperty(name = "connetGroupWay", value = "牵引站变压器接线方式")
+    @NotBlank(message = "牵引站变压器接线方式不可为空")
+    private String connetGroupWay;
 
-    @ApiModelProperty(name = "RatedCapacity", value = "牵引站变电容量")
-    private Float RatedCapacity;
+    @ApiModelProperty(name = "ratedCapacity", value = "牵引站变电容量")
+    @NotNull(message = "牵引站变电容量不可为空")
+    private Float ratedCapacity;
 
-    @ApiModelProperty(name = "PowerId", value = "供电变电站编号")
-    private String PowerId;
+    @ApiModelProperty(name = "powerId", value = "供电变电站编号")
+    @NotBlank(message = "供电变电站编号不可为空")
+    private String powerId;
 
-    @ApiModelProperty(name = "PowerName", value = "供电变电站名称")
-    private String PowerName;
+    @ApiModelProperty(name = "powerName", value = "供电变电站名称")
+    @NotBlank(message = "供电变电站名称不可为空")
+    private String powerName;
 
-    @ApiModelProperty(name = "PowerVoltageLevel", value = "供电变电站电压等级")
-    private String PowerVoltageLevel;
+    @ApiModelProperty(name = "powerVoltageLevel", value = "供电变电站电压等级")
+    @NotBlank(message = "供电变电站电压等级不可为空")
+    private String powerVoltageLevel;
 
-    @ApiModelProperty(name = "IfSpecial", value = "是否专线供电：0-否;1-是;")
-    private Integer IfSpecial;
+    @ApiModelProperty(name = "ifSpecial", value = "是否专线供电：0-否;1-是;")
+    @NotNull(message = "是否专线供电")
+    private Integer ifSpecial;
 
-    @ApiModelProperty(name = "CreatedDate", value = "创建日期")
-    private String CreatedDate;
+    @ApiModelProperty(name = "createdDate", value = "创建日期")
+    @NotBlank(message = "创建日期不可为空")
+    @DateTimeStrValid(format = "yyyy-MM-dd",message = "创建日期格式有误")
+    private String createdDate;
 
-    @ApiModelProperty(name = "UserTag", value = "用户标签")
-    private String UserTag;
+    @ApiModelProperty(name = "userTag", value = "用户标签")
+    @NotBlank(message = "用户标签不可为空")
+    private String userTag;
 
-    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
-    private Integer IsUpToGrid;
+    @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    @NotNull(message = "是否是上送国网监测点不可为空")
+    private Integer isUpToGrid;
 
-    /**
-     * 查询数据实体
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class QueryParam extends BaseParam {
 
-        private Integer Status;
-    }
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java

@@ -43,7 +43,7 @@ public class DistributionMonitor extends BaseEntity {
     /**
      * 是否发电用户：0-否；1-是；
      */
-    private Boolean ifPowerUser;
+    private Integer ifPowerUser;
 
     /**
      * 监测点状态(字典)
@@ -58,7 +58,7 @@ public class DistributionMonitor extends BaseEntity {
     /**
      * 数据状态：0-删除；1-正常；
      */
-    private Boolean status;
+    private Integer status;
 
 
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java

@@ -135,7 +135,7 @@ public class Monitor extends BaseEntity {
     /**
      * 是否用户专线(字典)
      */
-    private String isSpecialSupplyElectricity;
+    private Integer isSpecialSupplyElectricity;
 
     /**
      * 监测点标签

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import lombok.Data;
@@ -42,6 +43,11 @@ public class StatationStat extends BaseEntity {
      */
     private String orgId;
 
+    /**
+     * 机构组织名称
+     */
+    private String orgName;
+
     /**
      * 应设点数量
      */
@@ -52,10 +58,20 @@ public class StatationStat extends BaseEntity {
      */
     private String voltageLevel;
 
+    /**
+     * 经度
+     */
+    private Double longitude;
+
+    /**
+     * 维度
+     */
+    private Double latitude;
+
     /**
      * 数据状态：0-删除；1-正常；
      */
-    private Boolean status;
+    private Integer status;
 
 
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java

@@ -3,6 +3,7 @@ package com.njcn.device.pms.pojo.po;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import lombok.Data;
@@ -103,7 +104,7 @@ public class TractionStation extends BaseEntity {
     /**
      * 创建日期
      */
-    private LocalDateTime createdDate;
+    private LocalDate createdDate;
 
     /**
      * 用户标签
@@ -120,25 +121,7 @@ public class TractionStation extends BaseEntity {
      */
     private Integer status;
 
-    /**
-     * 创建用户
-     */
-    private String createBy;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新用户
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsPowerTreeMonitorVO.java

@@ -0,0 +1,219 @@
+package com.njcn.device.pms.pojo.vo;
+
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/11/25
+ */
+@Data
+public class PmsPowerTreeMonitorVO {
+
+    private static final long serialVersionUID = 1L;
+
+
+    //公共
+    /**
+     * 用户编号
+     */
+    private String id;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 并网电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 供电变电站(外键)
+     */
+    private String powerStationId;
+
+    /**
+     * 供电线路(外键)
+     */
+    private String lineId;
+
+    /**
+     * 供电台区(外键)
+     */
+    private String platformId;
+
+    /**
+     * 用户标签
+     */
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+
+
+
+
+
+
+
+
+
+    
+
+    //用电用户
+
+    /**
+     * 用户分类(字典)
+     */
+    private String userType;
+
+    /**
+     * 行业分类(字典)
+     */
+    private String industryType;
+
+    /**
+     * 用电类别(字典)
+     */
+    private String electricityType;
+
+    /**
+     * 合同容量
+     */
+    private Float contractCapacity;
+
+    /**
+     * 运行容量
+     */
+    private Float operatingCapacity;
+
+    /**
+     * 生产班次(字典)
+     */
+    private String productionShift;
+
+    /**
+     * 负荷性质(字典)
+     */
+    private String loadNature;
+
+
+
+    /**
+     * 高耗能行业类别(字典)
+     */
+    private String highIndustryType;
+
+    /**
+     * 送电日期
+     */
+    private LocalDate powerTransmissionDate;
+
+    /**
+     * 重要性等级(字典)
+     */
+    private String importanceLevel;
+
+    /**
+     * 用电客户状态(字典)
+     */
+    private String eccStat;
+
+    /**
+     * 是否敏感用户：0-否；1：是；
+     */
+    private Integer ifSensitiveUser;
+
+    /**
+     * 是否影响电能质量：0-否；1：是；
+     */
+    private Integer ifPowerQuality;
+
+    /**
+     * 是否重要客户：0-否；1：是；
+     */
+    private Integer ifKeyCustomers;
+
+    /**
+     * 敏感用户类别(字典)
+     */
+    private String sensitiveType;
+
+
+
+
+
+
+
+
+
+    //发电
+    /**
+     * 电源类别(字典)
+     */
+    private String powerCategory;
+
+    /**
+     * 电站类型(字典)
+     */
+    private String powerStationType;
+
+    /**
+     * 发电方式(字典)
+     */
+    private String powerGenerationMode;
+
+
+    /**
+     * 总装机容量
+     */
+    private Float sourceCapacity;
+
+    /**
+     * 并网日期
+     */
+    private LocalDate connectionDate;
+
+    /**
+     * 能源消纳方式(字典)
+     */
+    private String connectionMode;
+
+    /**
+     * 客户状态(字典)
+     */
+    private String gcStat;
+
+
+
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java

@@ -42,6 +42,9 @@ public class ROperatingIndexCommonVO {
 
     @ApiModelProperty(name = " transitMeasurementRate", value = "在线监测率")
     private Double transitMeasurementRate;
+
+    @ApiModelProperty(name = "onlineMeasurementPoints", value = "监测终端数")
+    private Integer onlineMeasurementPoints;
     /**
      * 在线终端数
      */

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAlarmDetailVO.java

@@ -0,0 +1,47 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 告警明细(主配网)
+ * @Title RStatAlarmDetailVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-11-23 19:51
+ * @Version V1.0
+ */
+@Data
+public class RStatAlarmDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "measurementPointId", value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+    /**
+     * 告警类型
+     */
+    @ApiModelProperty(name = "alarmType", value = "告警类型(字典)")
+    private String alarmType;
+
+    /**
+     * 告警描述
+     */
+    @ApiModelProperty(name = "alarmInfo", value = "告警描述")
+    private String alarmInfo;
+
+    /**
+     * 告警持续时间
+     */
+    @ApiModelProperty(name = "alarmLastTime", value = "告警持续时间")
+    private Double alarmLastTime;
+
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java

@@ -28,7 +28,17 @@ public class StatationStatVO implements Serializable {
 
     @ApiModelProperty(name = "voltageLevel", value = "电压等级")
     private String voltageLevel;
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
 
+    /**
+     * 维度
+     */
+    @ApiModelProperty(value = "维度")
+    private Double latitude;
 
 
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RMpPwAlarmDetailDController.java

@@ -0,0 +1,47 @@
+package com.njcn.device.pms.controller.distribution;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam;
+import com.njcn.device.pms.pojo.vo.RStatAlarmDetailVO;
+import com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO;
+import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RMpPwAlarmDetailDController
+ * @Package com.njcn.device.pms.controller.distribution
+ * @Author jianghaifei
+ * @Date 2022-11-23 19:46
+ * @Version V1.0
+ */
+@RestController
+@RequestMapping("/rMpPwAlarmDetail")
+@Api(tags = "告警明细")
+@RequiredArgsConstructor
+public class RMpPwAlarmDetailDController extends BaseController {
+
+    private final RMpPwAlarmDetailDService rMpPwAlarmDetailDService;
+
+    @PostMapping("getAllAlarmDetailList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("告警明细查看(主配网)")
+    public HttpResult<List<RStatAlarmDetailVO>> getAllAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
+        String methodDescribe = getMethodDescribe("getAllAlarmDetailList");
+        List<RStatAlarmDetailVO> list = rMpPwAlarmDetailDService.getAllAlarmDetailList(rStatPwAlarmDetailParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java

@@ -3,22 +3,22 @@ package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
-import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
 import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.TaiZhangDelParam;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
 import com.njcn.device.pms.pojo.vo.DoubleUserVO;
 import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import com.njcn.web.controller.BaseController;
@@ -47,12 +47,33 @@ public class DistributionMonitorController extends BaseController {
      * @author cdf
      * @date 2022/10/26
      */
-    @PostMapping
+    @PostMapping("addDistributionMonitor")
     @ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true)
-    public HttpResult<Boolean> addDistributionMonitor(@RequestBody DistributionMonitorParam distributionMonitorParam){
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @ApiOperation("新增配网监测点")
+    public HttpResult<Boolean> addDistributionMonitor(@RequestBody @Validated DistributionMonitorParam distributionMonitorParam){
         String methodDescribe = getMethodDescribe("addDistributionMonitor");
-
+        boolean res= iDistributionMonitorService.addDistributionMonitor(distributionMonitorParam);
+        if(res){
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+    /**
+     * 获取配网监测点
+     * @author cdf
+     * @date 2022/11/29
+     */
+    @PostMapping("distributionMonitorList")
+    @ApiImplicitParam(name = "disMonitorIds",value = "配网监测点编号",required = true)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网监测点")
+    public HttpResult<List<DistributionMonitor>> distributionMonitorList(@RequestBody List<String> disMonitorIds){
+        String methodDescribe = getMethodDescribe("distributionMonitorList");
+        List<DistributionMonitor> res = iDistributionMonitorService.distributionMonitorList(disMonitorIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
     }
 
 
@@ -77,6 +98,27 @@ public class DistributionMonitorController extends BaseController {
 
 
 
+    /**
+     * 删除配网监测点
+     * @author cdf
+     * @date 2022/12/5
+     */
+
+    @PostMapping("delDistributionMonitor")
+    @ApiImplicitParam(name = "taiZhangDelParam",value = "配网监测点实体",required = true)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
+    @ApiOperation("删除配网监测点")
+    public HttpResult<Boolean> delDistributionMonitor(@RequestBody @Validated TaiZhangDelParam taiZhangDelParam){
+        String methodDescribe = getMethodDescribe("delDistributionMonitor");
+        boolean res= iDistributionMonitorService.delDistributionMonitor(taiZhangDelParam);
+        if(res){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
 
 }
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -12,11 +13,13 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
 import com.njcn.device.pms.pojo.param.MonitorParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
 import com.njcn.device.pms.service.majornetwork.IMonitorService;
 
 import com.njcn.device.pq.pojo.po.Overlimit;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -105,6 +109,62 @@ public class MonitorController extends BaseController {
 
 
 
+    /**
+     * 分页获取所有主网监测点
+     * @author cdf
+     * @date 2022/11/25
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAllMonitorPageList")
+    @ApiOperation("分页获取所有主网监测点")
+    @ApiImplicitParam(name = "baseParam",required = true)
+    public HttpResult<Page<Monitor>> getAllMonitorPageList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getAllMonitorList");
+        Page<Monitor> monitor= monitorService.getAllMonitorPageList(baseParam);
+        if (Objects.isNull(monitor)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
+        }
+    }
+
+    /**
+     * 获取所有主网监测点
+     * @author cdf
+     * @date 2022/11/29
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getMonitorList")
+    @ApiOperation("获取所有主网监测点(或者指定监测点编号查询)")
+    @ApiImplicitParam(name = "monitorIds",value = "主网监测点编号",required = true)
+    public HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds) {
+        String methodDescribe = getMethodDescribe("getAllMonitorList");
+        List<Monitor> monitor= monitorService.getMonitorList(monitorIds);
+        if (Objects.isNull(monitor)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
+        }
+    }
+
+    /**
+     * 根据条件获取所有主网监测点
+     * @author cdf
+     * @date 2022/11/29
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getMonitorListByParam")
+    @ApiOperation("根据条件获取所有主网监测点")
+    @ApiImplicitParam(name = "monitorParam",value = "查询参数体",required = true)
+    public HttpResult<List<Monitor>> getMonitorListByParam(@RequestBody MonitorParam monitorParam) {
+        String methodDescribe = getMethodDescribe("getMonitorListByParam");
+        List<Monitor> monitor= monitorService.getMonitorListByParam(monitorParam);
+        if (Objects.isNull(monitor)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
+        }
+    }
 
 
 
@@ -112,7 +172,7 @@ public class MonitorController extends BaseController {
     @PostMapping("/addMonitor")
     @ApiOperation("新增主网监测点")
     @ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
-    public HttpResult<Boolean> addMonitor(@RequestBody MonitorParam monitorParam) {
+    public HttpResult<Boolean> addMonitor(@RequestBody @Validated MonitorParam monitorParam) {
         String methodDescribe = getMethodDescribe("addMonitor");
         boolean result = monitorService.addMonitor(monitorParam);
         if(result){
@@ -126,7 +186,7 @@ public class MonitorController extends BaseController {
     @PostMapping("/updateMonitor")
     @ApiOperation("修改主网监测点")
     @ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
-    public HttpResult<Boolean> updateMonitor(@RequestBody MonitorParam.UpdateMonitorParam monitorParam) {
+    public HttpResult<Boolean> updateMonitor(@RequestBody MonitorParam monitorParam) {
         String methodDescribe = getMethodDescribe("updateMonitor");
         boolean result = monitorService.updateMonitor(monitorParam);
         if(result){

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsStatationStatController.java

@@ -40,9 +40,9 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/pms/statationStat")
 @Slf4j
-@Api(tags = "变电站统计")
+@Api(tags = "台账-变电站")
 @RequiredArgsConstructor
-public class StatationStatController extends BaseController {
+public class PmsStatationStatController extends BaseController {
 
     private final IStatationStatService statationStatService;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsTerminalController.java

@@ -47,7 +47,7 @@ public class PmsTerminalController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("getTerminalList")
-    @ApiOperation("查询监测终端台账所有信息")
+    @ApiOperation("分页查询监测终端台账所有信息")
     @ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true)
     public HttpResult<Page<PmsTerminal>> getTerminalList(@RequestBody @Validated BaseParam baseParam){
         String methodDescribe = getMethodDescribe("getTerminalList");
@@ -56,6 +56,15 @@ public class PmsTerminalController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("getTerminalSelectList")
+    @ApiOperation("查询监测终端台账所有信息")
+    public HttpResult<List<PmsTerminal>> getTerminalSelectList(){
+        String methodDescribe = getMethodDescribe("getTerminalSelectList");
+        List<PmsTerminal> res = iTerminalService.getTerminalSelectList();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getTerminalById")
     @ApiOperation("根据ID查询监测终端台账数据")

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsTractionStationController.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -37,23 +38,33 @@ import java.util.Objects;
 @Slf4j
 @RestController
 @RequestMapping("/pms/tractionStation")
-@Api(tags = "牵引站信息")
+@Api(tags = "台账-牵引站信息")
 @RequiredArgsConstructor
 @Validated
-public class TractionStationController extends BaseController {
+public class PmsTractionStationController extends BaseController {
 
     private final ITractionStationService iTractionStationService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getTractionStationList")
     @ApiOperation("获取牵引站列表")
-    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
-    public HttpResult<List<TractionStation>> getTractionStationList(@RequestBody BaseParam baseParam) {
+    public HttpResult<List<TractionStation>> getTractionStationList() {
         String methodDescribe = getMethodDescribe("getTractionStationList");
-        List<TractionStation> result = iTractionStationService.getTractionStationList(baseParam);
+        List<TractionStation> result = iTractionStationService.getTractionStationList();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getTractionStationPageList")
+    @ApiOperation("分页获取牵引站列表")
+    @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
+    public HttpResult<Page<TractionStation>> getTractionStationPageList(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("getTractionStationPageList");
+        Page<TractionStation> result = iTractionStationService.getTractionStationPageList(baseParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/getTractionStationById")
     @ApiOperation("根据id获取牵引站信息")

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java

@@ -9,6 +9,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.PowerClientParam;
+import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.device.pms.service.majornetwork.IPowerClientService;
 import com.njcn.web.pojo.param.BaseParam;
@@ -99,9 +100,9 @@ public class PowerClientController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPowerClientList")
     @ApiOperation("获取用电用户列表")
-    public HttpResult<List<PowerClient>> getPowerClientList() {
+    public HttpResult<List<PowerClient>> getPowerClientList(@RequestBody PowerClientParam powerClientParam) {
         String methodDescribe = getMethodDescribe("getPowerClientList");
-        List<PowerClient> result = iPowerClientService.getPowerClientList();
+        List<PowerClient> result = iPowerClientService.getPowerClientList(powerClientParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -115,5 +116,16 @@ public class PowerClientController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPowerUtilizationUserList")
+    @ApiOperation("获取用户列表")
+    @ApiImplicitParam(name = "powerUserParam", value = "参数", required = true)
+    public HttpResult<List<PowerClient>> getPowerUtilizationUserList(@RequestBody PowerUserParam powerUserParam) {
+        String methodDescribe = getMethodDescribe("getPowerUtilizationUserList");
+        List<PowerClient> result = iPowerClientService.getPowerUtilizationUserList(powerUserParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+
+    }
+
 }
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java

@@ -38,7 +38,7 @@ import java.util.Objects;
 @Slf4j
 @RestController
 @RequestMapping("/pms/powerDistributionarea")
-@Api(tags = "台区信息")
+@Api(tags = "台账-台区信息")
 @RequiredArgsConstructor
 @Validated
 public class PowerDistributionareaController extends BaseController {
@@ -47,7 +47,7 @@ public class PowerDistributionareaController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("getPowerDistributionAreaList")
-    @ApiOperation("查询台区所有信息")
+    @ApiOperation("分页查询台区所有信息")
     @ApiImplicitParam(name = "baseParam",value = "查询台区信息",required = true)
     public HttpResult<Page<PowerDistributionarea>> getList(@RequestBody @Validated BaseParam baseParam){
         String methodDescribe = getMethodDescribe("getList");
@@ -56,6 +56,15 @@ public class PowerDistributionareaController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("getPowerDistributionList")
+    @ApiOperation("查询台区所有信息")
+    public HttpResult<List<PowerDistributionarea>> getPowerDistributionList(@RequestBody PowerDistributionareaParam powerDistributionareaParam){
+        String methodDescribe = getMethodDescribe("getPowerDistributionList");
+        List<PowerDistributionarea> res = iPowerDistributionareaService.getPowerDistributionList(powerDistributionareaParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
+    }
+
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getPowerDistributionAreaById")

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java

@@ -8,7 +8,9 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
 import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerGenerationUser;
 import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
 import com.njcn.web.pojo.param.BaseParam;
@@ -34,7 +36,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/pms/powerGenerationUser")
-@Api(tags = "发电用户")
+@Api(tags = "台账-发电用户")
 @RequiredArgsConstructor
 public class PowerGenerationUserController extends BaseController {
 
@@ -99,9 +101,9 @@ public class PowerGenerationUserController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPowerGenerationUserList")
     @ApiOperation("获取发电用户列表")
-    public HttpResult<List<PowerGenerationUser>> getPowerGenerationUserList() {
+    public HttpResult<List<PowerGenerationUser>> getPowerGenerationUserList(@RequestBody PowerDistributionareaParam powerDistributionareaParam) {
         String methodDescribe = getMethodDescribe("getPowerGenerationUserList");
-        List<PowerGenerationUser> result = iPowerGenerationUserService.getPowerGenerationUserList();
+        List<PowerGenerationUser> result = iPowerGenerationUserService.getPowerGenerationUserList(powerDistributionareaParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -115,5 +117,15 @@ public class PowerGenerationUserController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getGenerateElectricityUserList")
+    @ApiOperation("获取用户列表")
+    @ApiImplicitParam(name = "powerUserParam", value = "参数", required = true)
+    public HttpResult<List<PowerGenerationUser>> getGenerateElectricityUserList(@RequestBody PowerUserParam powerUserParam) {
+        String methodDescribe = getMethodDescribe("getGenerateElectricityUserList");
+        List<PowerGenerationUser> result = iPowerGenerationUserService.getGenerateElectricityUserList(powerUserParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
 }
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalEliminateDataController.java

@@ -1,14 +1,37 @@
 package com.njcn.device.pms.controller.majornetwork;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.TaiZhangParam;
+import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.po.PowerDistributionarea;
+import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
+import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
+import com.njcn.device.pms.service.majornetwork.ITerminalEliminateDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 import com.njcn.web.controller.BaseController;
 
+import java.util.List;
+
 /**
  * <p>
- *  前端控制器
+ *  台账操作界面
  * </p>
  *
  * @author hongawen
@@ -16,7 +39,59 @@ import com.njcn.web.controller.BaseController;
  */
 @RestController
 @RequestMapping("/pms/terminalEliminateData")
+@Slf4j
+@RequiredArgsConstructor
+@Api(tags = "台账-台账操作界面")
 public class TerminalEliminateDataController extends BaseController {
 
+    private final ITerminalEliminateDataService iTerminalEliminateDataService;
+
+    /**
+     * 根据组织部门获取自身以及子部门的主网或配网监测点(I类监测点)
+     * @author cdf
+     * @date 2022/11/23
+     */
+    @PostMapping("getOneMonitorByOrgId")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation(value = "(I类监测点)根据组织部门获取自身以及子部门的主网或配网监测点")
+    @ApiImplicitParam(name = "taiZhangParam",value = "台账查询参数",required = true)
+    public HttpResult<Page<Monitor>> getOneMonitorByOrgId(@RequestBody @Validated TaiZhangParam taiZhangParam){
+        String methodDescribe = getMethodDescribe("getOneMonitorByOrgId");
+        Page<Monitor> page = iTerminalEliminateDataService.getOneMonitorByOrgId(taiZhangParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    /**
+     * 根据组织部门获取自身以及子部门的主网或配网监测点
+     * @author cdf
+     * @date 2022/11/23
+     */
+    @PostMapping("getTwoMonitorByOrgId")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation(value = "(II类监测点)根据组织部门获取自身以及子部门的配网监测点")
+    @ApiImplicitParam(name = "taiZhangParam",value = "台账查询参数",required = true)
+    public HttpResult<Page<PowerDistributionarea>> getTwoMonitorByOrgId(@RequestBody @Validated TaiZhangParam taiZhangParam){
+        String methodDescribe = getMethodDescribe("getOneMonitorByOrgId");
+        Page<PowerDistributionarea> page = iTerminalEliminateDataService.getTwoMonitorByOrgId(taiZhangParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    /**
+     * (III类监测点用电用户)根据组织部门获取自身以及子部门的主网或配网监测点
+     * @author cdf
+     * @date 2022/11/25
+     */
+    @PostMapping("getThreeYongMonitorByOrgId")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation(value = "(III类监测点)根据组织部门获取自身以及子部门的配网监测点")
+    @ApiImplicitParam(name = "taiZhangParam",value = "台账查询参数",required = true)
+    public HttpResult<Page<PmsPowerTreeMonitorVO>> getThreeYongMonitorByOrgId(@RequestBody @Validated TaiZhangParam taiZhangParam){
+        String methodDescribe = getMethodDescribe("getThreeYongMonitorByOrgId");
+        Page<PmsPowerTreeMonitorVO> page = iTerminalEliminateDataService.getThreeMonitorByOrgId(taiZhangParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+
+
 }
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/DistributionMonitorMapper.java

@@ -1,10 +1,16 @@
 package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.TaiZhangParam;
 import com.njcn.device.pms.pojo.po.DistributionMonitor;
+import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.po.PowerDistributionarea;
 import com.njcn.device.pms.pojo.vo.DoubleUserVO;
+import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -33,5 +39,28 @@ public interface DistributionMonitorMapper extends BaseMapper<DistributionMonito
      */
     List<DoubleUserVO> getDoubleUserByDept(@Param("orgId")String orgId);
 
+    /**
+     * 获取I类配网监测点
+     * @author cdf
+     * @date 2022/11/25
+     */
+    Page<Monitor> getMonitorByOrg(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam,@Param("deptIds")List<String> deptIds);
+
+    /**
+     * 获取II类配网监测点
+     * @author cdf
+     * @date 2022/11/25
+     */
+    Page<PowerDistributionarea> getPowerDisAreaMonitorByOrg(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam, @Param("deptIds")List<String> deptIds);
+
+    /**
+     * 获取III类配网监测点
+     * @author cdf
+     * @date 2022/11/25
+     */
+    Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgIdYong(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam, @Param("deptIds")List<String> deptIds);
+
+    Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgIdFa(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam, @Param("deptIds")List<String> deptIds);
+
 
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java

@@ -4,6 +4,7 @@ package com.njcn.device.pms.mapper.majornetwork;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pms.pojo.po.Generatrix;
 import com.njcn.device.pms.pojo.po.PowerDistributionarea;
 import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
 import com.njcn.system.pojo.vo.EventTemplateVO;
@@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
- *  Mapper 接口
+ *  Mapper 台区
  * </p>
  *
  * @author hongawen
@@ -20,4 +21,13 @@ import org.apache.ibatis.annotations.Param;
 public interface PowerDistributionareaMapper extends BaseMapper<PowerDistributionarea> {
 
     Page<PowerDistributionareaVO> page(@Param("page")Page<PowerDistributionareaVO> page, @Param("ew") QueryWrapper<PowerDistributionareaVO> queryWrapper);
+
+
+    /**
+     * 获取台区电压等级（使用台区所属母线电压等级）
+     * @param distribution 台区编号
+     * @author cdf
+     * @date 2022/11/28
+     */
+    Generatrix getGeneratrixByDistributionId(@Param("distribution") String distribution);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml

@@ -47,9 +47,69 @@
             where fa.org_id = #{orgId}
             and dis.status = 1
         )
-
-
-
-
     </select>
+
+    <select id="getMonitorByOrg" resultType="Monitor">
+        select a.* from pms_monitor a
+            inner join pms_distribution_monitor b on a.id = b.Monitor_Id
+                                                  and b.Monitor_Sort = #{taiZhangParam.lineType}
+        where a.org_id in
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
+            and a.name like concat('%',#{taiZhangParam.searchValue},'%')
+        </if>
+        and a.status = 1
+    </select>
+
+    <select id="getPowerDisAreaMonitorByOrg" resultType="PowerDistributionarea">
+        select a.* from pms_power_distributionarea a
+        inner join pms_distribution_monitor b on a.id = b.Monitor_Id
+                                                     and b.Monitor_Sort = #{taiZhangParam.lineType}
+        where a.org_id in
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+          <if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
+              and a.name like concat('%',#{taiZhangParam.searchValue},'%')
+          </if>
+        and a.status = 1
+    </select>
+
+
+    <select id="getThreeMonitorByOrgIdYong" resultType="PmsPowerTreeMonitorVO">
+
+            select yong.*,0 as type
+            from pms_power_client yong
+            inner join pms_distribution_monitor dis on yong.id = dis.Monitor_Id and dis.If_Power_User = 0
+            where yong.org_id in
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
+            and yong.name like concat('%',#{taiZhangParam.searchValue},'%')
+        </if>
+              and dis.status = 1
+    </select>
+
+
+    <select id="getThreeMonitorByOrgIdFa" resultType="PmsPowerTreeMonitorVO">
+        select fa.*,1 as type
+        from pms_power_generation_user fa
+        inner join pms_distribution_monitor dis
+        on fa.id = dis.Monitor_Id
+        and dis.If_Power_User = 1
+        where fa.org_id in
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
+            and fa.name like concat('%',#{taiZhangParam.searchValue},'%')
+        </if>
+        and dis.status = 1
+    </select>
+
+
+
 </mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml

@@ -7,4 +7,12 @@
         FROM pms_power_distributionarea pms_power_distributionarea
         WHERE ${ew.sqlSegment}
     </select>
+
+    <select id="getGeneratrixByDistributionId" resultType="Generatrix">
+        select c.*  from pms_power_distributionarea a
+        inner join pms_generatrix_wire b on a.Line_Id = b.Wire_Id
+        inner join pms_generatrix c on b.Generatrix_Id = c.Generatrix_Id
+        where a.id = #{distribution}
+        and a.status = 1
+    </select>
 </mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RMpPwAlarmDetailDService.java

@@ -1,7 +1,12 @@
 package com.njcn.device.pms.service.distribution;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam;
 import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
+import com.njcn.device.pms.pojo.vo.RStatAlarmDetailVO;
+
+import java.util.List;
 
 /**
 * @author jianghf
@@ -10,4 +15,5 @@ import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
 */
 public interface RMpPwAlarmDetailDService extends IService<RMpPwAlarmDetailD> {
 
+    List<RStatAlarmDetailVO> getAllAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityCheckServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.service.distribution.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pms.mapper.distribution.PwDataQualityCheckMapper;
@@ -65,17 +66,17 @@ public class PwDataQualityCheckServiceImpl implements PwDataQualityCheckService
         // 创建集合封装返回数据
         List<PwRStatAccountCheckDataVO> result = new ArrayList<>();
         // 获取配网数据质量-台帐类数据质量核查
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 result = pwDataQualityCheckMapper.getYearInfo(deptIds, param, distributionPoint);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 result = pwDataQualityCheckMapper.getSeasonInfo(deptIds, param, distributionPoint);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 result = pwDataQualityCheckMapper.getMonthInfo(deptIds, param, distributionPoint);
                 break;
             default:
@@ -114,17 +115,17 @@ public class PwDataQualityCheckServiceImpl implements PwDataQualityCheckService
         // 创建集合封装返回数据
         List<RStatTargetCheckDataVO> result = new ArrayList<>();
         // 获取配网数据质量-监测指标数据质量核查
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 result = pwRStatTargetCheckDataMapper.getYearInfo(deptIds, param, distributionPoint);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 result = pwRStatTargetCheckDataMapper.getSeasonInfo(deptIds, param, distributionPoint);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 result = pwRStatTargetCheckDataMapper.getMonthInfo(deptIds, param, distributionPoint);
                 break;
             default:

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityStatServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.service.distribution.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
@@ -106,19 +107,19 @@ public class PwDataQualityStatServiceImpl implements PwDataQualityStatService {
         // 创建集合封装数据
         List<PwRDnOperatingVO> result = new ArrayList<>();
         // 日期条件
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 result = rOperatingIndexMapper.getYearInfo(param,
                         data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()));
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 result = rOperatingIndexMapper.getSeasonInfo(param,
                         data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()));
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 result = rOperatingIndexMapper.getMonthInfo(param,
                         data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()));
                 break;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java

@@ -1,18 +1,123 @@
 package com.njcn.device.pms.service.distribution.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.dto.SimpleDTO;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.mapper.distribution.RMpPwAlarmDetailDMapper;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
+import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam;
+import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
+import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
+import com.njcn.device.pms.pojo.vo.RStatAlarmDetailVO;
+import com.njcn.device.pms.service.distribution.IPwMonitorService;
 import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService;
+import com.njcn.device.pms.service.majornetwork.IMonitorService;
+import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.utils.RequestUtil;
+import com.njcn.web.utils.WebUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
 * @author jianghf
 * @description 针对表【r_mp_pw_alarm_detail_d】的数据库操作Service实现
 * @createDate 2022-10-17 09:00:27
 */
 @Service
+@RequiredArgsConstructor
 public class RMpPwAlarmDetailDServiceImpl extends ServiceImpl<RMpPwAlarmDetailDMapper, RMpPwAlarmDetailD>
 implements RMpPwAlarmDetailDService{
 
+    private final IPmsGeneralDeviceService generalPmsDeviceService;
+
+    private final IPwMonitorService iPwMonitorService;  //【配网监测点】
+
+    private final IMonitorService iMonitorService; //【主网监测点】服务类
+
+    @Override
+    public List<RStatAlarmDetailVO> getAllAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
+        //提取参数
+        String startTime = rStatPwAlarmDetailParam.getStartTime(); //开始时间
+        String endTime = rStatPwAlarmDetailParam.getEndTime(); //结束时间
+        //获取登录人当前部门
+        String deptIndex = RequestUtil.getDeptIndex();
+//        String deptIndex = "5699e5916a18a6381e1ac92da5bd2628";
+
+        PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam();
+        pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
+        pmsDeviceInfoParam.setDeptIndex(deptIndex);
+        //主网监测点id集合
+        ArrayList<String> zwMonitorIds = new ArrayList<>();
+        //获取主网台账信息
+        List<PmsGeneralDeviceDTO> pmsDeviceInfoWithInOrg = generalPmsDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam);
+        pmsDeviceInfoWithInOrg.forEach(item -> {
+            zwMonitorIds.addAll(item.getMonitorIdList());
+        });
+
+        //查询主网监测点信息
+        LambdaQueryWrapper<Monitor> zwMonitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        zwMonitorLambdaQueryWrapper.in(CollUtil.isNotEmpty(zwMonitorIds), Monitor::getId, zwMonitorIds);
+        //主网监测点集合
+        List<Monitor> zwMonitorList = iMonitorService.list(zwMonitorLambdaQueryWrapper);
+        Map<String, Monitor> zwMonitorMap = zwMonitorList.stream().collect(Collectors.toMap(Monitor::getId, item -> item));
+
+        //获取配网监测点
+        PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
+        pwPmsMonitorParam.setOrgId(deptIndex); //单位id
+        List<PwPmsMonitorDTO> pwMonitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam);
+        //配网监测点id集合
+        List<String> pwMonitorIds = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
+        //配网监测点Map集合
+        Map<String, PwPmsMonitorDTO> pwMonitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, item -> item));
+
+
+        //合并主网配网监测点id集合（并去重）
+        ArrayList<String> allMonitorIds = new ArrayList<>();
+        allMonitorIds.addAll(zwMonitorIds);
+        allMonitorIds.addAll(pwMonitorIds);
+        if (CollUtil.isEmpty(allMonitorIds)) {
+            return new ArrayList<>();
+        }
+        //查询告警明细
+        LambdaQueryWrapper<RMpPwAlarmDetailD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(RMpPwAlarmDetailD::getMeasurementPointId, allMonitorIds)
+                .ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime)
+                .le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime);
+        List<RMpPwAlarmDetailD> list = this.list(lambdaQueryWrapper);
+
+        List<RStatAlarmDetailVO> resultList = list.stream().map(item -> {
+            RStatAlarmDetailVO rStatAlarmDetailVO = new RStatAlarmDetailVO();
+            BeanUtils.copyProperties(item, rStatAlarmDetailVO); //监测点id、告警类型、告警描述、告警持续时间
+
+            //监测点名称
+            if (zwMonitorMap.containsKey(item.getMeasurementPointId())) {
+                rStatAlarmDetailVO.setMeasurementPointName(zwMonitorMap.get(item.getMeasurementPointId()).getName());
+            } else if (pwMonitorMap.containsKey(item.getMeasurementPointId())) {
+                rStatAlarmDetailVO.setMeasurementPointName(pwMonitorMap.get(item.getMeasurementPointId()).getMonitorName());
+            } else {
+                rStatAlarmDetailVO.setMeasurementPointName("/");
+            }
+
+            return rStatAlarmDetailVO;
+        }).collect(Collectors.toList());
+        return resultList;
+    }
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java

@@ -2,7 +2,9 @@ package com.njcn.device.pms.service.majornetwork;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.param.TaiZhangDelParam;
 import com.njcn.device.pms.pojo.po.DistributionMonitor;
 import com.njcn.device.pms.pojo.vo.DoubleUserVO;
 
@@ -34,4 +36,26 @@ public interface IDistributionMonitorService extends IService<DistributionMonito
      * @date 2022/11/15
      */
     List<DoubleUserVO> getDoubleUserByDept(String orgId);
+
+    /**
+     * 新增配网监测点
+     * @author cdf
+     * @date 2022/11/23
+     */
+    Boolean addDistributionMonitor(DistributionMonitorParam distributionMonitorParam);
+
+    /**
+     * 查询配网监测点
+     * @author cdf
+     * @date 2022/11/29
+     */
+    List<DistributionMonitor> distributionMonitorList(List<String> disMonitorIds);
+
+
+    /**
+     * 删除配网监测点
+     * @author cdf
+     * @date 2022/12/5
+     */
+    Boolean delDistributionMonitor(TaiZhangDelParam taiZhangDelParam);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pms.service.majornetwork;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.response.HttpResult;
@@ -15,6 +16,7 @@ import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
 import com.njcn.device.pq.pojo.po.Overlimit;
+import com.njcn.web.pojo.param.BaseParam;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
@@ -74,6 +76,14 @@ public interface IMonitorService extends IService<Monitor> {
     Overlimit getOverLimitData(String id);
 
 
+
+    Page<Monitor> getAllMonitorPageList(BaseParam baseParam);
+
+    List<Monitor> getMonitorList(List<String> monitorIds);
+
+    List<Monitor> getMonitorListByParam(MonitorParam monitorParam);
+
+
     /**
      * 新增主网监测点
      * @author cdf
@@ -90,7 +100,7 @@ public interface IMonitorService extends IService<Monitor> {
      * @param monitorParam 主网监测点
      * @return boolean
      */
-    boolean updateMonitor(MonitorParam.UpdateMonitorParam monitorParam);
+    boolean updateMonitor(MonitorParam monitorParam);
 
     /**
      * 新增主网监测点

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java

@@ -3,6 +3,7 @@ package com.njcn.device.pms.service.majornetwork;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.param.PowerClientParam;
+import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.web.pojo.param.BaseParam;
@@ -61,7 +62,7 @@ public interface IPowerClientService extends IService<PowerClient> {
      * @date 2022/10/25
      * @return boolean
      */
-    List<PowerClient> getPowerClientList();
+    List<PowerClient> getPowerClientList(PowerClientParam powerClientParam);
 
     /**
      * 查询用电用户列表
@@ -72,4 +73,9 @@ public interface IPowerClientService extends IService<PowerClient> {
      */
     Page<PowerClient> getPowerClientPageList(BaseParam baseParam);
 
+    /**
+     * 查询用电用户列表
+     */
+    List<PowerClient> getPowerUtilizationUserList(PowerUserParam powerUserParam);
+
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java

@@ -23,11 +23,17 @@ import java.util.List;
 public interface IPowerDistributionareaService extends IService<PowerDistributionarea> {
 
     /**
-     * 查询所有
+     * 分页查询所有
      * @return
      */
     Page<PowerDistributionarea> getList(BaseParam baseParam);
 
+    /**
+     * 查询所有
+     * @return
+     */
+    List<PowerDistributionarea> getPowerDistributionList(PowerDistributionareaParam powerDistributionareaParam);
+
     /**
      * 根据id查询
      * @return

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java

@@ -2,7 +2,9 @@ package com.njcn.device.pms.service.majornetwork;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
 import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerGenerationUser;
 import com.njcn.web.pojo.param.BaseParam;
 
@@ -60,7 +62,7 @@ public interface IPowerGenerationUserService extends IService<PowerGenerationUse
      * @date 2022/10/25
      * @return boolean
      */
-    List<PowerGenerationUser> getPowerGenerationUserList();
+    List<PowerGenerationUser> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam);
 
     /**
      * 分页查询发电用户列表
@@ -71,4 +73,9 @@ public interface IPowerGenerationUserService extends IService<PowerGenerationUse
      */
     Page<PowerGenerationUser> getPowerGenerationUserPageList(BaseParam baseParam);
 
+    /**
+     * 查询发电用户列表
+     */
+    List<PowerGenerationUser> getGenerateElectricityUserList(PowerUserParam powerUserParam);
+
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalEliminateDataService.java

@@ -1,11 +1,19 @@
 package com.njcn.device.pms.service.majornetwork;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.pms.pojo.po.TerminalEliminateData;
+import com.njcn.device.pms.pojo.param.TaiZhangParam;
+import com.njcn.device.pms.pojo.po.*;
+import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
+import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * <p>
- *  服务类
+ *  终端操作
  * </p>
  *
  * @author hongawen
@@ -13,4 +21,32 @@ import com.njcn.device.pms.pojo.po.TerminalEliminateData;
  */
 public interface ITerminalEliminateDataService extends IService<TerminalEliminateData> {
 
+    /**
+     * 根据组织部门获取自身以及子部门的主网或配网监测点
+     * @author cdf
+     * @date 2022/11/23
+     */
+
+    Page<Monitor> getOneMonitorByOrgId(TaiZhangParam taiZhangParam);
+
+    /**
+     * 根据组织部门获取自身以及子部门的主网或配网监测点
+     * @author cdf
+     * @date 2022/11/23
+     */
+
+    Page<PowerDistributionarea> getTwoMonitorByOrgId(TaiZhangParam taiZhangParam);
+
+    /**
+     * 根据组织部门获取自身以及子部门的主网或配网监测点
+     * @author cdf
+     * @date 2022/11/23
+     */
+
+    Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgId(TaiZhangParam taiZhangParam);
+
+
+
+
+
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java

@@ -18,12 +18,20 @@ import java.util.List;
  */
 public interface ITerminalService extends IService<PmsTerminal> {
 
+    /**
+     * 分页查询所有
+     * @return Page<PmsTerminal>
+     */
+    Page<PmsTerminal> getTerminalList(BaseParam baseParam);
+
     /**
      * 查询所有
      * @param baseParam
      * @return
      */
-    Page<PmsTerminal> getTerminalList(BaseParam baseParam);
+    List<PmsTerminal> getTerminalSelectList();
+
+
 
     /**
      * 根据id查询

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITractionStationService.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pms.service.majornetwork;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
 import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
@@ -24,7 +25,14 @@ public interface ITractionStationService extends IService<TractionStation> {
      *
      * @return boolean
      */
-    List<TractionStation> getTractionStationList(BaseParam baseParam);
+    List<TractionStation> getTractionStationList();
+
+    /**
+     * 分页查询牵引站列表
+     *
+     * @return boolean
+     */
+    Page<TractionStation> getTractionStationPageList(BaseParam baseParam);
 
     /**
      * 查询牵引站

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pms.mapper.majornetwork.RStatAccountCheckDataMapper;
@@ -63,17 +64,17 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService {
         // 获取主网字典id
         String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId();
         // 获取主网数据质量-台帐类数据质量核查
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 result = rStatAccountCheckDataMapper.getRStatAccountCheckDataYearInfo(param, deptIdList, mainnetPoint);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 result = rStatAccountCheckDataMapper.getRStatAccountCheckDataSeasonInfo(param, deptIdList, mainnetPoint);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 result = rStatAccountCheckDataMapper.getRStatAccountCheckDataMonthInfo(param, deptIdList, mainnetPoint);
                 break;
             default:
@@ -110,17 +111,17 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService {
         // 创建集合封装数据
         List<RStatTargetCheckDataVO> result = new ArrayList<>();
         // 获取主网数据质量-台帐类数据质量核查
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 result = rStatTargetCheckDataMapper.getRStatTargetCheckDataYearInfo(param, deptIdList, mainnetPoint);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 result = rStatTargetCheckDataMapper.getRStatTargetCheckDataSeasonInfo(param, deptIdList, mainnetPoint);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 result = rStatTargetCheckDataMapper.getRStatTargetCheckDataMonthInfo(param, deptIdList, mainnetPoint);
                 break;
             default:

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pms.mapper.majornetwork.ROperatingIndexMapper;
@@ -106,17 +107,17 @@ public class DataQualityStatServiceImpl implements DataQualityStatService {
         // 创建集合封装返回数据
         List<ROperatingIndexVO> result = new ArrayList<>();
         // 获取主网数据质量-监测指标数据质量统计
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 result = rOperatingIndexMapper.getYearInfo(param, deptIdList);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 result = rOperatingIndexMapper.getSeasonInfo(param, deptIdList);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 result = rOperatingIndexMapper.getMonthInfo(param, deptIdList);
                 break;
             default:

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java

@@ -1,20 +1,30 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
-import com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper;
+import com.njcn.device.pms.mapper.majornetwork.*;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.device.pms.pojo.po.DistributionMonitor;
+import com.njcn.device.pms.pojo.param.TaiZhangDelParam;
+import com.njcn.device.pms.pojo.po.*;
 import com.njcn.device.pms.pojo.vo.DoubleUserVO;
 import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
 import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.constant.DicDataConstant;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -33,14 +43,136 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
 
     private final DicDataFeignClient dicDataFeignClient;
 
+    private final MonitorMapper monitorMapper;
+
+    private final PowerDistributionareaMapper powerDistributionareaMapper;
+
+    private final PowerClientMapper powerClientMapper;
+
+    private final PowerGenerationUserMapper powerGenerationUserMapper;
+
 
     @Override
     public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
-        return this.baseMapper.getIdByOrgId(deptIdList,pmsDeviceInfoParam);
+        return this.baseMapper.getIdByOrgId(deptIdList, pmsDeviceInfoParam);
     }
 
     @Override
     public List<DoubleUserVO> getDoubleUserByDept(String orgId) {
         return this.baseMapper.getDoubleUserByDept(orgId);
     }
+
+    @Override
+    public Boolean addDistributionMonitor(DistributionMonitorParam distributionMonitorParam) {
+        DictData dictData = dicDataFeignClient.getDicDataById(distributionMonitorParam.getMonitorSort()).getData();
+        if (Objects.isNull(dictData)) {
+            throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
+        }
+        DistributionMonitor distributionMonitor = new DistributionMonitor();
+        distributionMonitor.setMonitorSort(dictData.getId());
+        switch (dictData.getCode()) {
+            case DicDataConstant.ONE_LINE:
+                //一类监测点
+                Monitor monitor = monitorMapper.selectById(distributionMonitorParam.getMonitorId());
+                if (Objects.isNull(monitor)) {
+                    throw new BusinessException(PmsDeviceResponseEnum.ONE_MONITOR_NOT_FIND);
+                }
+                distributionMonitor.setMonitorId(monitor.getId());
+                distributionMonitor.setCreatedDate(LocalDateTime.now());
+                distributionMonitor.setIfPowerUser(0);
+                distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
+                distributionMonitor.setVoltageLevel(monitor.getVoltageLevel());
+                distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
+                this.save(distributionMonitor);
+                break;
+            case DicDataConstant.TWO_LINE:
+                //二类监测点(台区)
+                PowerDistributionarea powerDistributionarea = powerDistributionareaMapper.selectById(distributionMonitorParam.getMonitorId());
+                if (Objects.isNull(powerDistributionarea)) {
+                    throw new BusinessException(PmsDeviceResponseEnum.TWO_MONITOR_NOT_FIND);
+                }
+                Generatrix generatrix = powerDistributionareaMapper.getGeneratrixByDistributionId(powerDistributionarea.getId());
+                distributionMonitor.setMonitorId(powerDistributionarea.getId());
+                distributionMonitor.setCreatedDate(LocalDateTime.now());
+                distributionMonitor.setIfPowerUser(0);
+                distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
+                distributionMonitor.setVoltageLevel(generatrix.getScale());
+                distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
+                this.save(distributionMonitor);
+                break;
+            case DicDataConstant.THREE_LINE:
+                //三类监测点
+                if (distributionMonitorParam.getSmallType() == 1) {
+                    //发电
+                    PowerGenerationUser powerGenerationUser = powerGenerationUserMapper.selectById(distributionMonitorParam.getMonitorId());
+                    if (Objects.isNull(powerGenerationUser)) {
+                        throw new BusinessException(PmsDeviceResponseEnum.THREE_MONITOR_NOT_FIND);
+                    }
+                    distributionMonitor.setIfPowerUser(1);
+                    distributionMonitor.setVoltageLevel(powerGenerationUser.getVoltageLevel());
+
+                } else {
+                    //用电
+                    PowerClient powerClient = powerClientMapper.selectById(distributionMonitorParam.getMonitorId());
+                    if (Objects.isNull(powerClient)) {
+                        throw new BusinessException(PmsDeviceResponseEnum.THREE_MONITOR_NOT_FIND);
+                    }
+                    distributionMonitor.setIfPowerUser(0);
+                    distributionMonitor.setVoltageLevel(powerClient.getVoltageLevel());
+
+                }
+                distributionMonitor.setMonitorId(distributionMonitorParam.getMonitorId());
+                distributionMonitor.setCreatedDate(LocalDateTime.now());
+                distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
+                distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
+                this.save(distributionMonitor);
+                break;
+            default:
+                throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
+        }
+        return true;
+    }
+
+    @Override
+    public List<DistributionMonitor> distributionMonitorList(List<String> disMonitorIds) {
+        List<DistributionMonitor> distributionMonitorList = new ArrayList<>();
+        LambdaQueryWrapper<DistributionMonitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(DistributionMonitor::getStatus, DataStateEnum.ENABLE.getCode());
+        if (CollUtil.isEmpty(disMonitorIds)) {
+            distributionMonitorList = this.list(lambdaQueryWrapper);
+        } else {
+            lambdaQueryWrapper.in(DistributionMonitor::getMonitorId, disMonitorIds);
+            distributionMonitorList = this.list(lambdaQueryWrapper);
+        }
+        return distributionMonitorList;
+    }
+
+    /**
+     * 删除配网监测点
+     *
+     * @author cdf
+     * @date 2022/12/5
+     */
+    @Override
+    public Boolean delDistributionMonitor(TaiZhangDelParam taiZhangDelParam) {
+        LambdaQueryWrapper<DistributionMonitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+        String code = "";
+
+        if (taiZhangDelParam.getType().equals(1)) {
+            code = DicDataEnum.ONE_LINE.getCode();
+        } else if (taiZhangDelParam.getType().equals(2)) {
+            code = DicDataEnum.TWO_LINE.getCode();
+        } else {
+            code = DicDataEnum.THREE_LINE.getCode();
+        }
+
+        DictData dictData = dicDataFeignClient.getDicDataByCode(code).getData();
+        if(Objects.isNull(dictData)){
+            throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
+        }
+        lambdaQueryWrapper.eq(DistributionMonitor::getMonitorSort,dictData.getId());
+        lambdaQueryWrapper.in(DistributionMonitor::getMonitorId, taiZhangDelParam.getIds());
+        return this.remove(lambdaQueryWrapper);
+    }
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java

@@ -92,6 +92,8 @@ public class GeneratrixWireImpl extends ServiceImpl<GeneratrixWireMapper, Genera
 
     private void checkName(GeneratrixWireParam generatrixWireParam,Boolean updateFlag){
 
+
+
         LambdaQueryWrapper<GeneratrixWire> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(GeneratrixWire::getGeneratrixName,generatrixWireParam.getWireName())
                 .eq(GeneratrixWire::getGeneratrixId,generatrixWireParam.getGeneratrixId())
@@ -100,6 +102,15 @@ public class GeneratrixWireImpl extends ServiceImpl<GeneratrixWireMapper, Genera
         if(updateFlag){
             //更新
             lambdaQueryWrapper.ne(GeneratrixWire::getWireId,generatrixWireParam.getWireId());
+        }else {
+            //新增校验
+            LambdaQueryWrapper<GeneratrixWire> lambdaQuery = new LambdaQueryWrapper<>();
+            lambdaQuery.eq(GeneratrixWire::getWireId,generatrixWireParam.getWireId());
+            int count = this.count(lambdaQuery);
+            if(count>0){
+                throw new BusinessException(PmsDeviceResponseEnum.WIRE_SAME);
+
+            }
         }
         int count = this.count(lambdaQueryWrapper);
         if(count > 0){

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java

@@ -1,7 +1,9 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -29,12 +31,15 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.SystemResponseEnum;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.pojo.po.Dept;
+import com.njcn.web.factory.PageFactory;
+import com.njcn.web.pojo.param.BaseParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -133,6 +138,40 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
         return overlimitMapper.selectById(id);
     }
 
+    @Override
+    public Page<Monitor> getAllMonitorPageList(BaseParam baseParam) {
+        LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode())
+        .orderByDesc(Monitor::getCreateTime);
+        return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
+    }
+
+    @Override
+    public List<Monitor> getMonitorList(List<String> monitorIds) {
+        List<Monitor> monitorList = new ArrayList<>();
+        LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode());
+        if(CollUtil.isEmpty(monitorIds)){
+            //为空查询所有监测点
+            monitorList = this.list(lambdaQueryWrapper);
+        }else {
+            lambdaQueryWrapper.in(Monitor::getId,monitorIds);
+            monitorList = this.list(lambdaQueryWrapper);
+        }
+        return monitorList;
+    }
+
+    @Override
+    public List<Monitor> getMonitorListByParam(MonitorParam monitorParam) {
+        LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        //根据部门
+        if(StrUtil.isNotBlank(monitorParam.getOrgId())){
+           List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(monitorParam.getOrgId()).getData();
+            lambdaQueryWrapper.in(Monitor::getOrgId,deptIds).eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode());
+        }
+        return this.list(lambdaQueryWrapper);
+    }
+
     @Override
     public boolean addMonitor(MonitorParam monitorParam) {
 
@@ -145,7 +184,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
     }
 
     @Override
-    public boolean updateMonitor(MonitorParam.UpdateMonitorParam monitorParam) {
+    public boolean updateMonitor(MonitorParam monitorParam) {
         checkParam(monitorParam,true);
         Monitor monitor = new Monitor();
         BeanUtils.copyProperties(monitorParam,monitor);
@@ -156,7 +195,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
 
     @Override
     public boolean delMonitor(List<String> monitorIds) {
-        return false;
+        return this.removeByIds(monitorIds);
     }
 
     @Override

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java

@@ -135,6 +135,14 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G
         if(updateFlag){
             //更新
             lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
+        }else {
+            //新增校验
+            LambdaQueryWrapper<Generatrix> lambdaQuery = new LambdaQueryWrapper<>();
+            lambdaQuery.eq(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
+            int count = this.count(lambdaQuery);
+            if(count>0){
+                throw new BusinessException(PmsDeviceResponseEnum.GENWIRE_SAME);
+            }
         }
         int count = this.count(lambdaQueryWrapper);
         if(count > 0){

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java

@@ -2,19 +2,28 @@ package com.njcn.device.pms.service.majornetwork.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.mapper.majornetwork.PowerClientMapper;
 import com.njcn.device.pms.pojo.param.PowerClientParam;
+import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.param.PowerUserParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
 import com.njcn.device.pms.service.majornetwork.IPowerClientService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.user.api.DeptFeignClient;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.BaseParam;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -25,21 +34,36 @@ import java.util.List;
  * @since 2022-10-14
  */
 @Service
+@RequiredArgsConstructor
 public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, PowerClient> implements IPowerClientService {
 
+    private final DeptFeignClient deptFeignClient;
 
     @Override
     public boolean addPowerClient(PowerClientParam powerClientParam) {
+        LambdaQueryWrapper<PowerClient> che = new LambdaQueryWrapper<>();
+        che.eq(PowerClient::getId,powerClientParam.getId());
+        int powerClientCount = this.count(che);
+        if(powerClientCount>0){
+            throw new BusinessException(PmsDeviceResponseEnum.POWERCLINET_SAME);
+        }
+
+        checkParam(powerClientParam,false);
         PowerClient powerClient = new PowerClient();
         BeanUtils.copyProperties(powerClientParam,powerClient);
+        powerClient.setStatus(DataStateEnum.ENABLE.getCode());
         return this.save(powerClient);
     }
 
     @Override
     public boolean updatePowerClient(PowerClientParam powerClientParam) {
-        PowerClient powerClient = new PowerClient();
+        PowerClient powerClient = this.getById(powerClientParam.getId());
+        if(Objects.isNull(powerClient)){
+            throw new BusinessException(PmsDeviceResponseEnum.POWER_CLIENT_NOT_FIND);
+        }
+        checkParam(powerClientParam,true);
         BeanUtils.copyProperties(powerClientParam,powerClient);
-        return this.save(powerClient);
+        return this.updateById(powerClient);
     }
 
     @Override
@@ -53,8 +77,13 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
     }
 
     @Override
-    public List<PowerClient> getPowerClientList() {
+    public List<PowerClient> getPowerClientList(PowerClientParam powerClientParam) {
         LambdaQueryWrapper<PowerClient> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(StrUtil.isNotBlank(powerClientParam.getOrgId())){
+            List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerClientParam.getOrgId()).getData();
+            lambdaQueryWrapper.eq(PowerClient::getOrgId,deptIds).eq(PowerClient::getStatus,DataStateEnum.ENABLE.getCode());
+        }
+        lambdaQueryWrapper.select(PowerClient::getId,PowerClient::getName,PowerClient::getOrgId,PowerClient::getOrgName);
         lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime).eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode());
         return this.list(lambdaQueryWrapper);
     }
@@ -70,4 +99,31 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
         .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getOrgName,baseParam.getSearchValue());
         return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
     }
+
+    @Override
+    public List<PowerClient> getPowerUtilizationUserList(PowerUserParam powerUserParam) {
+        LambdaQueryWrapper<PowerClient> queryWrapper = new LambdaQueryWrapper<>();
+        if (StrUtil.isNotBlank(powerUserParam.getId())){
+            queryWrapper.eq(PowerClient::getId,powerUserParam.getId());
+        }
+        return this.list(queryWrapper);
+    }
+
+    private void checkParam(PowerClientParam powerClientParam, Boolean updateFlag){
+
+        LambdaQueryWrapper<PowerClient> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PowerClient::getName,powerClientParam.getName());
+
+        if(updateFlag){
+            lambdaQueryWrapper.ne(PowerClient::getId,powerClientParam.getId());
+        }else {
+            lambdaQueryWrapper.or().eq(PowerClient::getId,powerClientParam.getId());
+        }
+
+        int count = this.count(lambdaQueryWrapper);
+        if(count>0){
+            throw new BusinessException(PmsDeviceResponseEnum.POWERGENERATIONUSER_SAME);
+        }
+
+    }
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java

@@ -9,7 +9,9 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.mapper.majornetwork.PowerDistributionareaMapper;
 import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
+import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.device.pms.pojo.po.PowerDistributionarea;
+import com.njcn.device.pms.pojo.po.PowerGenerationUser;
 import com.njcn.device.pms.pojo.po.StatationStat;
 import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
 import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService;
@@ -61,6 +63,18 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
         return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
     }
 
+    @Override
+    public List<PowerDistributionarea> getPowerDistributionList(PowerDistributionareaParam powerDistributionareaParam) {
+        LambdaQueryWrapper<PowerDistributionarea> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(StrUtil.isNotBlank(powerDistributionareaParam.getOrgId())){
+            List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
+            lambdaQueryWrapper.in(PowerDistributionarea::getOrgId,deptIds).eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode());
+        }
+        lambdaQueryWrapper.select(PowerDistributionarea::getId,PowerDistributionarea::getName,PowerDistributionarea::getOrgId,PowerDistributionarea::getOrgName);
+        lambdaQueryWrapper.orderByDesc(PowerDistributionarea::getCreateTime);
+        return this.list(lambdaQueryWrapper);
+    }
+
     /**
      * 根据id查询
      * @author hany
@@ -78,6 +92,12 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
      */
     @Override
     public boolean add(PowerDistributionareaParam newParam) {
+        LambdaQueryWrapper<PowerDistributionarea> che = new LambdaQueryWrapper<>();
+        che.eq(PowerDistributionarea::getId,newParam.getId());
+        int count = this.count(che);
+        if(count>0){
+            throw new BusinessException(PmsDeviceResponseEnum.POWER_CODE_SAME);
+        }
         checkName(newParam,true);
 
         Dept dept = deptFeignClient.getDeptByCode(newParam.getOrgId()).getData();
@@ -110,8 +130,11 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
      */
     @Override
     public boolean update(PowerDistributionareaParam updateParam) {
+        PowerDistributionarea powerDistributionarea = this.getById(updateParam.getId());
+        if(Objects.isNull(powerDistributionarea)){
+            throw new BusinessException(PmsDeviceResponseEnum.POWER_DIS_NOT_FIND);
+        }
         checkName(updateParam,false);
-        PowerDistributionarea powerDistributionarea = new PowerDistributionarea();
         BeanUtils.copyProperties(updateParam,powerDistributionarea);
         return this.updateById(powerDistributionarea);
     }
@@ -133,10 +156,8 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
         lambdaQueryWrapper.eq(PowerDistributionarea::getName,newParam.getName());
         //修改
         if(!flag){
-            if(newParam instanceof PowerDistributionareaParam){
             lambdaQueryWrapper.ne(PowerDistributionarea::getId,newParam.getId());
         }
-        }
         int result = this.count(lambdaQueryWrapper);
         //大于等于1个则表示重复
         if (result >= 1) {

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java

@@ -4,17 +4,25 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.mapper.majornetwork.PowerGenerationUserMapper;
+import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
 import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
+import com.njcn.device.pms.pojo.param.PowerUserParam;
+import com.njcn.device.pms.pojo.po.PowerClient;
 import com.njcn.device.pms.pojo.po.PowerGenerationUser;
 import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.user.api.DeptFeignClient;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.BaseParam;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -25,20 +33,35 @@ import java.util.List;
  * @since 2022-10-14
  */
 @Service
+@RequiredArgsConstructor
 public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationUserMapper, PowerGenerationUser> implements IPowerGenerationUserService {
 
+    private final DeptFeignClient deptFeignClient;
+
     @Override
     public boolean addPowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
+        LambdaQueryWrapper<PowerGenerationUser> che = new LambdaQueryWrapper<>();
+        che.eq(PowerGenerationUser::getId,powerGenerationUserParam.getId());
+        int powerClientCount = this.count(che);
+        if(powerClientCount>0){
+            throw new BusinessException(PmsDeviceResponseEnum.POWERGENERATIONUSER_SAME);
+        }
+        checkParam(powerGenerationUserParam,false);
         PowerGenerationUser powerGenerationUser = new PowerGenerationUser();
         BeanUtils.copyProperties(powerGenerationUserParam,powerGenerationUser);
+        powerGenerationUser.setStatus(DataStateEnum.ENABLE.getCode());
         return this.save(powerGenerationUser);
     }
 
     @Override
     public boolean updatePowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
-        PowerGenerationUser powerGenerationUser = new PowerGenerationUser();
+        PowerGenerationUser powerGenerationUser = this.getById(powerGenerationUserParam.getId());
+        if(Objects.isNull(powerGenerationUser)){
+            throw new BusinessException(PmsDeviceResponseEnum.POWER_GEN_NOT_FIND);
+        }
+        checkParam(powerGenerationUserParam,true);
         BeanUtils.copyProperties(powerGenerationUserParam,powerGenerationUser);
-        return this.save(powerGenerationUser);
+        return this.updateById(powerGenerationUser);
     }
 
     @Override
@@ -52,8 +75,13 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
     }
 
     @Override
-    public List<PowerGenerationUser> getPowerGenerationUserList() {
+    public List<PowerGenerationUser> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam) {
         LambdaQueryWrapper<PowerGenerationUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(StrUtil.isNotBlank(powerDistributionareaParam.getOrgId())){
+            List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
+            lambdaQueryWrapper.in(PowerGenerationUser::getOrgId,deptIds).eq(PowerGenerationUser::getStatus,DataStateEnum.ENABLE.getCode());
+        }
+        lambdaQueryWrapper.select(PowerGenerationUser::getName,PowerGenerationUser::getId,PowerGenerationUser::getOrgId,PowerGenerationUser::getOrgName);
         lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode());
         return this.list(lambdaQueryWrapper);
     }
@@ -68,5 +96,33 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
         return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
     }
 
+    @Override
+    public List<PowerGenerationUser> getGenerateElectricityUserList(PowerUserParam powerUserParam) {
+        LambdaQueryWrapper<PowerGenerationUser> queryWrapper = new LambdaQueryWrapper<>();
+        if (StrUtil.isNotBlank(powerUserParam.getId())){
+            queryWrapper.eq(PowerGenerationUser::getId,powerUserParam.getId());
+        }
+        return this.list(queryWrapper);
+    }
+
+
+    private void  checkParam(PowerGenerationUserParam powerGenerationUserParam,Boolean updateFlag){
+
+        LambdaQueryWrapper<PowerGenerationUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PowerGenerationUser::getName,powerGenerationUserParam.getName());
+
+        if(updateFlag){
+            lambdaQueryWrapper.ne(PowerGenerationUser::getId,powerGenerationUserParam.getId());
+        }else {
+            lambdaQueryWrapper.or().eq(PowerGenerationUser::getId,powerGenerationUserParam.getId());
+        }
+
+        int count = this.count(lambdaQueryWrapper);
+        if(count>0){
+            throw new BusinessException(PmsDeviceResponseEnum.POWERGENERATIONUSER_SAME);
+        }
+
+    }
+
 
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java

@@ -152,18 +152,28 @@ implements RStatZwAlarmCountWService {
                 .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTime)
                 .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTime)
                 .groupBy(RMpTargetWarnD::getMeasurementPointId)
-                //拼接or条件
-                .or(qw ->
-                qw.eq(RMpTargetWarnD::getIsEffective, 1) //是否是有效接入监测点(0:否 1:是)
-                .eq(RMpTargetWarnD::getIsHarmonic, 1) //是否是稳态超标监测点(0:否 1:是)
+                //拼接条件
+                .and(qw ->
+                qw.eq(RMpTargetWarnD::getIsEffective, 0)//是否是有效接入监测点(0:否 1:是)
+                .or() //开始拼接or条件
+                .eq(RMpTargetWarnD::getIsHarmonic, 1)//是否是稳态超标监测点(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsEvent, 1) //是否是发生暂态的监测点(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsWarn, 1) //是否是告警监测点数(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsVDevWarn, 1) //电压偏差是否告警(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsFreqWarn, 1) //频率偏差是否告警(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsUnbalanceWarn, 1) //三相电压不平衡度是否告警(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsVWarn, 1) //谐波电压是否告警(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsFlickerWarn, 1) //闪变是否告警(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsSagWarn, 1) //电压暂降是否告警(0:否 1:是)
+                .or()
                 .eq(RMpTargetWarnD::getIsInterruptWarn, 1) //短时中断是否告警(0:否 1:是)
                 )
                 .having("count(measurement_point_id) >= {0}", 4);

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java

@@ -2,6 +2,7 @@ package com.njcn.device.pms.service.majornetwork.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
 import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
 import com.njcn.device.pms.pojo.param.StatationStatParam;
@@ -47,6 +48,7 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
     public boolean addStatationStat(StatationStatParam statationStatParam) {
         StatationStat statationStat = new StatationStat();
         BeanUtils.copyProperties(statationStatParam, statationStat);
+        statationStat.setStatus(DataStateEnum.ENABLE.getCode());
         return this.save(statationStat);
     }
 
@@ -54,7 +56,7 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
     public boolean updateStatationStat(StatationStatParam statationStatParam) {
         StatationStat statationStat = new StatationStat();
         BeanUtils.copyProperties(statationStatParam, statationStat);
-        return this.save(statationStat);
+        return this.updateById(statationStat);
     }
 
     @Override

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalEliminateDataServiceImpl.java

@@ -1,11 +1,34 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
-import com.njcn.device.pms.mapper.majornetwork.TerminalEliminateDataMapper;
-import com.njcn.device.pms.pojo.po.TerminalEliminateData;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
+import com.njcn.device.pms.mapper.majornetwork.*;
+import com.njcn.device.pms.pojo.param.TaiZhangParam;
+import com.njcn.device.pms.pojo.po.*;
+import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
+import com.njcn.device.pms.service.majornetwork.IMonitorService;
 import com.njcn.device.pms.service.majornetwork.ITerminalEliminateDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.enums.SystemResponseEnum;
+import com.njcn.system.pojo.constant.DicDataConstant;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.factory.PageFactory;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * <p>
  *  服务实现类
@@ -15,6 +38,77 @@ import org.springframework.stereotype.Service;
  * @since 2022-10-14
  */
 @Service
+@RequiredArgsConstructor
 public class TerminalEliminateDataServiceImpl extends ServiceImpl<TerminalEliminateDataMapper, TerminalEliminateData> implements ITerminalEliminateDataService {
 
+    private final MonitorMapper monitorMapper;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final DeptFeignClient deptFeignClient;
+
+    private final DistributionMonitorMapper distributionMonitorMapper;
+
+    private final PowerDistributionareaMapper powerDistributionareaMapper;
+
+    private final PowerClientMapper powerClientMapper;
+
+    private final PowerGenerationUserMapper powerGenerationUserMapper;
+
+    @Override
+    public Page<Monitor> getOneMonitorByOrgId(TaiZhangParam taiZhangParam) {
+        Page<Monitor> monitorPage = new Page<>();
+        List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(taiZhangParam.getOrgId()).getData();
+        if(taiZhangParam.getDataType() == 0){
+            //主网
+            LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.in(Monitor::getOrgId,deptIds)
+            .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).orderByDesc(Monitor::getCreateTime);
+            monitorPage = monitorMapper.selectPage(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),lambdaQueryWrapper);
+        }else {
+            //配网
+                DictData one = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONE_LINE.getCode()).getData();
+                taiZhangParam.setLineType(one.getId());
+                monitorPage = distributionMonitorMapper.getMonitorByOrg(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
+        }
+        return monitorPage;
+    }
+
+    @Override
+    public Page<PowerDistributionarea> getTwoMonitorByOrgId(TaiZhangParam taiZhangParam) {
+        Page<PowerDistributionarea> monitorPage = new Page<>();
+        List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(taiZhangParam.getOrgId()).getData();
+        if(taiZhangParam.getDataType() == 0){
+
+        }else {
+                DictData two = dicDataFeignClient.getDicDataByCode(DicDataEnum.TWO_LINE.getCode()).getData();
+                taiZhangParam.setLineType(two.getId());
+                monitorPage = distributionMonitorMapper.getPowerDisAreaMonitorByOrg(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
+        }
+        return monitorPage;
+    }
+
+    @Override
+    public Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgId(TaiZhangParam taiZhangParam) {
+        Page<PmsPowerTreeMonitorVO> monitorPage = new Page<>();
+        List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(taiZhangParam.getOrgId()).getData();
+        if(taiZhangParam.getDataType() == 0){
+
+        }else {
+            if(Objects.isNull(taiZhangParam.getTreeType())){
+                throw new BusinessException(PmsDeviceResponseEnum.POWER_CLIENT_DIS_EMPTY);
+            }
+            //配网
+                DictData three = dicDataFeignClient.getDicDataByCode(DicDataEnum.THREE_LINE.getCode()).getData();
+                taiZhangParam.setLineType(three.getId());
+                if(taiZhangParam.getTreeType().equals(0)){
+                    //用电
+                    monitorPage = distributionMonitorMapper.getThreeMonitorByOrgIdYong(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
+                }else {
+                    //
+                    monitorPage = distributionMonitorMapper.getThreeMonitorByOrgIdFa(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
+                }
+        }
+        return monitorPage;
+    }
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java

@@ -23,6 +23,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
 
@@ -59,6 +61,15 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
         return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
     }
 
+    @Override
+    public List<PmsTerminal> getTerminalSelectList() {
+        LambdaQueryWrapper<PmsTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.select(PmsTerminal::getName,PmsTerminal::getOrgId,PmsTerminal::getOrgName,PmsTerminal::getId);
+        lambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode())
+                .orderByDesc(PmsTerminal::getCreateTime);
+        return this.list(lambdaQueryWrapper);
+    }
+
     /**
      * 根据id查询
      * @author hany
@@ -102,6 +113,8 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
         pmsTerminal.setPowerrName(statationStat.getPowerName());
         //设为正常状态
         pmsTerminal.setStatus(DataStateEnum.ENABLE.getCode());
+        pmsTerminal.setVerificationDate(LocalDate.parse(terminalParam.getVerificationDate()));
+        pmsTerminal.setUseDate(LocalDate.parse(terminalParam.getUseDate()));
         return this.save(pmsTerminal);
     }
 
@@ -115,6 +128,8 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
         checkName(updateParam,false);
         PmsTerminal pmsTerminal = new PmsTerminal();
         BeanUtils.copyProperties(updateParam, pmsTerminal);
+        pmsTerminal.setVerificationDate(LocalDate.parse(updateParam.getVerificationDate()));
+        pmsTerminal.setUseDate(LocalDate.parse(updateParam.getUseDate()));
         return this.updateById(pmsTerminal);
     }
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java

@@ -1,6 +1,9 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
@@ -11,11 +14,14 @@ import com.njcn.device.pms.pojo.param.TractionStationParam;
 import com.njcn.device.pms.pojo.po.TractionStation;
 import com.njcn.device.pms.service.majornetwork.ITractionStationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.BaseParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -34,13 +40,36 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
 
     /**
      * 查询牵引站列表
+     * @return
+     */
+    @Override
+    public List<TractionStation> getTractionStationList() {
+        LambdaQueryWrapper<TractionStation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TractionStation::getStatus,DataStateEnum.ENABLE.getCode())
+                .orderByDesc(TractionStation::getCreateTime);
+        return this.list();
+    }
+
+    /**
+     * 分页查询牵引站列表
      *
      * @param baseParam
      * @return
      */
     @Override
-    public List<TractionStation> getTractionStationList(BaseParam baseParam) {
-        return this.list();
+    public Page<TractionStation> getTractionStationPageList(BaseParam baseParam) {
+        LambdaQueryWrapper<TractionStation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TractionStation::getStatus,DataStateEnum.ENABLE.getCode())
+                .like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getName,baseParam.getSearchValue())
+                .or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
+                .like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getOrgName,baseParam.getSearchValue())
+                .or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
+                .like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getOperationName,baseParam.getSearchValue())
+                .or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
+                .like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getPowerName,baseParam.getSearchValue())
+                .or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
+                .orderByDesc(TractionStation::getCreateTime);
+        return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
     }
 
     /**
@@ -67,6 +96,7 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
         BeanUtils.copyProperties(tractionStationParam, tractionStation);
         //设为正常状态
         tractionStation.setStatus(DataStateEnum.ENABLE.getCode());
+        tractionStation.setCreatedDate(LocalDate.parse(tractionStationParam.getCreatedDate()));
         return this.save(tractionStation);
     }
 
@@ -81,6 +111,7 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
         checkName(updateParam, false);
         TractionStation tractionStation = new TractionStation();
         BeanUtils.copyProperties(updateParam, tractionStation);
+        tractionStation.setCreatedDate(LocalDate.parse(updateParam.getCreatedDate()));
         return this.updateById(tractionStation);
     }
 

pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwRStatOrgServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.event.service.distribution.Impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
@@ -74,9 +75,9 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
         // 创建集合封装查询数据
         List<RStatOrgPO> rStatOrgPO = new ArrayList<>();
         // 判断条件
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 rStatOrgPO = pwRStatOrgMapper.getYearInfo(
                         deptIdList,
                         param.getStartTime(),
@@ -84,7 +85,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
                         distributionPoint);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 rStatOrgPO = pwRStatOrgMapper.getQuarterInfo(
                         deptIdList,
                         param.getStartTime(),
@@ -92,7 +93,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
                         distributionPoint);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 rStatOrgPO = pwRStatOrgMapper.getMonthInfo(
                         deptIdList,
                         param.getStartTime(),
@@ -153,9 +154,9 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
         // 获取配网id
         String distributionPoint = getDistributionPoint();
         // 判断条件
-        switch (param.getType()) {
+        switch (param.getType().toString()) {
             // 年
-            case 1:
+            case BizParamConstant.STAT_BIZ_YEAR:
                 rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getYearInfo(
                         deptIdList,
                         param.getStartTime(),
@@ -163,7 +164,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
                         distributionPoint);
                 break;
             // 季
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getQuarterInfo(
                         deptIdList,
                         param.getStartTime(),
@@ -171,7 +172,7 @@ public class PwRStatOrgServiceImpl implements PwRStatOrgService {
                         distributionPoint);
                 break;
             // 月
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 rStatEventOrgVOList = pwRStatOrgClassifiedMapper.getMonthInfo(
                         deptIdList,
                         param.getStartTime(),

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java

@@ -2,6 +2,7 @@ package com.njcn.event.service.majornetwork.Impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.constant.BizParamConstant;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
 import com.njcn.device.pms.api.StatationStatClient;
@@ -87,16 +88,16 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
         // 创建返回集合
         List<RStatOrgVO> result = new ArrayList<>();
         // 类型（1年 2季度 3月份 4日
-        switch (param.getType()) {
-            case 1:
+        switch (param.getType().toString()) {
+            case BizParamConstant.STAT_BIZ_YEAR:
                 // 获取年区域暂态指标统计
                 result = rStatOrgMapper.getYearRStatOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
                 break;
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 // 获取季区域暂态指标统计
                 result = rStatOrgMapper.getQuarterRStatOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
                 break;
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 // 获取月区域暂态指标统计
                 result = rStatOrgMapper.getMonthRStatOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
                 break;
@@ -145,16 +146,16 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
         // 创建集合封装查询数据
         List<RStatEventOrgPO> temp = new ArrayList<>();
         // 类型（1年 2季度 3月份 4日
-        switch (param.getType()) {
-            case 1:
+        switch (param.getType().toString()) {
+            case BizParamConstant.STAT_BIZ_YEAR:
                 // 获取年区域暂态指标分类统计表
                 temp = rStatEventOrgMapper.getYearRStatEventOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
                 break;
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 // 获取季区域暂态指标分类统计表
                 temp = rStatEventOrgMapper.getQuarterRStatEventOrgInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
                 break;
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 // 获取月区域暂态指标分类统计表
                 temp = rStatEventOrgMapper.getMonthRStatEventOrgInfoInfo(deptCode, param.getStartTime(), param.getEndTime(), mainnetPointId);
                 break;
@@ -265,16 +266,16 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
         List<RStatSubstationVO> result = new ArrayList<>();
 
         // 类型（1年 2季度 3月份 4日
-        switch (param.getType()) {
-            case 1:
+        switch (param.getType().toString()) {
+            case BizParamConstant.STAT_BIZ_YEAR:
                 // 获取年变电站暂态指标分类统计表
                 result = rStatSubstationMapper.getYearInfo(powerIds, param.getStartTime(), param.getEndTime());
                 break;
-            case 2:
+            case BizParamConstant.STAT_BIZ_QUARTER:
                 // 获取季变电站暂态指标分类统计表
                 result = rStatSubstationMapper.getQuarterInfo(powerIds, param.getStartTime(), param.getEndTime());
                 break;
-            case 3:
+            case BizParamConstant.STAT_BIZ_MONTH:
                 // 获取月变电站暂态指标分类统计表
                 result = rStatSubstationMapper.getMonthInfo(powerIds, param.getStartTime(), param.getEndTime());
                 break;

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

@@ -0,0 +1,42 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <专项分析-分布式光伏入参>
+ *
+ * @author wr
+ * @createTime: 2022-11-25
+ */
+@Data
+public class PowerQualityParam extends StatisticsBizBaseParam {
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private int pageNum = 1;
+
+    @ApiModelProperty(value = "每页记录数", example = "10")
+    private int pageSize = 10;
+
+
+    @Data
+    public static class  PowerQualityDetailParam extends StatisticsBizBaseParam{
+
+        @ApiModelProperty(value = "字典id集合",required = true)
+        private Map<String,String> mapId;
+
+        @ApiModelProperty(value = "部门集合",required = true)
+        private List<String> orgNos;
+    }
+
+    @Data
+    public static class  PowerQualityDetailInfoParam extends PowerQualityParam{
+
+        @ApiModelProperty(value = "监测点类别",required = true)
+        private List<String> monitorSort;;
+    }
+}

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

@@ -38,10 +38,13 @@ public class ReportTemplateParam {
     @ApiModelProperty(name = "valueTitle",value = "存取库中")
     private String valueTitle;
 
-    @ApiModelProperty(name = "reportType",value = "自定义报表类型",required = true)
-    @NotBlank(message = "自定义报表类型不可为空")
+    @ApiModelProperty(name = "reportType",value = "模板类型",required = true)
+    @NotBlank(message = "模板类型不可为空")
     private String reportType;
 
+    @ApiModelProperty(name = "reportForm",value = "报表类型",required = true)
+    private String reportForm;
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

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

@@ -5,6 +5,7 @@ import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+
 /**
  * pqs
  * 自定义报表
@@ -27,4 +28,6 @@ public class ExcelRptTemp extends BaseEntity {
 
     private String reportType;
 
+    private String reportForm;
+
 }

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

@@ -0,0 +1,237 @@
+package com.njcn.harmonic.pojo.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 lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/29  15:32【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "pms_monitor")
+public class PmsMonitorPO {
+    /**
+     * 监测点ID
+     */
+    @TableId(value = "Id", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 监测点名称
+     */
+    @TableField(value = "Name")
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField(value = "Org_Name")
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @TableField(value = "Org_Id")
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    @TableField(value = "Operation_Name")
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    @TableField(value = "Operation_Id")
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    @TableField(value = "Powerr_Name")
+    private String powerrName;
+
+    /**
+     * 电站ID(外键)
+     */
+    @TableField(value = "Powerr_Id")
+    private String powerrId;
+
+    /**
+     * 母线名称
+     */
+    @TableField(value = "Generatrix_Name")
+    private String generatrixName;
+
+    /**
+     * 母线ID(外键)
+     */
+    @TableField(value = "Generatrix_Id")
+    private String generatrixId;
+
+    /**
+     * 监测线路名称
+     */
+    @TableField(value = "Line_Name")
+    private String lineName;
+
+    /**
+     * 监测线路ID
+     */
+    @TableField(value = "Line_Id")
+    private String lineId;
+
+    /**
+     * 电压等级(字典)
+     */
+    @TableField(value = "Voltage_Level")
+    private String voltageLevel;
+
+    /**
+     * 监测点状态(字典)
+     */
+    @TableField(value = "Monitor_State")
+    private String monitorState;
+
+    /**
+     * 监测点类型
+     */
+    @TableField(value = "Monitor_Type")
+    private String monitorType;
+
+    /**
+     * 最小短路容量
+     */
+    @TableField(value = "Min_Short_Circuit_Capacity")
+    private Double minShortCircuitCapacity;
+
+    /**
+     * 供电设备容量
+     */
+    @TableField(value = "Power_Supply_Eq_Capacity")
+    private Double powerSupplyEqCapacity;
+
+    /**
+     * 用户协议容量
+     */
+    @TableField(value = "User_Agreement_Capacity")
+    private Double userAgreementCapacity;
+
+    /**
+     * 电压偏差限值（上）
+     */
+    @TableField(value = "Voltage_Deviation_Upper_Limit")
+    private Double voltageDeviationUpperLimit;
+
+    /**
+     * 电压偏差限值（下）
+     */
+    @TableField(value = "Voltage_Deviation_Lower_Limit")
+    private Double voltageDeviationLowerLimit;
+
+    /**
+     * 电压互感器类型(字典)
+     */
+    @TableField(value = "Potential_Trans_Former_Type")
+    private String potentialTransFormerType;
+
+    /**
+     * 中性点接地方式(字典)
+     */
+    @TableField(value = "Neutral_Grounding_Mode")
+    private String neutralGroundingMode;
+
+    /**
+     * 是否用户专线(字典)
+     */
+    @TableField(value = "Is_Special_Supply_Electricity")
+    private String isSpecialSupplyElectricity;
+
+    /**
+     * 监测点标签
+     */
+    @TableField(value = "Monitor_Tag")
+    private String monitorTag;
+
+    /**
+     * 监测对象类型(字典)
+     */
+    @TableField(value = "Monitor_Object_Type")
+    private String monitorObjectType;
+
+    /**
+     * 监测对象编号
+     */
+    @TableField(value = "Monitor_Object_Id")
+    private String monitorObjectId;
+
+    /**
+     * 监测对象名称
+     */
+    @TableField(value = "Monitor_Object_Name")
+    private String monitorObjectName;
+
+    /**
+     * 统计间隔
+     */
+    @TableField(value = "Statistical_Interval")
+    private Integer statisticalInterval;
+
+    /**
+     * 关联的监测终端编号(外键)
+     */
+    @TableField(value = "Terminal_Id")
+    private String terminalId;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    @TableField(value = "Terminal_Wiring_Method")
+    private String terminalWiringMethod;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    @TableField(value = "Is_Up_To_Grid")
+    private Boolean isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    @TableField(value = "Status")
+    private Boolean status;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "Create_By")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "Create_Time")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "Update_By")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "Update_Time")
+    private Date updateTime;
+}

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

@@ -0,0 +1,159 @@
+package com.njcn.harmonic.pojo.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 lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/29  15:53【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "pms_terminal")
+public class PmsTerminalPO {
+    /**
+     * 终端编号
+     */
+    @TableId(value = "Id", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 终端名称
+     */
+    @TableField(value = "Name")
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField(value = "Org_Name")
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @TableField(value = "Org_Id")
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    @TableField(value = "Operation_Name")
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    @TableField(value = "Operation_Id")
+    private String operationId;
+
+    /**
+     * 变电站名称
+     */
+    @TableField(value = "Powerr_Name")
+    private String powerrName;
+
+    /**
+     * 所属电站ID(外键)
+     */
+    @TableField(value = "Power_Station_Id")
+    private String powerStationId;
+
+    /**
+     * 终端状态(字典)
+     */
+    @TableField(value = "Terminal_State")
+    private String terminalState;
+
+    /**
+     * 终端级别(字典)
+     */
+    @TableField(value = "Terminal_Level")
+    private String terminalLevel;
+
+    /**
+     * 装置型号(字典)
+     */
+    @TableField(value = "Device_Model")
+    private String deviceModel;
+
+    /**
+     * 生产厂家(字典)
+     */
+    @TableField(value = "Manufacture")
+    private String manufacture;
+
+    /**
+     * 检定日期
+     */
+    @TableField(value = "Verification_Date")
+    private Date verificationDate;
+
+    /**
+     * 投运日期
+     */
+    @TableField(value = "Use_Date")
+    private Date useDate;
+
+    /**
+     * 测量信号输入形式(字典)
+     */
+    @TableField(value = "Input_Type")
+    private String inputType;
+
+    /**
+     * IP地址
+     */
+    @TableField(value = "Ip")
+    private String ip;
+
+    /**
+     * 通信端口
+     */
+    @TableField(value = "Port")
+    private String port;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    @TableField(value = "Is_Up_To_Grid")
+    private Boolean isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    @TableField(value = "Status")
+    private Boolean status;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "Create_By")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "Create_Time")
+    private Date createTime;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "Update_By")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "Update_Time")
+    private Date updateTime;
+}

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

@@ -1,26 +1,24 @@
 package com.njcn.harmonic.pojo.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.io.Serializable;
-import java.util.Date;
-
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/10/27  13:52【需求编号】
  *
- * @TableName r_mp_inharmonic_v_rate_report_d
+ * @author clam
+ * @version V1.0.0
  */
-@TableName(value ="r_mp_inharmonic_v_rate_report_d")
 @Data
-public class RMpInharmonicVRateReportD implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+@TableName(value = "r_mp_inharmonic_v_rate_report_d")
+public class RMpInharmonicVRateReportD {
     /**
      * 监测点ID
      */

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

@@ -0,0 +1,80 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/29  15:38【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "r_mp_integrity_d")
+public class RMpIntegrityDPO {
+    /**
+     * 监测点id
+     */
+    @MppMultiId(value = "measurement_point_id")
+    private String measurementPointId;
+
+    /**
+     * 生成数据的时间,每天统计一次
+     */
+    @MppMultiId(value = "data_date")
+    private Date dataDate;
+
+    /**
+     * 有效接入分钟数量
+     */
+    @TableField(value = "effective_minute_count")
+    private Integer effectiveMinuteCount;
+
+    /**
+     * 频率平均值指标数据个数
+     */
+    @TableField(value = "freq_count")
+    private Integer freqCount;
+
+    /**
+     * 相电压有效值平均值指标数据个数
+     */
+    @TableField(value = "phase_voltage_count")
+    private Integer phaseVoltageCount;
+
+    /**
+     * 线电压有效值平均值指标数据个数
+     */
+    @TableField(value = "line_voltage_count")
+    private Integer lineVoltageCount;
+
+    /**
+     * 电压总谐波畸变率平均值指标数据个数
+     */
+    @TableField(value = "v_thd_count")
+    private Integer vThdCount;
+
+    /**
+     * 三相电压不平衡度平均值指标数据个数
+     */
+    @TableField(value = "unbalance_count")
+    private Integer unbalanceCount;
+
+    /**
+     * 监测点短时闪变、电压波动类指标数据个数
+     */
+    @TableField(value = "pst_count")
+    private Integer pstCount;
+
+    /**
+     * 监测点长时闪变指标数据个数
+     */
+    @TableField(value = "plt_count")
+    private Integer pltCount;
+}

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

@@ -24,6 +24,7 @@ import java.util.Date;
 /**
  * 单位污区图统计日表
  */
+@ApiModel(value = "com-njcn-harmonic-pojo-po-RMpPollutionDPO")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -0,0 +1,144 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏_台区电能质量明细_月表
+ *
+ * @author yzh
+ * @TableName r_mp_pv_power_detail_m
+ */
+@TableName(value = "r_mp_pv_power_detail_m")
+@Data
+public class RMpPvPowerDetailMPO implements Serializable {
+    /**
+     * 统计时间
+     */
+    private Date dataDate;
+
+    /**
+     * 监测点id
+     */
+    private String measurementPointId;
+
+    /**
+     * 渗透率
+     */
+    @TableField(value = "permeability")
+    private String permeability;
+
+    /**
+     * 电压越上限天数
+     */
+    @TableField(value = "vol_over_max_date")
+    private String volOverMaxDate;
+
+    /**
+     * 电压越下限天数
+     */
+    @TableField(value = "vol_over_min_date")
+    private String volOverMinDate;
+
+    /**
+     * 电压上限值
+     */
+    @TableField(value = "vol_over_max")
+    private Float volOverMax;
+
+    /**
+     * 电压下限值
+     */
+    @TableField(value = "vol_over_min")
+    private Float volOverMin;
+
+
+    /**
+     * 电压越上限天数7%~15%
+     */
+    @TableField(value = "vol_over_max_date7_15")
+    private String volOverMaxDate715;
+
+    /**
+     * 电压越上限天数15%以上
+     */
+    @TableField(value = "vol_over_max_date15_")
+    private String volOverMaxDate15;
+
+    /**
+     * 电压越上限严重度
+     */
+    @TableField(value = "vol_over_max_severity")
+    private String volOverMaxSeverity;
+
+    /**
+     * 电压越下限严重度
+     */
+    @TableField(value = "vol_over_min_severity")
+    private String volOverMinSeverity;
+
+    /**
+     * 低功率因数占比
+     */
+    @TableField(value = "low_power_factor_ratio")
+    private Double lowPowerFactorRatio;
+
+    /**
+     * 功率因数
+     */
+    @TableField(value = "low_power_factor")
+    private String lowPowerFactor;
+
+    /**
+     * 潮流倒送电量
+     */
+    @TableField(value = "stream_electricity")
+    private String streamElectricity;
+
+    /**
+     * 潮流倒送天数
+     */
+    @TableField(value = "stream_recover_date")
+    private String streamRecoverDate;
+
+    /**
+     * 潮流倒送时设备负载率
+     */
+    @TableField(value = "stream_load_rate")
+    private String streamLoadRate;
+
+    /**
+     * 潮流道送时长占比
+     */
+    @TableField(value = "stream_timing_rate")
+    private String streamTimingRate;
+
+    /**
+     * 低功率因数（0.7以下）
+     */
+    @TableField(value = "low_power_factor_7")
+    private String lowPowerFactor7;
+
+    /**
+     * 低功率因数（0.7-0.8）
+     */
+    @TableField(value = "low_power_factor7_8")
+    private String lowPowerFactor78;
+
+    /**
+     * 低功率因数（0.8-0.9）
+     */
+    @TableField(value = "low_power_factor8_9")
+    private String lowPowerFactor89;
+
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,139 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏_台区电能质量明细_季表
+ *
+ * @author yzh
+ * @TableName r_mp_pv_power_detail_q
+ */
+@TableName(value = "r_mp_pv_power_detail_q")
+@Data
+public class RMpPvPowerDetailQPO implements Serializable {
+    /**
+     * 统计时间
+     */
+    private Date dataDate;
+
+    /**
+     * 监测点id
+     */
+    private String measurementPointId;
+
+    /**
+     * 渗透率
+     */
+    @TableField(value = "permeability")
+    private String permeability;
+
+    /**
+     * 电压越上限天数
+     */
+    @TableField(value = "vol_over_max_date")
+    private String volOverMaxDate;
+
+    /**
+     * 电压越下限天数
+     */
+    @TableField(value = "vol_over_min_date")
+    private String volOverMinDate;
+
+    /**
+     * 电压上限值
+     */
+    @TableField(value = "vol_over_max")
+    private Float volOverMax;
+
+    /**
+     * 电压下限值
+     */
+    @TableField(value = "vol_over_min")
+    private Float volOverMin;
+
+    /**
+     * 电压越上限天数7%~15%
+     */
+    @TableField(value = "vol_over_max_date7_15")
+    private String volOverMaxDate715;
+
+    /**
+     * 电压越上限天数15%以上
+     */
+    @TableField(value = "vol_over_max_date15_")
+    private String volOverMaxDate15;
+
+    /**
+     * 电压越上限严重度
+     */
+    @TableField(value = "vol_over_max_severity")
+    private String volOverMaxSeverity;
+
+    /**
+     * 电压越下限严重度
+     */
+    @TableField(value = "vol_over_min_severity")
+    private String volOverMinSeverity;
+
+    /**
+     * 低功率因数占比
+     */
+    @TableField(value = "low_power_factor_ratio")
+    private Double lowPowerFactorRatio;
+
+    /**
+     * 功率因数
+     */
+    @TableField(value = "low_power_factor")
+    private String lowPowerFactor;
+
+    /**
+     * 潮流倒送电量
+     */
+    @TableField(value = "stream_electricity")
+    private String streamElectricity;
+
+    /**
+     * 潮流倒送天数
+     */
+    @TableField(value = "stream_recover_date")
+    private String streamRecoverDate;
+
+    /**
+     * 潮流倒送时设备负载率
+     */
+    @TableField(value = "stream_load_rate")
+    private String streamLoadRate;
+
+    /**
+     * 潮流道送时长占比
+     */
+    @TableField(value = "stream_timing_rate")
+    private String streamTimingRate;
+
+    /**
+     * 低功率因数（0.7以下）
+     */
+    @TableField(value = "low_power_factor_7")
+    private String lowPowerFactor7;
+
+    /**
+     * 低功率因数（0.7-0.8）
+     */
+    @TableField(value = "low_power_factor7_8")
+    private String lowPowerFactor78;
+
+    /**
+     * 低功率因数（0.8-0.9）
+     */
+    @TableField(value = "low_power_factor8_9")
+    private String lowPowerFactor89;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,140 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏_台区电能质量明细_年表
+ *
+ * @author yzh
+ * @TableName r_mp_pv_power_detail_y
+ */
+@TableName(value = "r_mp_pv_power_detail_y")
+@Data
+public class RMpPvPowerDetailYPO implements Serializable {
+    /**
+     * 统计时间
+     */
+    private Date dataDate;
+
+    /**
+     * 监测点id
+     */
+    private String measurementPointId;
+
+    /**
+     * 渗透率
+     */
+    @TableField(value = "permeability")
+    private String permeability;
+
+    /**
+     * 电压越上限天数
+     */
+    @TableField(value = "vol_over_max_date")
+    private String volOverMaxDate;
+
+    /**
+     * 电压越下限天数
+     */
+    @TableField(value = "vol_over_min_date")
+    private String volOverMinDate;
+
+    /**
+     * 电压上限值
+     */
+    @TableField(value = "vol_over_max")
+    private Float volOverMax;
+
+    /**
+     * 电压下限值
+     */
+    @TableField(value = "vol_over_min")
+    private Float volOverMin;
+
+    /**
+     * 电压越上限天数7%~15%
+     */
+    @TableField(value = "vol_over_max_date7_15")
+    private String volOverMaxDate715;
+
+    /**
+     * 电压越上限天数15%以上
+     */
+    @TableField(value = "vol_over_max_date15_")
+    private String volOverMaxDate15;
+
+    /**
+     * 电压越上限严重度
+     */
+    @TableField(value = "vol_over_max_severity")
+    private String volOverMaxSeverity;
+
+    /**
+     * 电压越下限严重度
+     */
+    @TableField(value = "vol_over_min_severity")
+    private String volOverMinSeverity;
+
+    /**
+     * 低功率因数占比
+     */
+    @TableField(value = "low_power_factor_ratio")
+    private Double lowPowerFactorRatio;
+
+    /**
+     * 功率因数
+     */
+    @TableField(value = "low_power_factor")
+    private String lowPowerFactor;
+
+    /**
+     * 潮流倒送电量
+     */
+    @TableField(value = "stream_electricity")
+    private String streamElectricity;
+
+    /**
+     * 潮流倒送天数
+     */
+    @TableField(value = "stream_recover_date")
+    private String streamRecoverDate;
+
+    /**
+     * 潮流倒送时设备负载率
+     */
+    @TableField(value = "stream_load_rate")
+    private String streamLoadRate;
+
+    /**
+     * 潮流道送时长占比
+     */
+    @TableField(value = "stream_timing_rate")
+    private String streamTimingRate;
+
+    /**
+     * 低功率因数（0.7以下）
+     */
+    @TableField(value = "low_power_factor_7")
+    private String lowPowerFactor7;
+
+    /**
+     * 低功率因数（0.7-0.8）
+     */
+    @TableField(value = "low_power_factor7_8")
+    private String lowPowerFactor78;
+
+    /**
+     * 低功率因数（0.8-0.9）
+     */
+    @TableField(value = "low_power_factor8_9")
+    private String lowPowerFactor89;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,118 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电站_台区电能质量明细_月表
+ * </p>
+ *
+ * @author wr
+ * @since 2022-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_wp_power_detail_m")
+@ApiModel(value="RMpWpPowerDetailM对象", description="风电站_台区电能质量明细_月表")
+public class RMpWpPowerDetailM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点id")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "统计时间")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "负载率(平均值)")
+    private Float loadRateAvg;
+
+    @ApiModelProperty(value = "负载率(95%值)")
+    @TableField(value = "load_rate_95")
+    private Float loadRate95;
+
+    @ApiModelProperty(value = "负载率(99%值)")
+    @TableField(value = "load_rate_99")
+    private Float loadRate99;
+
+    @ApiModelProperty(value = "谐波电压超标情况(0:否 1:是)")
+    private Integer isV;
+
+    @ApiModelProperty(value = "谐波电流超标情况(0:否 1:是)")
+    private Integer isI;
+
+    @ApiModelProperty(value = "电压不平衡度超标情况(0:否 1:是)")
+    private Integer isUnbalance;
+
+    @ApiModelProperty(value = "负序电流超标情况(0:否 1:是)")
+    private Integer isINeg;
+
+    @ApiModelProperty(value = "谐波电压超标次数")
+    private Integer vTimes;
+
+    @ApiModelProperty(value = "谐波电流超标次数")
+    private Integer iTimes;
+
+    @ApiModelProperty(value = "总有功功率99值")
+    @TableField(value = "total_active_power_99")
+    private Float totalActivePower99;
+
+    @ApiModelProperty(value = "总有功功率95值")
+    @TableField(value = "total_active_power_95")
+    private Float totalActivePower95;
+
+    @ApiModelProperty(value = "总有功功率平均值")
+    private Float totalActivePowerAvg;
+
+    @ApiModelProperty(value = "A相有功功率95值")
+    @TableField(value = "ap_active_power_95")
+    private Float apActivePower95;
+
+    @ApiModelProperty(value = "A相有功功率99值")
+    @TableField(value = "ap_active_power_99")
+    private Float apActivePower99;
+
+    @ApiModelProperty(value = "A相有功功率平均值")
+    private Float apActivePowerAvg;
+
+    @ApiModelProperty(value = "B相有功功率95值")
+    @TableField(value = "bp_active_power_95")
+    private Float bpActivePower95;
+
+    @ApiModelProperty(value = "B相有功功率99值")
+    @TableField(value = "bp_active_power_99")
+    private Float bpActivePower99;
+
+    @ApiModelProperty(value = "B相有功功率平均值")
+    private Float bpActivePowerAvg;
+
+    @ApiModelProperty(value = "A相基波电压")
+    private Float apFundamentalVoltage;
+
+    @ApiModelProperty(value = "B相基波电压")
+    private Float bpFundamentalVoltage;
+
+    @ApiModelProperty(value = "C相基波电压")
+    private Float cpFundamentalVoltage;
+
+    @ApiModelProperty(value = "负序电压不平衡度")
+    private Float negativeSequenceVoltageUnbalance;
+
+    @ApiModelProperty(value = "电网暂降次数")
+    private Integer gridDipNum;
+
+    @ApiModelProperty(value = "脱网事件次数")
+    private Integer offlineNum;
+
+
+}

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

@@ -0,0 +1,118 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电站_台区电能质量明细_季表
+ * </p>
+ *
+ * @author wr
+ * @since 2022-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_wp_power_detail_q")
+@ApiModel(value="RMpWpPowerDetailQ对象", description="风电站_台区电能质量明细_季表")
+public class RMpWpPowerDetailQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点id")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "统计时间")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "负载率(平均值)")
+    private Float loadRateAvg;
+
+    @ApiModelProperty(value = "负载率(95%值)")
+    @TableField(value = "load_rate_95")
+    private Float loadRate95;
+
+    @ApiModelProperty(value = "负载率(99%值)")
+    @TableField(value = "load_rate_99")
+    private Float loadRate99;
+
+    @ApiModelProperty(value = "谐波电压超标情况(0:否 1:是)")
+    private Integer isV;
+
+    @ApiModelProperty(value = "谐波电流超标情况(0:否 1:是)")
+    private Integer isI;
+
+    @ApiModelProperty(value = "电压不平衡度超标情况(0:否 1:是)")
+    private Integer isUnbalance;
+
+    @ApiModelProperty(value = "负序电流超标情况(0:否 1:是)")
+    private Integer isINeg;
+
+    @ApiModelProperty(value = "谐波电压超标次数")
+    private Integer vTimes;
+
+    @ApiModelProperty(value = "谐波电流超标次数")
+    private Integer iTimes;
+
+    @ApiModelProperty(value = "总有功功率99值")
+    @TableField(value = "total_active_power_99")
+    private Float totalActivePower99;
+
+    @ApiModelProperty(value = "总有功功率95值")
+    @TableField(value = "total_active_power_95")
+    private Float totalActivePower95;
+
+    @ApiModelProperty(value = "总有功功率平均值")
+    private Float totalActivePowerAvg;
+
+    @ApiModelProperty(value = "A相有功功率95值")
+    @TableField(value = "ap_active_power_95")
+    private Float apActivePower95;
+
+    @ApiModelProperty(value = "A相有功功率99值")
+    @TableField(value = "ap_active_power_99")
+    private Float apActivePower99;
+
+    @ApiModelProperty(value = "A相有功功率平均值")
+    private Float apActivePowerAvg;
+
+    @ApiModelProperty(value = "B相有功功率95值")
+    @TableField(value = "bp_active_power_95")
+    private Float bpActivePower95;
+
+    @ApiModelProperty(value = "B相有功功率99值")
+    @TableField(value = "bp_active_power_99")
+    private Float bpActivePower99;
+
+    @ApiModelProperty(value = "B相有功功率平均值")
+    private Float bpActivePowerAvg;
+
+    @ApiModelProperty(value = "A相基波电压")
+    private Float apFundamentalVoltage;
+
+    @ApiModelProperty(value = "B相基波电压")
+    private Float bpFundamentalVoltage;
+
+    @ApiModelProperty(value = "C相基波电压")
+    private Float cpFundamentalVoltage;
+
+    @ApiModelProperty(value = "负序电压不平衡度")
+    private Float negativeSequenceVoltageUnbalance;
+
+    @ApiModelProperty(value = "电网暂降次数")
+    private Integer gridDipNum;
+
+    @ApiModelProperty(value = "脱网事件次数")
+    private Integer offlineNum;
+
+
+}

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

@@ -0,0 +1,118 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风电站_台区电能质量明细_年表
+ * </p>
+ *
+ * @author wr
+ * @since 2022-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_mp_wp_power_detail_y")
+@ApiModel(value="RMpWpPowerDetailY对象", description="风电站_台区电能质量明细_年表")
+public class RMpWpPowerDetailY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "监测点id")
+    @TableId(value = "measurement_point_id", type = IdType.ASSIGN_ID)
+    private String measurementPointId;
+
+    @ApiModelProperty(value = "统计时间")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "负载率(平均值)")
+    private Float loadRateAvg;
+
+    @ApiModelProperty(value = "负载率(95%值)")
+    @TableField(value = "load_rate_95")
+    private Float loadRate95;
+
+    @ApiModelProperty(value = "负载率(99%值)")
+    @TableField(value = "load_rate_99")
+    private Float loadRate99;
+
+    @ApiModelProperty(value = "谐波电压超标情况(0:否 1:是)")
+    private Integer isV;
+
+    @ApiModelProperty(value = "谐波电流超标情况(0:否 1:是)")
+    private Integer isI;
+
+    @ApiModelProperty(value = "电压不平衡度超标情况(0:否 1:是)")
+    private Integer isUnbalance;
+
+    @ApiModelProperty(value = "负序电流超标情况(0:否 1:是)")
+    private Integer isINeg;
+
+    @ApiModelProperty(value = "谐波电压超标次数")
+    private Integer vTimes;
+
+    @ApiModelProperty(value = "谐波电流超标次数")
+    private Integer iTimes;
+
+    @ApiModelProperty(value = "总有功功率99值")
+    @TableField(value = "total_active_power_99")
+    private Float totalActivePower99;
+
+    @ApiModelProperty(value = "总有功功率95值")
+    @TableField(value = "total_active_power_95")
+    private Float totalActivePower95;
+
+    @ApiModelProperty(value = "总有功功率平均值")
+    private Float totalActivePowerAvg;
+
+    @ApiModelProperty(value = "A相有功功率95值")
+    @TableField(value = "ap_active_power_95")
+    private Float apActivePower95;
+
+    @ApiModelProperty(value = "A相有功功率99值")
+    @TableField(value = "ap_active_power_99")
+    private Float apActivePower99;
+
+    @ApiModelProperty(value = "A相有功功率平均值")
+    private Float apActivePowerAvg;
+
+    @ApiModelProperty(value = "B相有功功率95值")
+    @TableField(value = "bp_active_power_95")
+    private Float bpActivePower95;
+
+    @ApiModelProperty(value = "B相有功功率99值")
+    @TableField(value = "bp_active_power_99")
+    private Float bpActivePower99;
+
+    @ApiModelProperty(value = "B相有功功率平均值")
+    private Float bpActivePowerAvg;
+
+    @ApiModelProperty(value = "A相基波电压")
+    private Float apFundamentalVoltage;
+
+    @ApiModelProperty(value = "B相基波电压")
+    private Float bpFundamentalVoltage;
+
+    @ApiModelProperty(value = "C相基波电压")
+    private Float cpFundamentalVoltage;
+
+    @ApiModelProperty(value = "负序电压不平衡度")
+    private Float negativeSequenceVoltageUnbalance;
+
+    @ApiModelProperty(value = "电网暂降次数")
+    private Integer gridDipNum;
+
+    @ApiModelProperty(value = "脱网事件次数")
+    private Integer offlineNum;
+
+
+}

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

@@ -0,0 +1,107 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/25  10:01【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 
+    */
+@Data
+@TableName(value = "r_operating_index_d")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ROperatingIndexDPO {
+    /**
+     * 单位ID
+     */
+    @MppMultiId(value = "org_no")
+    private String orgNo;
+
+    /**
+     * 时间
+     */
+    @MppMultiId(value = "data_date")
+    private Date dataDate;
+
+    /**
+     * 在运监测点数
+     */
+    @TableField(value = "measurement_run_points")
+    private Integer measurementRunPoints;
+
+    /**
+     * 在线监测点数
+     */
+    @TableField(value = "transit_measurement_points")
+    private Integer transitMeasurementPoints;
+
+    /**
+     * 有效接入监测点数量
+     */
+    @TableField(value = "effective_access_measurement_count")
+    private Integer effectiveAccessMeasurementCount;
+
+    /**
+     * 监测终端数
+     */
+    @TableField(value = "online_measurement_points")
+    private Integer onlineMeasurementPoints;
+
+    /**
+     * 在线终端数
+     */
+    @TableField(value = "online_measurement_count")
+    private Integer onlineMeasurementCount;
+
+    /**
+     * 应设点数
+     */
+    @TableField(value = "should_count")
+    private Integer shouldCount;
+
+    /**
+     * 应设点覆盖率
+     */
+    @TableField(value = "should_point_coverage")
+    private Double shouldPointCoverage;
+
+    /**
+     * 数据完整率
+     */
+    @TableField(value = "data_integrity_rate")
+    private Double dataIntegrityRate;
+
+    /**
+     * 数据准确率
+     */
+    @TableField(value = "data_right_rate")
+    private Double dataRightRate;
+
+    /**
+     * 指标完整率
+     */
+    @TableField(value = "index_integrity_rate")
+    private Double indexIntegrityRate;
+
+    /**
+     * 数据否异常(0:正常 1:异常)
+     */
+    @TableField(value = "is_unusual")
+    private Integer isUnusual;
+}

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

@@ -0,0 +1,38 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/28  19:31【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "r_stat_abnormal_d")
+public class RStatAbnormalDPO {
+    /**
+     * 时间
+     */
+    @MppMultiId(value = "data_date")
+    private Date dataDate;
+
+    /**
+     * 监测点ID
+     */
+    @MppMultiId(value = "measurement_point_id")
+    private String measurementPointId;
+
+    /**
+     * 数据是否异常（0异常，1正常）
+     */
+    @TableField(value = "value_alarm")
+    private Integer valueAlarm;
+}

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

@@ -0,0 +1,54 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏统计表-按区域
+ *
+ * @author yzh
+ * @TableName r_stat_org_pv_area
+ */
+@TableName(value = "r_stat_org_pv_area")
+@Data
+public class RStatOrgPvAreaPO implements Serializable {
+    /**
+     * 数据统计日期
+     */
+    private Date dataDate;
+
+    /**
+     * 所属单位
+     */
+    private String orgNo;
+
+    /**
+     * 台区电能质量事件类型，详见code表
+     */
+    private String areaPqEventType;
+
+    /**
+     * 用户数
+     */
+    @TableField(value = "user_num")
+    private Integer userNum;
+
+    /**
+     * 装机容量
+     */
+    @TableField(value = "installed_capacity")
+    private Integer installedCapacity;
+
+    /**
+     * 监测点数量
+     */
+    @TableField(value = "monitor_point_num")
+    private Integer monitorPointNum;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,59 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏统计表-按监测点类型
+ *
+ * @author yzh
+ * @TableName r_stat_org_pv_monitor_type
+ */
+@TableName(value = "r_stat_org_pv_monitor_type")
+@Data
+public class RStatOrgPvMonitorTypePO implements Serializable {
+    /**
+     * 数据统计日期
+     */
+    private Date dataDate;
+
+    /**
+     * 所属单位
+     */
+    private String orgNo;
+
+    /**
+     * 监测点类型
+     */
+    private String monitorType;
+
+    /**
+     * 台区电能质量事件类型，详见code表
+     */
+    private String areaPqEventType;
+
+    /**
+     * 用户数
+     */
+    @TableField(value = "user_num")
+    private Integer userNum;
+
+    /**
+     * 装机容量
+     */
+    @TableField(value = "installed_capacity")
+    private Integer installedCapacity;
+
+    /**
+     * 监测点数量
+     */
+    @TableField(value = "monitor_point_num")
+    private Integer monitorPointNum;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,71 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏_台区电能质量统计_月表
+ *
+ * @author yzh
+ * @TableName r_stat_org_pv_power_quality_m
+ */
+@TableName(value = "r_stat_org_pv_power_quality_m")
+@Data
+public class RStatOrgPvPowerQualityMPO implements Serializable {
+    /**
+     * 统计月份
+     */
+    private Date dataDate;
+
+    /**
+     * 所属单位
+     */
+    private String orgNo;
+
+    /**
+     * 监测对象（字典）
+     */
+    private String monitoringObject;
+
+    /**
+     * 台区电能质量事件类型，详见code表
+     */
+    private String areaPqEventType;
+
+    /**
+     * 日均监测点数
+     */
+    @TableField(value = "avg_monitor_num")
+    private Integer avgMonitorNum;
+
+    /**
+     * 累计监测点数
+     */
+    @TableField(value = "total_monitor_num")
+    private Integer totalMonitorNum;
+
+    /**
+     * 总监测点数（有效接入，计算占比时作为分母）
+     */
+    @TableField(value = "monitor_valid_num")
+    private Integer monitorValidNum;
+
+    /**
+     * 日均事件天数
+     */
+    @TableField(value = "avg_date_num")
+    private Integer avgDateNum;
+
+    /**
+     * 累计事件天数
+     */
+    @TableField(value = "total_date_num")
+    private Integer totalDateNum;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,71 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏_台区电能质量统计_季表
+ *
+ * @author yzh
+ * @TableName r_stat_org_pv_power_quality_q
+ */
+@TableName(value = "r_stat_org_pv_power_quality_q")
+@Data
+public class RStatOrgPvPowerQualityQPO implements Serializable {
+    /**
+     * 统计月份
+     */
+    private Date dataDate;
+
+    /**
+     * 所属单位
+     */
+    private String orgNo;
+
+    /**
+     * 监测对象（字典）
+     */
+    private String monitoringObject;
+
+    /**
+     * 台区电能质量事件类型，详见code表
+     */
+    private String areaPqEventType;
+
+    /**
+     * 日均监测点数
+     */
+    @TableField(value = "avg_monitor_num")
+    private Integer avgMonitorNum;
+
+    /**
+     * 累计监测点数
+     */
+    @TableField(value = "total_monitor_num")
+    private Integer totalMonitorNum;
+
+    /**
+     * 总监测点数（有效接入，计算占比时作为分母）
+     */
+    @TableField(value = "monitor_valid_num")
+    private Integer monitorValidNum;
+
+    /**
+     * 日均事件天数
+     */
+    @TableField(value = "avg_date_num")
+    private Integer avgDateNum;
+
+    /**
+     * 累计事件天数
+     */
+    @TableField(value = "total_date_num")
+    private Integer totalDateNum;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,71 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏_台区电能质量统计_年表
+ *
+ * @author yzh
+ * @TableName r_stat_org_pv_power_quality_y
+ */
+@TableName(value = "r_stat_org_pv_power_quality_y")
+@Data
+public class RStatOrgPvPowerQualityYPO implements Serializable {
+    /**
+     * 统计月份
+     */
+    private Date dataDate;
+
+    /**
+     * 所属单位
+     */
+    private String orgNo;
+
+    /**
+     * 监测对象（字典）
+     */
+    private String monitoringObject;
+
+    /**
+     * 台区电能质量事件类型，详见code表
+     */
+    private String areaPqEventType;
+
+    /**
+     * 日均监测点数
+     */
+    @TableField(value = "avg_monitor_num")
+    private Integer avgMonitorNum;
+
+    /**
+     * 累计监测点数
+     */
+    @TableField(value = "total_monitor_num")
+    private Integer totalMonitorNum;
+
+    /**
+     * 总监测点数（有效接入，计算占比时作为分母）
+     */
+    @TableField(value = "monitor_valid_num")
+    private Integer monitorValidNum;
+
+    /**
+     * 日均事件天数
+     */
+    @TableField(value = "avg_date_num")
+    private Integer avgDateNum;
+
+    /**
+     * 累计事件天数
+     */
+    @TableField(value = "total_date_num")
+    private Integer totalDateNum;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,59 @@
+package com.njcn.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 分布式光伏统计表-按电压等级
+ *
+ * @author yzh
+ * @TableName r_stat_org_pv_voltage
+ */
+@TableName(value = "r_stat_org_pv_voltage")
+@Data
+public class RStatOrgPvVoltagePO implements Serializable {
+    /**
+     * 数据统计日期
+     */
+    private Date dataDate;
+
+    /**
+     * 所属单位
+     */
+    private String orgNo;
+
+    /**
+     * 电压等级
+     */
+    private String voltageClass;
+
+    /**
+     * 台区电能质量事件类型，详见code表
+     */
+    private String areaPqEventType;
+
+    /**
+     * 用户数
+     */
+    @TableField(value = "user_num")
+    private Integer userNum;
+
+    /**
+     * 装机容量
+     */
+    @TableField(value = "installed_capacity")
+    private Integer installedCapacity;
+
+    /**
+     * 监测点数量
+     */
+    @TableField(value = "monitor_point_num")
+    private Integer monitorPointNum;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,55 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 获取电压越限分析返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/11/22
+ */
+@Data
+@ApiModel("获取电压越限分析返回前端实体类")
+public class RMpPvPowerDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    /**
+     * 监测点类型
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类型")
+    private String monitorSort;
+
+    /**
+     * 电压越上限天数
+     */
+    @ApiModelProperty(name = "volOverMaxDate", value = "电压越上限天数")
+    private String volOverMaxDate;
+
+    /**
+     * 电压越下限天数
+     */
+    @ApiModelProperty(name = "volOverMinDate", value = "电压越下限天数")
+    private String volOverMinDate;
+
+    /**
+     * 电压越上限天数
+     */
+    @ApiModelProperty(name = "volOverMaxSeverity", value = "电压越上限严重度")
+    private String volOverMaxSeverity;
+
+    /**
+     * 电压越下限严重度
+     */
+    @ApiModelProperty(name = "volOverMinSeverity", value = "电压越下限严重度")
+    private String volOverMinSeverity;
+}

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

@@ -0,0 +1,59 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 获取电压越限分析返回前端实体类
+ *
+ * @author wr
+ * @date 2022/11/28
+ */
+@Data
+@ApiModel("详细数据实体")
+public class RStatOrgPvDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "orgNo", value = "所属单位Code")
+    private String orgNo;
+
+    @ApiModelProperty(name = "orgName", value = "所属单位名称")
+    private String orgName;
+
+    @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+    private String measurementPointId;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+    @ApiModelProperty(name = "voltageLevels", value = "电压等级")
+    private String voltageLevels;
+
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别(字典)")
+    private String monitorSort;
+
+    @ApiModelProperty(name = "volOverMax", value = "电压上限值")
+    private Float volOverMax;
+
+    @ApiModelProperty(name = "volOverMin", value = "电压下限值")
+    private Float volOverMin;
+
+    @ApiModelProperty(name = "volOverMin", value = "潮流倒送电量")
+    private String streamElectricity;
+
+    @ApiModelProperty(name = "volOverMin", value = "潮流倒送时设备负载率")
+    private String streamLoadRate;
+
+    @ApiModelProperty(name = "permeability", value = "渗透率")
+    private String permeability;
+
+    @ApiModelProperty(name = "lowPowerFactor", value = "功率因数")
+    private String lowPowerFactor;
+
+
+
+}

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

@@ -0,0 +1,40 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 获取电压越限分析返回前端实体类
+ *
+ * @author wr
+ * @date 2022/11/22
+ */
+@Data
+@ApiModel("低功率因数实体")
+public class  RStatOrgPvPowerStreamVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "orgNo", value = "所属单位")
+    private String orgNo;
+
+    @ApiModelProperty(name = "monitoringObject", value = "监测对象")
+    private String monitoringObject;
+
+    @ApiModelProperty(name = "lowPowerFactor89", value = "0.8-0.9")
+    private Integer lowPowerFactor89;
+
+    @ApiModelProperty(name = "lowPowerFactor78", value = "0.7-0.8")
+    private Integer lowPowerFactor78;
+
+    @ApiModelProperty(name = "lowPowerFactor7", value = "0.7以下")
+    private Integer lowPowerFactor7;
+
+    @ApiModelProperty(name = "lowPowerFactorRatio", value = "低功率因数占比")
+    private Float lowPowerFactorRatio;
+
+
+}

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

@@ -0,0 +1,72 @@
+package com.njcn.harmonic.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分布式光伏-分布式光伏总览返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/11/24
+ */
+@Data
+@ApiModel("分布式光伏-分布式光伏总览返回前端实体类")
+public class RStatOrgPvVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 潮流倒送
+     */
+    @ApiModelProperty(name = "flowReversal", value = "潮流倒送")
+    private List<FlowReversal> flowReversal;
+
+    /**
+     * 电压越限
+     */
+    @ApiModelProperty(name = "voltageOutOfLimit", value = "电压越限")
+    private List<VoltageOutOfLimit> voltageOutOfLimit;
+
+    /**
+     * 光伏渗透率
+     */
+    @ApiModelProperty(name = "pvPermeability", value = "光伏渗透率")
+    private List<PvPermeability> pvPermeability;
+
+    /**
+     * 低功率因素
+     */
+    @ApiModelProperty(name = "lowPowerFactor", value = "低功率因素")
+    private List<LowPowerFactor> lowPowerFactor;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class FlowReversal extends SimpleVO {
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class VoltageOutOfLimit extends SimpleVO {
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class PvPermeability extends SimpleVO {
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class LowPowerFactor extends SimpleVO {
+    }
+
+    @Data
+    private static class SimpleVO {
+        private String monitor;
+        private String type;
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java

@@ -219,9 +219,9 @@ public class CustomReportController extends BaseController {
     @PostMapping("/getCustomReport")
     @ApiOperation("获取报表")
     @ApiImplicitParam(name = "reportSearchParam", value = "查询体", required = false)
-    public HttpResult<String> getCustomReport(@RequestBody ReportSearchParam reportSearchParam){
+    public HttpResult<List<String>> getCustomReport(@RequestBody ReportSearchParam reportSearchParam){
         String methodDescribe = getMethodDescribe("getCustomReport");
-        String res = customReportService.getCustomReport(reportSearchParam);
+        List<String> res = customReportService.getCustomReport(reportSearchParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/DistributedPvOverviewController.java

@@ -0,0 +1,92 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.vo.RStatOrgPvVO;
+import com.njcn.harmonic.service.specialanalysis.DistributedPvOverviewService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 专项分析-分布式光伏-分布式光伏总览
+ *
+ * @author yzh
+ * @date 2022/11/24
+ */
+
+@RestController
+@RequestMapping("/distributedPvOverview")
+@Slf4j
+@Api(tags = "专项分析-分布式光伏")
+@RequiredArgsConstructor
+public class DistributedPvOverviewController extends BaseController {
+
+    private final DistributedPvOverviewService distributedPvOverviewService;
+
+    /**
+     * 按区域获取分布式光伏总览
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO>>
+     * @author yzh
+     * @date 2022/11/24
+     */
+    @PostMapping("/getDistributedPvOverviewArea")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("按区域获取分布式光伏总览")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<RStatOrgPvVO> getDistributedPvOverviewArea(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getDistributedPvOverviewArea");
+        RStatOrgPvVO list = distributedPvOverviewService.getDistributedPvOverviewArea(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 按电压等级获取分布式光伏总览
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO>>
+     * @author yzh
+     * @date 2022/11/24
+     */
+    @PostMapping("/getDistributedPvOverviewVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("按电压等级获取分布式光伏总览")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<RStatOrgPvVO> getDistributedPvOverviewVoltage(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getDistributedPvOverviewVoltage");
+        RStatOrgPvVO list = distributedPvOverviewService.getDistributedPvOverviewVoltage(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 按监测点类型获取分布式光伏总览
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO>>
+     * @author yzh
+     * @date 2022/11/24
+     */
+    @PostMapping("/getDistributedPvOverviewLineSort")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("按监测点类型获取分布式光伏总览")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<RStatOrgPvVO> getDistributedPvOverviewLineSort(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getDistributedPvOverviewLineSort");
+        RStatOrgPvVO list = distributedPvOverviewService.getDistributedPvOverviewLineSort(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/DistributedPvVolOverController.java

@@ -0,0 +1,56 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO;
+import com.njcn.harmonic.service.specialanalysis.DistributedPvVolOverService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 专项分析-分布式光伏-电压越限分析
+ *
+ * @author yzh
+ * @date 2022/11/15
+ */
+@RestController
+@RequestMapping("/distributedPvVolOver")
+@Slf4j
+@Api(tags = "专项分析-分布式光伏")
+@RequiredArgsConstructor
+public class DistributedPvVolOverController extends BaseController {
+
+    private final DistributedPvVolOverService distributedPvVolOverService;
+
+    /**
+     * 获取电压越限分析
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < ?>>
+     * @author yzh
+     * @date 2022/11/22
+     */
+    @PostMapping("/getVoltageOutOfLimitAnalysis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取分布式光伏电压越限分析")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RMpPvPowerDetailVO>> getVoltageOutOfLimitAnalysis(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getVoltageOutOfLimitAnalysis");
+        List<RMpPvPowerDetailVO> list = distributedPvVolOverService.getVoltageOutOfLimitAnalysis(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java

@@ -0,0 +1,69 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.pojo.param.PowerQualityParam;
+import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO;
+import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO;
+import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <专项分析-分布式光伏>
+ *
+ * @author wr
+ * @createTime: 2022-11-25
+ */
+@RestController
+@RequestMapping("/distributedPvVolOver")
+@Api(tags = "专项分析-分布式光伏")
+@RequiredArgsConstructor
+public class RStatOrgPvPowerQualityController extends BaseController {
+
+    private final RStatOrgPvPowerQualityService rStatOrgPvPowerQualityService;
+
+
+    /**
+     * 低功率因数统计
+     * @param param
+     * @return
+     */
+    @PostMapping("/getPowerQualityStream")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("低功率因数统计")
+    @ApiImplicitParam(name = "param", value = "分页查询参数", required = true)
+    public HttpResult<Page<RStatOrgPvPowerStreamVO>> getPowerQualityStream(@RequestBody PowerQualityParam param) {
+        String methodDescribe = getMethodDescribe("getPowerQualityStream");
+        Page<RStatOrgPvPowerStreamVO> powerQualityStream = rStatOrgPvPowerQualityService.getPowerQualityStream(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerQualityStream, methodDescribe);
+    }
+
+    /**
+     * 详细数据表分页查询
+     * @param param
+     * @return
+     */
+    @PostMapping("/getPowerQualityInfo")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("详细数据表分页查询")
+    @ApiImplicitParam(name = "param", value = "分页查询参数", required = true)
+    public HttpResult<Page<RStatOrgPvDetailVO>> getPowerQualityInfo(@RequestBody PowerQualityParam.PowerQualityDetailInfoParam param) {
+        String methodDescribe = getMethodDescribe("getPowerQualityInfo");
+        Page<RStatOrgPvDetailVO> powerQualityInfo = rStatOrgPvPowerQualityService.getPowerQualityInfo(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerQualityInfo, methodDescribe);
+    }
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java

@@ -0,0 +1,26 @@
+package com.njcn.harmonic.controller.specialanalysis;
+
+
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 专项分析-风电站-详细数据
+ * </p>
+ *
+ * @author wr
+ * @since 2022-11-30
+ */
+@RestController
+@Api(tags = "专项分析-风电场")
+@RequiredArgsConstructor
+@RequestMapping("/windFarm")
+public class WindFarmController extends BaseController {
+
+}
+

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpInharmonicVRateReportDMapper.xml

@@ -5,280 +5,279 @@
 <mapper namespace="com.njcn.harmonic.mapper.RMpInharmonicVRateReportDMapper">
 
     <resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD">
-            <id property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
-            <id property="dataDate" column="data_date" jdbcType="DATE"/>
-            <id property="phase" column="phase" jdbcType="VARCHAR"/>
-            <result property="inharmV1Max" column="inharm_v_1_max" jdbcType="FLOAT"/>
-            <result property="inharmV1Min" column="inharm_v_1_min" jdbcType="FLOAT"/>
-            <result property="inharmV1Avg" column="inharm_v_1_avg" jdbcType="FLOAT"/>
-            <result property="inharmV1Cp95" column="inharm_v_1_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV2Max" column="inharm_v_2_max" jdbcType="FLOAT"/>
-            <result property="inharmV2Min" column="inharm_v_2_min" jdbcType="FLOAT"/>
-            <result property="inharmV2Avg" column="inharm_v_2_avg" jdbcType="FLOAT"/>
-            <result property="inharmV2Cp95" column="inharm_v_2_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV3Max" column="inharm_v_3_max" jdbcType="FLOAT"/>
-            <result property="inharmV3Min" column="inharm_v_3_min" jdbcType="FLOAT"/>
-            <result property="inharmV3Avg" column="inharm_v_3_avg" jdbcType="FLOAT"/>
-            <result property="inharmV3Cp95" column="inharm_v_3_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV4Max" column="inharm_v_4_max" jdbcType="FLOAT"/>
-            <result property="inharmV4Min" column="inharm_v_4_min" jdbcType="FLOAT"/>
-            <result property="inharmV4Avg" column="inharm_v_4_avg" jdbcType="FLOAT"/>
-            <result property="inharmV4Cp95" column="inharm_v_4_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV5Max" column="inharm_v_5_max" jdbcType="FLOAT"/>
-            <result property="inharmV5Min" column="inharm_v_5_min" jdbcType="FLOAT"/>
-            <result property="inharmV5Avg" column="inharm_v_5_avg" jdbcType="FLOAT"/>
-            <result property="inharmV5Cp95" column="inharm_v_5_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV6Max" column="inharm_v_6_max" jdbcType="FLOAT"/>
-            <result property="inharmV6Min" column="inharm_v_6_min" jdbcType="FLOAT"/>
-            <result property="inharmV6Avg" column="inharm_v_6_avg" jdbcType="FLOAT"/>
-            <result property="inharmV6Cp95" column="inharm_v_6_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV7Max" column="inharm_v_7_max" jdbcType="FLOAT"/>
-            <result property="inharmV7Min" column="inharm_v_7_min" jdbcType="FLOAT"/>
-            <result property="inharmV7Avg" column="inharm_v_7_avg" jdbcType="FLOAT"/>
-            <result property="inharmV7Cp95" column="inharm_v_7_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV8Max" column="inharm_v_8_max" jdbcType="FLOAT"/>
-            <result property="inharmV8Min" column="inharm_v_8_min" jdbcType="FLOAT"/>
-            <result property="inharmV8Avg" column="inharm_v_8_avg" jdbcType="FLOAT"/>
-            <result property="inharmV8Cp95" column="inharm_v_8_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV9Max" column="inharm_v_9_max" jdbcType="FLOAT"/>
-            <result property="inharmV9Min" column="inharm_v_9_min" jdbcType="FLOAT"/>
-            <result property="inharmV9Avg" column="inharm_v_9_avg" jdbcType="FLOAT"/>
-            <result property="inharmV9Cp95" column="inharm_v_9_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV10Max" column="inharm_v_10_max" jdbcType="FLOAT"/>
-            <result property="inharmV10Min" column="inharm_v_10_min" jdbcType="FLOAT"/>
-            <result property="inharmV10Avg" column="inharm_v_10_avg" jdbcType="FLOAT"/>
-            <result property="inharmV10Cp95" column="inharm_v_10_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV11Max" column="inharm_v_11_max" jdbcType="FLOAT"/>
-            <result property="inharmV11Min" column="inharm_v_11_min" jdbcType="FLOAT"/>
-            <result property="inharmV11Avg" column="inharm_v_11_avg" jdbcType="FLOAT"/>
-            <result property="inharmV11Cp95" column="inharm_v_11_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV12Max" column="inharm_v_12_max" jdbcType="FLOAT"/>
-            <result property="inharmV12Min" column="inharm_v_12_min" jdbcType="FLOAT"/>
-            <result property="inharmV12Avg" column="inharm_v_12_avg" jdbcType="FLOAT"/>
-            <result property="inharmV12Cp95" column="inharm_v_12_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV13Max" column="inharm_v_13_max" jdbcType="FLOAT"/>
-            <result property="inharmV13Min" column="inharm_v_13_min" jdbcType="FLOAT"/>
-            <result property="inharmV13Avg" column="inharm_v_13_avg" jdbcType="FLOAT"/>
-            <result property="inharmV13Cp95" column="inharm_v_13_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV14Max" column="inharm_v_14_max" jdbcType="FLOAT"/>
-            <result property="inharmV14Min" column="inharm_v_14_min" jdbcType="FLOAT"/>
-            <result property="inharmV14Avg" column="inharm_v_14_avg" jdbcType="FLOAT"/>
-            <result property="inharmV14Cp95" column="inharm_v_14_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV15Max" column="inharm_v_15_max" jdbcType="FLOAT"/>
-            <result property="inharmV15Min" column="inharm_v_15_min" jdbcType="FLOAT"/>
-            <result property="inharmV15Avg" column="inharm_v_15_avg" jdbcType="FLOAT"/>
-            <result property="inharmV15Cp95" column="inharm_v_15_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV16Max" column="inharm_v_16_max" jdbcType="FLOAT"/>
-            <result property="inharmV16Min" column="inharm_v_16_min" jdbcType="FLOAT"/>
-            <result property="inharmV16Avg" column="inharm_v_16_avg" jdbcType="FLOAT"/>
-            <result property="inharmV16Cp95" column="inharm_v_16_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV17Max" column="inharm_v_17_max" jdbcType="FLOAT"/>
-            <result property="inharmV17Min" column="inharm_v_17_min" jdbcType="FLOAT"/>
-            <result property="inharmV17Avg" column="inharm_v_17_avg" jdbcType="FLOAT"/>
-            <result property="inharmV17Cp95" column="inharm_v_17_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV18Max" column="inharm_v_18_max" jdbcType="FLOAT"/>
-            <result property="inharmV18Min" column="inharm_v_18_min" jdbcType="FLOAT"/>
-            <result property="inharmV18Avg" column="inharm_v_18_avg" jdbcType="FLOAT"/>
-            <result property="inharmV18Cp95" column="inharm_v_18_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV19Max" column="inharm_v_19_max" jdbcType="FLOAT"/>
-            <result property="inharmV19Min" column="inharm_v_19_min" jdbcType="FLOAT"/>
-            <result property="inharmV19Avg" column="inharm_v_19_avg" jdbcType="FLOAT"/>
-            <result property="inharmV19Cp95" column="inharm_v_19_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV20Max" column="inharm_v_20_max" jdbcType="FLOAT"/>
-            <result property="inharmV20Min" column="inharm_v_20_min" jdbcType="FLOAT"/>
-            <result property="inharmV20Avg" column="inharm_v_20_avg" jdbcType="FLOAT"/>
-            <result property="inharmV20Cp95" column="inharm_v_20_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV21Max" column="inharm_v_21_max" jdbcType="FLOAT"/>
-            <result property="inharmV21Min" column="inharm_v_21_min" jdbcType="FLOAT"/>
-            <result property="inharmV21Avg" column="inharm_v_21_avg" jdbcType="FLOAT"/>
-            <result property="inharmV21Cp95" column="inharm_v_21_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV22Max" column="inharm_v_22_max" jdbcType="FLOAT"/>
-            <result property="inharmV22Min" column="inharm_v_22_min" jdbcType="FLOAT"/>
-            <result property="inharmV22Avg" column="inharm_v_22_avg" jdbcType="FLOAT"/>
-            <result property="inharmV22Cp95" column="inharm_v_22_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV23Max" column="inharm_v_23_max" jdbcType="FLOAT"/>
-            <result property="inharmV23Min" column="inharm_v_23_min" jdbcType="FLOAT"/>
-            <result property="inharmV23Avg" column="inharm_v_23_avg" jdbcType="FLOAT"/>
-            <result property="inharmV23Cp95" column="inharm_v_23_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV24Max" column="inharm_v_24_max" jdbcType="FLOAT"/>
-            <result property="inharmV24Min" column="inharm_v_24_min" jdbcType="FLOAT"/>
-            <result property="inharmV24Avg" column="inharm_v_24_avg" jdbcType="FLOAT"/>
-            <result property="inharmV24Cp95" column="inharm_v_24_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV25Max" column="inharm_v_25_max" jdbcType="FLOAT"/>
-            <result property="inharmV25Min" column="inharm_v_25_min" jdbcType="FLOAT"/>
-            <result property="inharmV25Avg" column="inharm_v_25_avg" jdbcType="FLOAT"/>
-            <result property="inharmV25Cp95" column="inharm_v_25_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV26Max" column="inharm_v_26_max" jdbcType="FLOAT"/>
-            <result property="inharmV26Min" column="inharm_v_26_min" jdbcType="FLOAT"/>
-            <result property="inharmV26Avg" column="inharm_v_26_avg" jdbcType="FLOAT"/>
-            <result property="inharmV26Cp95" column="inharm_v_26_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV27Max" column="inharm_v_27_max" jdbcType="FLOAT"/>
-            <result property="inharmV27Min" column="inharm_v_27_min" jdbcType="FLOAT"/>
-            <result property="inharmV27Avg" column="inharm_v_27_avg" jdbcType="FLOAT"/>
-            <result property="inharmV27Cp95" column="inharm_v_27_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV28Max" column="inharm_v_28_max" jdbcType="FLOAT"/>
-            <result property="inharmV28Min" column="inharm_v_28_min" jdbcType="FLOAT"/>
-            <result property="inharmV28Avg" column="inharm_v_28_avg" jdbcType="FLOAT"/>
-            <result property="inharmV28Cp95" column="inharm_v_28_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV29Max" column="inharm_v_29_max" jdbcType="FLOAT"/>
-            <result property="inharmV29Min" column="inharm_v_29_min" jdbcType="FLOAT"/>
-            <result property="inharmV29Avg" column="inharm_v_29_avg" jdbcType="FLOAT"/>
-            <result property="inharmV29Cp95" column="inharm_v_29_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV30Max" column="inharm_v_30_max" jdbcType="FLOAT"/>
-            <result property="inharmV30Min" column="inharm_v_30_min" jdbcType="FLOAT"/>
-            <result property="inharmV30Avg" column="inharm_v_30_avg" jdbcType="FLOAT"/>
-            <result property="inharmV30Cp95" column="inharm_v_30_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV31Max" column="inharm_v_31_max" jdbcType="FLOAT"/>
-            <result property="inharmV31Min" column="inharm_v_31_min" jdbcType="FLOAT"/>
-            <result property="inharmV31Avg" column="inharm_v_31_avg" jdbcType="FLOAT"/>
-            <result property="inharmV31Cp95" column="inharm_v_31_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV32Max" column="inharm_v_32_max" jdbcType="FLOAT"/>
-            <result property="inharmV32Min" column="inharm_v_32_min" jdbcType="FLOAT"/>
-            <result property="inharmV32Avg" column="inharm_v_32_avg" jdbcType="FLOAT"/>
-            <result property="inharmV32Cp95" column="inharm_v_32_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV33Max" column="inharm_v_33_max" jdbcType="FLOAT"/>
-            <result property="inharmV33Min" column="inharm_v_33_min" jdbcType="FLOAT"/>
-            <result property="inharmV33Avg" column="inharm_v_33_avg" jdbcType="FLOAT"/>
-            <result property="inharmV33Cp95" column="inharm_v_33_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV34Max" column="inharm_v_34_max" jdbcType="FLOAT"/>
-            <result property="inharmV34Min" column="inharm_v_34_min" jdbcType="FLOAT"/>
-            <result property="inharmV34Avg" column="inharm_v_34_avg" jdbcType="FLOAT"/>
-            <result property="inharmV34Cp95" column="inharm_v_34_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV35Max" column="inharm_v_35_max" jdbcType="FLOAT"/>
-            <result property="inharmV35Min" column="inharm_v_35_min" jdbcType="FLOAT"/>
-            <result property="inharmV35Avg" column="inharm_v_35_avg" jdbcType="FLOAT"/>
-            <result property="inharmV35Cp95" column="inharm_v_35_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV36Max" column="inharm_v_36_max" jdbcType="FLOAT"/>
-            <result property="inharmV36Min" column="inharm_v_36_min" jdbcType="FLOAT"/>
-            <result property="inharmV36Avg" column="inharm_v_36_avg" jdbcType="FLOAT"/>
-            <result property="inharmV36Cp95" column="inharm_v_36_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV37Max" column="inharm_v_37_max" jdbcType="FLOAT"/>
-            <result property="inharmV37Min" column="inharm_v_37_min" jdbcType="FLOAT"/>
-            <result property="inharmV37Avg" column="inharm_v_37_avg" jdbcType="FLOAT"/>
-            <result property="inharmV37Cp95" column="inharm_v_37_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV38Max" column="inharm_v_38_max" jdbcType="FLOAT"/>
-            <result property="inharmV38Min" column="inharm_v_38_min" jdbcType="FLOAT"/>
-            <result property="inharmV38Avg" column="inharm_v_38_avg" jdbcType="FLOAT"/>
-            <result property="inharmV38Cp95" column="inharm_v_38_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV39Max" column="inharm_v_39_max" jdbcType="FLOAT"/>
-            <result property="inharmV39Min" column="inharm_v_39_min" jdbcType="FLOAT"/>
-            <result property="inharmV39Avg" column="inharm_v_39_avg" jdbcType="FLOAT"/>
-            <result property="inharmV39Cp95" column="inharm_v_39_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV40Max" column="inharm_v_40_max" jdbcType="FLOAT"/>
-            <result property="inharmV40Min" column="inharm_v_40_min" jdbcType="FLOAT"/>
-            <result property="inharmV40Avg" column="inharm_v_40_avg" jdbcType="FLOAT"/>
-            <result property="inharmV40Cp95" column="inharm_v_40_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV41Max" column="inharm_v_41_max" jdbcType="FLOAT"/>
-            <result property="inharmV41Min" column="inharm_v_41_min" jdbcType="FLOAT"/>
-            <result property="inharmV41Avg" column="inharm_v_41_avg" jdbcType="FLOAT"/>
-            <result property="inharmV41Cp95" column="inharm_v_41_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV42Max" column="inharm_v_42_max" jdbcType="FLOAT"/>
-            <result property="inharmV42Min" column="inharm_v_42_min" jdbcType="FLOAT"/>
-            <result property="inharmV42Avg" column="inharm_v_42_avg" jdbcType="FLOAT"/>
-            <result property="inharmV42Cp95" column="inharm_v_42_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV43Max" column="inharm_v_43_max" jdbcType="FLOAT"/>
-            <result property="inharmV43Min" column="inharm_v_43_min" jdbcType="FLOAT"/>
-            <result property="inharmV43Avg" column="inharm_v_43_avg" jdbcType="FLOAT"/>
-            <result property="inharmV43Cp95" column="inharm_v_43_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV44Max" column="inharm_v_44_max" jdbcType="FLOAT"/>
-            <result property="inharmV44Min" column="inharm_v_44_min" jdbcType="FLOAT"/>
-            <result property="inharmV44Avg" column="inharm_v_44_avg" jdbcType="FLOAT"/>
-            <result property="inharmV44Cp95" column="inharm_v_44_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV45Max" column="inharm_v_45_max" jdbcType="FLOAT"/>
-            <result property="inharmV45Min" column="inharm_v_45_min" jdbcType="FLOAT"/>
-            <result property="inharmV45Avg" column="inharm_v_45_avg" jdbcType="FLOAT"/>
-            <result property="inharmV45Cp95" column="inharm_v_45_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV46Max" column="inharm_v_46_max" jdbcType="FLOAT"/>
-            <result property="inharmV46Min" column="inharm_v_46_min" jdbcType="FLOAT"/>
-            <result property="inharmV46Avg" column="inharm_v_46_avg" jdbcType="FLOAT"/>
-            <result property="inharmV46Cp95" column="inharm_v_46_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV47Max" column="inharm_v_47_max" jdbcType="FLOAT"/>
-            <result property="inharmV47Min" column="inharm_v_47_min" jdbcType="FLOAT"/>
-            <result property="inharmV47Avg" column="inharm_v_47_avg" jdbcType="FLOAT"/>
-            <result property="inharmV47Cp95" column="inharm_v_47_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV48Max" column="inharm_v_48_max" jdbcType="FLOAT"/>
-            <result property="inharmV48Min" column="inharm_v_48_min" jdbcType="FLOAT"/>
-            <result property="inharmV48Avg" column="inharm_v_48_avg" jdbcType="FLOAT"/>
-            <result property="inharmV48Cp95" column="inharm_v_48_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV49Max" column="inharm_v_49_max" jdbcType="FLOAT"/>
-            <result property="inharmV49Min" column="inharm_v_49_min" jdbcType="FLOAT"/>
-            <result property="inharmV49Avg" column="inharm_v_49_avg" jdbcType="FLOAT"/>
-            <result property="inharmV49Cp95" column="inharm_v_49_cp95" jdbcType="FLOAT"/>
-            <result property="inharmV50Max" column="inharm_v_50_max" jdbcType="FLOAT"/>
-            <result property="inharmV50Min" column="inharm_v_50_min" jdbcType="FLOAT"/>
-            <result property="inharmV50Avg" column="inharm_v_50_avg" jdbcType="FLOAT"/>
-            <result property="inharmV50Cp95" column="inharm_v_50_cp95" jdbcType="FLOAT"/>
+ <id column="measurement_point_id" jdbcType="VARCHAR" property="measurementPointId" />
+    <id column="data_date" jdbcType="DATE" property="dataDate" />
+    <id column="phase" jdbcType="VARCHAR" property="phase" />
+    <result column="centre_harmonic_voltage_content1_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Max" />
+    <result column="centre_harmonic_voltage_content1_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Min" />
+    <result column="centre_harmonic_voltage_content1_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Avg" />
+    <result column="centre_harmonic_voltage_content1_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent1Cp95" />
+    <result column="centre_harmonic_voltage_content2_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Max" />
+    <result column="centre_harmonic_voltage_content2_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Min" />
+    <result column="centre_harmonic_voltage_content2_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Avg" />
+    <result column="centre_harmonic_voltage_content2_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent2Cp95" />
+    <result column="centre_harmonic_voltage_content3_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Max" />
+    <result column="centre_harmonic_voltage_content3_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Min" />
+    <result column="centre_harmonic_voltage_content3_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Avg" />
+    <result column="centre_harmonic_voltage_content3_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent3Cp95" />
+    <result column="centre_harmonic_voltage_content4_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Max" />
+    <result column="centre_harmonic_voltage_content4_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Min" />
+    <result column="centre_harmonic_voltage_content4_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Avg" />
+    <result column="centre_harmonic_voltage_content4_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent4Cp95" />
+    <result column="centre_harmonic_voltage_content5_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Max" />
+    <result column="centre_harmonic_voltage_content5_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Min" />
+    <result column="centre_harmonic_voltage_content5_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Avg" />
+    <result column="centre_harmonic_voltage_content5_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent5Cp95" />
+    <result column="centre_harmonic_voltage_content6_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Max" />
+    <result column="centre_harmonic_voltage_content6_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Min" />
+    <result column="centre_harmonic_voltage_content6_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Avg" />
+    <result column="centre_harmonic_voltage_content6_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent6Cp95" />
+    <result column="centre_harmonic_voltage_content7_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Max" />
+    <result column="centre_harmonic_voltage_content7_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Min" />
+    <result column="centre_harmonic_voltage_content7_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Avg" />
+    <result column="centre_harmonic_voltage_content7_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent7Cp95" />
+    <result column="centre_harmonic_voltage_content8_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Max" />
+    <result column="centre_harmonic_voltage_content8_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Min" />
+    <result column="centre_harmonic_voltage_content8_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Avg" />
+    <result column="centre_harmonic_voltage_content8_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent8Cp95" />
+    <result column="centre_harmonic_voltage_content9_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Max" />
+    <result column="centre_harmonic_voltage_content9_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Min" />
+    <result column="centre_harmonic_voltage_content9_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Avg" />
+    <result column="centre_harmonic_voltage_content9_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent9Cp95" />
+    <result column="centre_harmonic_voltage_content10_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Max" />
+    <result column="centre_harmonic_voltage_content10_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Min" />
+    <result column="centre_harmonic_voltage_content10_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Avg" />
+    <result column="centre_harmonic_voltage_content10_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent10Cp95" />
+    <result column="centre_harmonic_voltage_content11_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Max" />
+    <result column="centre_harmonic_voltage_content11_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Min" />
+    <result column="centre_harmonic_voltage_content11_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Avg" />
+    <result column="centre_harmonic_voltage_content11_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent11Cp95" />
+    <result column="centre_harmonic_voltage_content12_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Max" />
+    <result column="centre_harmonic_voltage_content12_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Min" />
+    <result column="centre_harmonic_voltage_content12_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Avg" />
+    <result column="centre_harmonic_voltage_content12_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent12Cp95" />
+    <result column="centre_harmonic_voltage_content13_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Max" />
+    <result column="centre_harmonic_voltage_content13_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Min" />
+    <result column="centre_harmonic_voltage_content13_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Avg" />
+    <result column="centre_harmonic_voltage_content13_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent13Cp95" />
+    <result column="centre_harmonic_voltage_content14_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Max" />
+    <result column="centre_harmonic_voltage_content14_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Min" />
+    <result column="centre_harmonic_voltage_content14_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Avg" />
+    <result column="centre_harmonic_voltage_content14_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent14Cp95" />
+    <result column="centre_harmonic_voltage_content15_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Max" />
+    <result column="centre_harmonic_voltage_content15_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Min" />
+    <result column="centre_harmonic_voltage_content15_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Avg" />
+    <result column="centre_harmonic_voltage_content15_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent15Cp95" />
+    <result column="centre_harmonic_voltage_content16_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Max" />
+    <result column="centre_harmonic_voltage_content16_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Min" />
+    <result column="centre_harmonic_voltage_content16_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Avg" />
+    <result column="centre_harmonic_voltage_content16_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent16Cp95" />
+    <result column="centre_harmonic_voltage_content17_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Max" />
+    <result column="centre_harmonic_voltage_content17_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Min" />
+    <result column="centre_harmonic_voltage_content17_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Avg" />
+    <result column="centre_harmonic_voltage_content17_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent17Cp95" />
+    <result column="centre_harmonic_voltage_content18_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Max" />
+    <result column="centre_harmonic_voltage_content18_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Min" />
+    <result column="centre_harmonic_voltage_content18_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Avg" />
+    <result column="centre_harmonic_voltage_content18_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent18Cp95" />
+    <result column="centre_harmonic_voltage_content19_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Max" />
+    <result column="centre_harmonic_voltage_content19_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Min" />
+    <result column="centre_harmonic_voltage_content19_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Avg" />
+    <result column="centre_harmonic_voltage_content19_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent19Cp95" />
+    <result column="centre_harmonic_voltage_content20_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Max" />
+    <result column="centre_harmonic_voltage_content20_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Min" />
+    <result column="centre_harmonic_voltage_content20_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Avg" />
+    <result column="centre_harmonic_voltage_content20_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent20Cp95" />
+    <result column="centre_harmonic_voltage_content21_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Max" />
+    <result column="centre_harmonic_voltage_content21_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Min" />
+    <result column="centre_harmonic_voltage_content21_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Avg" />
+    <result column="centre_harmonic_voltage_content21_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent21Cp95" />
+    <result column="centre_harmonic_voltage_content22_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Max" />
+    <result column="centre_harmonic_voltage_content22_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Min" />
+    <result column="centre_harmonic_voltage_content22_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Avg" />
+    <result column="centre_harmonic_voltage_content22_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent22Cp95" />
+    <result column="centre_harmonic_voltage_content23_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Max" />
+    <result column="centre_harmonic_voltage_content23_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Min" />
+    <result column="centre_harmonic_voltage_content23_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Avg" />
+    <result column="centre_harmonic_voltage_content23_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent23Cp95" />
+    <result column="centre_harmonic_voltage_content24_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Max" />
+    <result column="centre_harmonic_voltage_content24_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Min" />
+    <result column="centre_harmonic_voltage_content24_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Avg" />
+    <result column="centre_harmonic_voltage_content24_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent24Cp95" />
+    <result column="centre_harmonic_voltage_content25_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Max" />
+    <result column="centre_harmonic_voltage_content25_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Min" />
+    <result column="centre_harmonic_voltage_content25_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Avg" />
+    <result column="centre_harmonic_voltage_content25_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent25Cp95" />
+    <result column="centre_harmonic_voltage_content26_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Max" />
+    <result column="centre_harmonic_voltage_content26_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Min" />
+    <result column="centre_harmonic_voltage_content26_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Avg" />
+    <result column="centre_harmonic_voltage_content26_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent26Cp95" />
+    <result column="centre_harmonic_voltage_content27_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Max" />
+    <result column="centre_harmonic_voltage_content27_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Min" />
+    <result column="centre_harmonic_voltage_content27_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Avg" />
+    <result column="centre_harmonic_voltage_content27_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent27Cp95" />
+    <result column="centre_harmonic_voltage_content28_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Max" />
+    <result column="centre_harmonic_voltage_content28_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Min" />
+    <result column="centre_harmonic_voltage_content28_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Avg" />
+    <result column="centre_harmonic_voltage_content28_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent28Cp95" />
+    <result column="centre_harmonic_voltage_content29_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Max" />
+    <result column="centre_harmonic_voltage_content29_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Min" />
+    <result column="centre_harmonic_voltage_content29_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Avg" />
+    <result column="centre_harmonic_voltage_content29_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent29Cp95" />
+    <result column="centre_harmonic_voltage_content30_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Max" />
+    <result column="centre_harmonic_voltage_content30_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Min" />
+    <result column="centre_harmonic_voltage_content30_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Avg" />
+    <result column="centre_harmonic_voltage_content30_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent30Cp95" />
+    <result column="centre_harmonic_voltage_content31_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Max" />
+    <result column="centre_harmonic_voltage_content31_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Min" />
+    <result column="centre_harmonic_voltage_content31_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Avg" />
+    <result column="centre_harmonic_voltage_content31_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent31Cp95" />
+    <result column="centre_harmonic_voltage_content32_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Max" />
+    <result column="centre_harmonic_voltage_content32_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Min" />
+    <result column="centre_harmonic_voltage_content32_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Avg" />
+    <result column="centre_harmonic_voltage_content32_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent32Cp95" />
+    <result column="centre_harmonic_voltage_content33_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Max" />
+    <result column="centre_harmonic_voltage_content33_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Min" />
+    <result column="centre_harmonic_voltage_content33_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Avg" />
+    <result column="centre_harmonic_voltage_content33_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent33Cp95" />
+    <result column="centre_harmonic_voltage_content34_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Max" />
+    <result column="centre_harmonic_voltage_content34_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Min" />
+    <result column="centre_harmonic_voltage_content34_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Avg" />
+    <result column="centre_harmonic_voltage_content34_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent34Cp95" />
+    <result column="centre_harmonic_voltage_content35_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Max" />
+    <result column="centre_harmonic_voltage_content35_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Min" />
+    <result column="centre_harmonic_voltage_content35_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Avg" />
+    <result column="centre_harmonic_voltage_content35_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent35Cp95" />
+    <result column="centre_harmonic_voltage_content36_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Max" />
+    <result column="centre_harmonic_voltage_content36_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Min" />
+    <result column="centre_harmonic_voltage_content36_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Avg" />
+    <result column="centre_harmonic_voltage_content36_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent36Cp95" />
+    <result column="centre_harmonic_voltage_content37_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Max" />
+    <result column="centre_harmonic_voltage_content37_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Min" />
+    <result column="centre_harmonic_voltage_content37_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Avg" />
+    <result column="centre_harmonic_voltage_content37_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent37Cp95" />
+    <result column="centre_harmonic_voltage_content38_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Max" />
+    <result column="centre_harmonic_voltage_content38_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Min" />
+    <result column="centre_harmonic_voltage_content38_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Avg" />
+    <result column="centre_harmonic_voltage_content38_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent38Cp95" />
+    <result column="centre_harmonic_voltage_content39_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Max" />
+    <result column="centre_harmonic_voltage_content39_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Min" />
+    <result column="centre_harmonic_voltage_content39_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Avg" />
+    <result column="centre_harmonic_voltage_content39_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent39Cp95" />
+    <result column="centre_harmonic_voltage_content40_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Max" />
+    <result column="centre_harmonic_voltage_content40_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Min" />
+    <result column="centre_harmonic_voltage_content40_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Avg" />
+    <result column="centre_harmonic_voltage_content40_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent40Cp95" />
+    <result column="centre_harmonic_voltage_content41_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Max" />
+    <result column="centre_harmonic_voltage_content41_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Min" />
+    <result column="centre_harmonic_voltage_content41_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Avg" />
+    <result column="centre_harmonic_voltage_content41_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent41Cp95" />
+    <result column="centre_harmonic_voltage_content42_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Max" />
+    <result column="centre_harmonic_voltage_content42_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Min" />
+    <result column="centre_harmonic_voltage_content42_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Avg" />
+    <result column="centre_harmonic_voltage_content42_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent42Cp95" />
+    <result column="centre_harmonic_voltage_content43_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Max" />
+    <result column="centre_harmonic_voltage_content43_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Min" />
+    <result column="centre_harmonic_voltage_content43_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Avg" />
+    <result column="centre_harmonic_voltage_content43_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent43Cp95" />
+    <result column="centre_harmonic_voltage_content44_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Max" />
+    <result column="centre_harmonic_voltage_content44_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Min" />
+    <result column="centre_harmonic_voltage_content44_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Avg" />
+    <result column="centre_harmonic_voltage_content44_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent44Cp95" />
+    <result column="centre_harmonic_voltage_content45_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Max" />
+    <result column="centre_harmonic_voltage_content45_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Min" />
+    <result column="centre_harmonic_voltage_content45_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Avg" />
+    <result column="centre_harmonic_voltage_content45_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent45Cp95" />
+    <result column="centre_harmonic_voltage_content46_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Max" />
+    <result column="centre_harmonic_voltage_content46_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Min" />
+    <result column="centre_harmonic_voltage_content46_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Avg" />
+    <result column="centre_harmonic_voltage_content46_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent46Cp95" />
+    <result column="centre_harmonic_voltage_content47_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Max" />
+    <result column="centre_harmonic_voltage_content47_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Min" />
+    <result column="centre_harmonic_voltage_content47_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Avg" />
+    <result column="centre_harmonic_voltage_content47_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent47Cp95" />
+    <result column="centre_harmonic_voltage_content48_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Max" />
+    <result column="centre_harmonic_voltage_content48_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Min" />
+    <result column="centre_harmonic_voltage_content48_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Avg" />
+    <result column="centre_harmonic_voltage_content48_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent48Cp95" />
+    <result column="centre_harmonic_voltage_content49_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Max" />
+    <result column="centre_harmonic_voltage_content49_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Min" />
+    <result column="centre_harmonic_voltage_content49_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Avg" />
+    <result column="centre_harmonic_voltage_content49_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent49Cp95" />
+    <result column="centre_harmonic_voltage_content50_max" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Max" />
+    <result column="centre_harmonic_voltage_content50_min" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Min" />
+    <result column="centre_harmonic_voltage_content50_avg" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Avg" />
+    <result column="centre_harmonic_voltage_content50_cp95" jdbcType="FLOAT" property="centreHarmonicVoltageContent50Cp95" />
   </resultMap>
-
   <sql id="Base_Column_List">
-        measurement_point_id,data_date,phase,
-        inharm_v_1_max,inharm_v_1_min,inharm_v_1_avg,
-        inharm_v_1_cp95,inharm_v_2_max,inharm_v_2_min,
-        inharm_v_2_avg,inharm_v_2_cp95,inharm_v_3_max,
-        inharm_v_3_min,inharm_v_3_avg,inharm_v_3_cp95,
-        inharm_v_4_max,inharm_v_4_min,inharm_v_4_avg,
-        inharm_v_4_cp95,inharm_v_5_max,inharm_v_5_min,
-        inharm_v_5_avg,inharm_v_5_cp95,inharm_v_6_max,
-        inharm_v_6_min,inharm_v_6_avg,inharm_v_6_cp95,
-        inharm_v_7_max,inharm_v_7_min,inharm_v_7_avg,
-        inharm_v_7_cp95,inharm_v_8_max,inharm_v_8_min,
-        inharm_v_8_avg,inharm_v_8_cp95,inharm_v_9_max,
-        inharm_v_9_min,inharm_v_9_avg,inharm_v_9_cp95,
-        inharm_v_10_max,inharm_v_10_min,inharm_v_10_avg,
-        inharm_v_10_cp95,inharm_v_11_max,inharm_v_11_min,
-        inharm_v_11_avg,inharm_v_11_cp95,inharm_v_12_max,
-        inharm_v_12_min,inharm_v_12_avg,inharm_v_12_cp95,
-        inharm_v_13_max,inharm_v_13_min,inharm_v_13_avg,
-        inharm_v_13_cp95,inharm_v_14_max,inharm_v_14_min,
-        inharm_v_14_avg,inharm_v_14_cp95,inharm_v_15_max,
-        inharm_v_15_min,inharm_v_15_avg,inharm_v_15_cp95,
-        inharm_v_16_max,inharm_v_16_min,inharm_v_16_avg,
-        inharm_v_16_cp95,inharm_v_17_max,inharm_v_17_min,
-        inharm_v_17_avg,inharm_v_17_cp95,inharm_v_18_max,
-        inharm_v_18_min,inharm_v_18_avg,inharm_v_18_cp95,
-        inharm_v_19_max,inharm_v_19_min,inharm_v_19_avg,
-        inharm_v_19_cp95,inharm_v_20_max,inharm_v_20_min,
-        inharm_v_20_avg,inharm_v_20_cp95,inharm_v_21_max,
-        inharm_v_21_min,inharm_v_21_avg,inharm_v_21_cp95,
-        inharm_v_22_max,inharm_v_22_min,inharm_v_22_avg,
-        inharm_v_22_cp95,inharm_v_23_max,inharm_v_23_min,
-        inharm_v_23_avg,inharm_v_23_cp95,inharm_v_24_max,
-        inharm_v_24_min,inharm_v_24_avg,inharm_v_24_cp95,
-        inharm_v_25_max,inharm_v_25_min,inharm_v_25_avg,
-        inharm_v_25_cp95,inharm_v_26_max,inharm_v_26_min,
-        inharm_v_26_avg,inharm_v_26_cp95,inharm_v_27_max,
-        inharm_v_27_min,inharm_v_27_avg,inharm_v_27_cp95,
-        inharm_v_28_max,inharm_v_28_min,inharm_v_28_avg,
-        inharm_v_28_cp95,inharm_v_29_max,inharm_v_29_min,
-        inharm_v_29_avg,inharm_v_29_cp95,inharm_v_30_max,
-        inharm_v_30_min,inharm_v_30_avg,inharm_v_30_cp95,
-        inharm_v_31_max,inharm_v_31_min,inharm_v_31_avg,
-        inharm_v_31_cp95,inharm_v_32_max,inharm_v_32_min,
-        inharm_v_32_avg,inharm_v_32_cp95,inharm_v_33_max,
-        inharm_v_33_min,inharm_v_33_avg,inharm_v_33_cp95,
-        inharm_v_34_max,inharm_v_34_min,inharm_v_34_avg,
-        inharm_v_34_cp95,inharm_v_35_max,inharm_v_35_min,
-        inharm_v_35_avg,inharm_v_35_cp95,inharm_v_36_max,
-        inharm_v_36_min,inharm_v_36_avg,inharm_v_36_cp95,
-        inharm_v_37_max,inharm_v_37_min,inharm_v_37_avg,
-        inharm_v_37_cp95,inharm_v_38_max,inharm_v_38_min,
-        inharm_v_38_avg,inharm_v_38_cp95,inharm_v_39_max,
-        inharm_v_39_min,inharm_v_39_avg,inharm_v_39_cp95,
-        inharm_v_40_max,inharm_v_40_min,inharm_v_40_avg,
-        inharm_v_40_cp95,inharm_v_41_max,inharm_v_41_min,
-        inharm_v_41_avg,inharm_v_41_cp95,inharm_v_42_max,
-        inharm_v_42_min,inharm_v_42_avg,inharm_v_42_cp95,
-        inharm_v_43_max,inharm_v_43_min,inharm_v_43_avg,
-        inharm_v_43_cp95,inharm_v_44_max,inharm_v_44_min,
-        inharm_v_44_avg,inharm_v_44_cp95,inharm_v_45_max,
-        inharm_v_45_min,inharm_v_45_avg,inharm_v_45_cp95,
-        inharm_v_46_max,inharm_v_46_min,inharm_v_46_avg,
-        inharm_v_46_cp95,inharm_v_47_max,inharm_v_47_min,
-        inharm_v_47_avg,inharm_v_47_cp95,inharm_v_48_max,
-        inharm_v_48_min,inharm_v_48_avg,inharm_v_48_cp95,
-        inharm_v_49_max,inharm_v_49_min,inharm_v_49_avg,
-        inharm_v_49_cp95,inharm_v_50_max,inharm_v_50_min,
-        inharm_v_50_avg,inharm_v_50_cp95
+    <!--@mbg.generated-->
+    measurement_point_id, data_date, phase, centre_harmonic_voltage_content1_max, centre_harmonic_voltage_content1_min,
+    centre_harmonic_voltage_content1_avg, centre_harmonic_voltage_content1_cp95, centre_harmonic_voltage_content2_max,
+    centre_harmonic_voltage_content2_min, centre_harmonic_voltage_content2_avg, centre_harmonic_voltage_content2_cp95,
+    centre_harmonic_voltage_content3_max, centre_harmonic_voltage_content3_min, centre_harmonic_voltage_content3_avg,
+    centre_harmonic_voltage_content3_cp95, centre_harmonic_voltage_content4_max, centre_harmonic_voltage_content4_min,
+    centre_harmonic_voltage_content4_avg, centre_harmonic_voltage_content4_cp95, centre_harmonic_voltage_content5_max,
+    centre_harmonic_voltage_content5_min, centre_harmonic_voltage_content5_avg, centre_harmonic_voltage_content5_cp95,
+    centre_harmonic_voltage_content6_max, centre_harmonic_voltage_content6_min, centre_harmonic_voltage_content6_avg,
+    centre_harmonic_voltage_content6_cp95, centre_harmonic_voltage_content7_max, centre_harmonic_voltage_content7_min,
+    centre_harmonic_voltage_content7_avg, centre_harmonic_voltage_content7_cp95, centre_harmonic_voltage_content8_max,
+    centre_harmonic_voltage_content8_min, centre_harmonic_voltage_content8_avg, centre_harmonic_voltage_content8_cp95,
+    centre_harmonic_voltage_content9_max, centre_harmonic_voltage_content9_min, centre_harmonic_voltage_content9_avg,
+    centre_harmonic_voltage_content9_cp95, centre_harmonic_voltage_content10_max, centre_harmonic_voltage_content10_min,
+    centre_harmonic_voltage_content10_avg, centre_harmonic_voltage_content10_cp95, centre_harmonic_voltage_content11_max,
+    centre_harmonic_voltage_content11_min, centre_harmonic_voltage_content11_avg, centre_harmonic_voltage_content11_cp95,
+    centre_harmonic_voltage_content12_max, centre_harmonic_voltage_content12_min, centre_harmonic_voltage_content12_avg,
+    centre_harmonic_voltage_content12_cp95, centre_harmonic_voltage_content13_max, centre_harmonic_voltage_content13_min,
+    centre_harmonic_voltage_content13_avg, centre_harmonic_voltage_content13_cp95, centre_harmonic_voltage_content14_max,
+    centre_harmonic_voltage_content14_min, centre_harmonic_voltage_content14_avg, centre_harmonic_voltage_content14_cp95,
+    centre_harmonic_voltage_content15_max, centre_harmonic_voltage_content15_min, centre_harmonic_voltage_content15_avg,
+    centre_harmonic_voltage_content15_cp95, centre_harmonic_voltage_content16_max, centre_harmonic_voltage_content16_min,
+    centre_harmonic_voltage_content16_avg, centre_harmonic_voltage_content16_cp95, centre_harmonic_voltage_content17_max,
+    centre_harmonic_voltage_content17_min, centre_harmonic_voltage_content17_avg, centre_harmonic_voltage_content17_cp95,
+    centre_harmonic_voltage_content18_max, centre_harmonic_voltage_content18_min, centre_harmonic_voltage_content18_avg,
+    centre_harmonic_voltage_content18_cp95, centre_harmonic_voltage_content19_max, centre_harmonic_voltage_content19_min,
+    centre_harmonic_voltage_content19_avg, centre_harmonic_voltage_content19_cp95, centre_harmonic_voltage_content20_max,
+    centre_harmonic_voltage_content20_min, centre_harmonic_voltage_content20_avg, centre_harmonic_voltage_content20_cp95,
+    centre_harmonic_voltage_content21_max, centre_harmonic_voltage_content21_min, centre_harmonic_voltage_content21_avg,
+    centre_harmonic_voltage_content21_cp95, centre_harmonic_voltage_content22_max, centre_harmonic_voltage_content22_min,
+    centre_harmonic_voltage_content22_avg, centre_harmonic_voltage_content22_cp95, centre_harmonic_voltage_content23_max,
+    centre_harmonic_voltage_content23_min, centre_harmonic_voltage_content23_avg, centre_harmonic_voltage_content23_cp95,
+    centre_harmonic_voltage_content24_max, centre_harmonic_voltage_content24_min, centre_harmonic_voltage_content24_avg,
+    centre_harmonic_voltage_content24_cp95, centre_harmonic_voltage_content25_max, centre_harmonic_voltage_content25_min,
+    centre_harmonic_voltage_content25_avg, centre_harmonic_voltage_content25_cp95, centre_harmonic_voltage_content26_max,
+    centre_harmonic_voltage_content26_min, centre_harmonic_voltage_content26_avg, centre_harmonic_voltage_content26_cp95,
+    centre_harmonic_voltage_content27_max, centre_harmonic_voltage_content27_min, centre_harmonic_voltage_content27_avg,
+    centre_harmonic_voltage_content27_cp95, centre_harmonic_voltage_content28_max, centre_harmonic_voltage_content28_min,
+    centre_harmonic_voltage_content28_avg, centre_harmonic_voltage_content28_cp95, centre_harmonic_voltage_content29_max,
+    centre_harmonic_voltage_content29_min, centre_harmonic_voltage_content29_avg, centre_harmonic_voltage_content29_cp95,
+    centre_harmonic_voltage_content30_max, centre_harmonic_voltage_content30_min, centre_harmonic_voltage_content30_avg,
+    centre_harmonic_voltage_content30_cp95, centre_harmonic_voltage_content31_max, centre_harmonic_voltage_content31_min,
+    centre_harmonic_voltage_content31_avg, centre_harmonic_voltage_content31_cp95, centre_harmonic_voltage_content32_max,
+    centre_harmonic_voltage_content32_min, centre_harmonic_voltage_content32_avg, centre_harmonic_voltage_content32_cp95,
+    centre_harmonic_voltage_content33_max, centre_harmonic_voltage_content33_min, centre_harmonic_voltage_content33_avg,
+    centre_harmonic_voltage_content33_cp95, centre_harmonic_voltage_content34_max, centre_harmonic_voltage_content34_min,
+    centre_harmonic_voltage_content34_avg, centre_harmonic_voltage_content34_cp95, centre_harmonic_voltage_content35_max,
+    centre_harmonic_voltage_content35_min, centre_harmonic_voltage_content35_avg, centre_harmonic_voltage_content35_cp95,
+    centre_harmonic_voltage_content36_max, centre_harmonic_voltage_content36_min, centre_harmonic_voltage_content36_avg,
+    centre_harmonic_voltage_content36_cp95, centre_harmonic_voltage_content37_max, centre_harmonic_voltage_content37_min,
+    centre_harmonic_voltage_content37_avg, centre_harmonic_voltage_content37_cp95, centre_harmonic_voltage_content38_max,
+    centre_harmonic_voltage_content38_min, centre_harmonic_voltage_content38_avg, centre_harmonic_voltage_content38_cp95,
+    centre_harmonic_voltage_content39_max, centre_harmonic_voltage_content39_min, centre_harmonic_voltage_content39_avg,
+    centre_harmonic_voltage_content39_cp95, centre_harmonic_voltage_content40_max, centre_harmonic_voltage_content40_min,
+    centre_harmonic_voltage_content40_avg, centre_harmonic_voltage_content40_cp95, centre_harmonic_voltage_content41_max,
+    centre_harmonic_voltage_content41_min, centre_harmonic_voltage_content41_avg, centre_harmonic_voltage_content41_cp95,
+    centre_harmonic_voltage_content42_max, centre_harmonic_voltage_content42_min, centre_harmonic_voltage_content42_avg,
+    centre_harmonic_voltage_content42_cp95, centre_harmonic_voltage_content43_max, centre_harmonic_voltage_content43_min,
+    centre_harmonic_voltage_content43_avg, centre_harmonic_voltage_content43_cp95, centre_harmonic_voltage_content44_max,
+    centre_harmonic_voltage_content44_min, centre_harmonic_voltage_content44_avg, centre_harmonic_voltage_content44_cp95,
+    centre_harmonic_voltage_content45_max, centre_harmonic_voltage_content45_min, centre_harmonic_voltage_content45_avg,
+    centre_harmonic_voltage_content45_cp95, centre_harmonic_voltage_content46_max, centre_harmonic_voltage_content46_min,
+    centre_harmonic_voltage_content46_avg, centre_harmonic_voltage_content46_cp95, centre_harmonic_voltage_content47_max,
+    centre_harmonic_voltage_content47_min, centre_harmonic_voltage_content47_avg, centre_harmonic_voltage_content47_cp95,
+    centre_harmonic_voltage_content48_max, centre_harmonic_voltage_content48_min, centre_harmonic_voltage_content48_avg,
+    centre_harmonic_voltage_content48_cp95, centre_harmonic_voltage_content49_max, centre_harmonic_voltage_content49_min,
+    centre_harmonic_voltage_content49_avg, centre_harmonic_voltage_content49_cp95, centre_harmonic_voltage_content50_max,
+    centre_harmonic_voltage_content50_min, centre_harmonic_voltage_content50_avg, centre_harmonic_voltage_content50_cp95
   </sql>
     <select id="getListByCond" resultType="com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD">
         select <include refid="Base_Column_List"/>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RMpPvPowerDetailMMapper.java

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.mapper.specialanalysis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpPvPowerDetailMPO;
+
+/**
+* @author yzh
+* @description 针对表【r_mp_pv_power_detail_m(分布式光伏_台区电能质量明细_月表)】的数据库操作Mapper
+* @createDate 2022-11-25 10:22:31
+* @Entity generator.domain.RMpPvPowerDetailMPO
+*/
+public interface RMpPvPowerDetailMMapper extends BaseMapper<RMpPvPowerDetailMPO> {
+
+}
+
+
+
+

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RMpPvPowerDetailQMapper.java

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.mapper.specialanalysis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpPvPowerDetailQPO;
+
+/**
+* @author yzh
+* @description 针对表【r_mp_pv_power_detail_q(分布式光伏_台区电能质量明细_季表)】的数据库操作Mapper
+* @createDate 2022-11-25 10:22:31
+* @Entity generator.domain.RMpPvPowerDetailQPO
+*/
+public interface RMpPvPowerDetailQMapper extends BaseMapper<RMpPvPowerDetailQPO> {
+
+}
+
+
+
+

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RMpPvPowerDetailYMapper.java

@@ -0,0 +1,18 @@
+package com.njcn.harmonic.mapper.specialanalysis;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.harmonic.pojo.po.RMpPvPowerDetailYPO;
+
+/**
+* @author yzh
+* @description 针对表【r_mp_pv_power_detail_y(分布式光伏_台区电能质量明细_年表)】的数据库操作Mapper
+* @createDate 2022-11-25 10:22:31
+* @Entity generator.domain.RMpPvPowerDetailYPO
+*/
+public interface RMpPvPowerDetailYMapper extends BaseMapper<RMpPvPowerDetailYPO> {
+
+}
+
+
+
+