pms代码合并

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

@@ -1,24 +1,10 @@
 package com.njcn.device.pms.api;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.ServerInfo;
-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.api.fallback.DistributionMonitorClientFallbackFactory;
-import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
-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;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -5,14 +5,11 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
-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;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;

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

@@ -6,9 +6,7 @@ import com.njcn.device.pms.api.fallback.PmsGeneratrixClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 

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

@@ -3,8 +3,7 @@ package com.njcn.device.pms.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory;
-import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsBaseParam;
-import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.pojo.po.PmsTerminal;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,5 +30,5 @@ public interface PmsTerminalClient {
     * @Date: 2022/12/1
     */
     @PostMapping("/getTerminalSelectList")
-    HttpResult<List<PmsTerminal>> getTerminalSelectList();
+    HttpResult<List<PmsTerminal>> getTerminalSelectList(@RequestBody PmsBaseParam pmsBaseParam);
 }

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

@@ -2,12 +2,10 @@ package com.njcn.device.pms.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
 import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -32,6 +30,14 @@ public interface PwMonitorClient {
     @PostMapping("/getPwMonitorList")
     HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
 
+    /**
+     * 获取子集配网所有监测点信息
+     * @param pwPmsMonitorParam 参数条件
+     * @return 配网所有监测点信息
+     */
+    @PostMapping("/getPwSubsetMonitorList")
+    HttpResult<List<PwPmsMonitorDTO>> getPwSubsetMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
+
     /**
      * 获取分布式光伏配网所有监测点信息
      * @param pwPmsMonitorParam 参数条件

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

@@ -4,11 +4,9 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
-
 import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
 import com.njcn.device.pms.pojo.po.StatationStat;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 

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

@@ -2,7 +2,6 @@ package com.njcn.device.pms.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
 import com.njcn.device.pms.api.fallback.TractionStationClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
 import com.njcn.device.pms.pojo.param.PmsTractionStationParam;

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

@@ -4,19 +4,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.DistributionMonitorClient;
-import com.njcn.device.pms.api.MonitorClient;
-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;

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

@@ -6,10 +6,8 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
-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;

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

@@ -3,12 +3,9 @@ package com.njcn.device.pms.api.fallback;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
 import com.njcn.device.pms.api.PmsGeneratrixClient;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
-import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import feign.hystrix.FallbackFactory;

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

@@ -4,9 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.PmsTerminalClient;
-import com.njcn.device.pms.api.PwMonitorClient;
+import com.njcn.device.pms.pojo.param.PmsBaseParam;
-import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
-import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.pojo.po.PmsTerminal;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
@@ -34,7 +32,7 @@ public class PmsTerminalClientFallbackFactory implements FallbackFactory<PmsTerm
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new PmsTerminalClient() {
             @Override
-            public  HttpResult<List<PmsTerminal>> getTerminalSelectList() {
+            public  HttpResult<List<PmsTerminal>> getTerminalSelectList(PmsBaseParam pmsBaseParam) {
                 log.error("{}异常，降级处理，异常为：{}", "获取主网所有终端", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -3,14 +3,12 @@ package com.njcn.device.pms.api.fallback;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -39,6 +37,12 @@ public class PwMonitorClientFallbackFactory implements FallbackFactory<PwMonitor
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<List<PwPmsMonitorDTO>> getPwSubsetMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
+                log.error("{}异常，降级处理，异常为：{}", "获取子集配网所有监测点信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<List<PwPmsMonitorDTO>> getPwPhotovoltaicMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
                 log.error("{}异常，降级处理，异常为：{}", "获取分布式光伏配网所有监测点信息", throwable.toString());

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

@@ -3,7 +3,6 @@ package com.njcn.device.pms.api.fallback;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.TractionStationClient;
 import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
 import com.njcn.device.pms.pojo.param.PmsTractionStationParam;

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

@@ -35,6 +35,7 @@ public enum PmsDeviceResponseEnum {
     DIS_ADD_REPEAT("A00376","当前配网中存在该监测点"),
     STATION_REPEAT("A00377","已存在相同电站"),
     DEPT_STATION_REPEAT("A00378","单位下存在同名电站"),
+    DEPT_MONITOR_REPEAT("A00379","单位下存在同名监测点"),
 
 
     POWER_CLIENT_NOT_FIND("A00380","查无此用电用户"),

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java

@@ -1,10 +1,7 @@
 package com.njcn.device.pms.pojo.dto;
 
-import com.njcn.device.pms.pojo.po.Generatrix;
-import com.njcn.device.pq.pojo.po.Voltage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.math3.analysis.function.Power;
 
 import java.io.Serializable;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java

@@ -1,11 +1,8 @@
 package com.njcn.device.pms.pojo.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 母线信息

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java

@@ -1,10 +1,7 @@
 package com.njcn.device.pms.pojo.dto;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.HashCodeExclude;
 
-import java.util.Date;
 import java.io.Serializable;
 
 /**

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.List;
 
 /**
  * Description:

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 
 /**
  * pms-device
@@ -38,7 +37,4 @@ public class DistributionMonitorParam {
 
     @ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电")
     private Integer smallType;
-
-
-
 }

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

@@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 

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

@@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 

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

@@ -2,11 +2,9 @@ package com.njcn.device.pms.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 /**
  * pms-device
@@ -18,12 +16,7 @@ import java.time.LocalDateTime;
 public class MonitorParam {
 
     private static final long serialVersionUID = 1L;
-
-    /**
-     * 监测线路ID
-     */
     @ApiModelProperty(value = "监测点编号")
-    @NotBlank(message = "监测点编号不可为空")
     private String id;
 
     /**
@@ -92,20 +85,6 @@ public class MonitorParam {
     @NotBlank(message = "母线名称不能为空")
     private String generatrixName;
 
-    /**
-     * 监测线路名称
-     */
-    @ApiModelProperty(value = "监测点名称")
-    @NotBlank(message = "监测线路名称不能为空")
-    private String lineName;
-
-    /**
-     * 监测线路ID
-     */
-    @ApiModelProperty(value = "监测线路ID")
-    @NotBlank(message = "监测线路ID不可为空")
-    private String lineId;
-
     /**
      * 电压等级(字典)
      */
@@ -201,14 +180,12 @@ public class MonitorParam {
      * 监测对象编号
      */
     @ApiModelProperty(value = "监测对象编号")
-    @NotBlank(message = "监测对象编号不可为空")
     private String monitorObjectId;
 
     /**
      * 监测对象名称
      */
     @ApiModelProperty(value = "监测对象名称")
-    @NotBlank(message = "监测对象名称不可为空")
     private String monitorObjectName;
 
     /**
@@ -240,6 +217,23 @@ public class MonitorParam {
     private Integer isUpToGrid;
 
 
+    @ApiModelProperty(value = "pt变比_1")
+    private Float pt1;
+
+    @ApiModelProperty(value = "pt变比_2")
+    private Float pt2;
+
+    @ApiModelProperty(value = "ct变比_1")
+    private Float ct1;
+
+    @ApiModelProperty(value = "ct变比_2")
+    private Float ct2;
+
+
+
+
+
+
 
 
 }

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

@@ -0,0 +1,41 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <功能描述>
+ *
+ * @author wr
+ * @createTime: 2022-12-29
+ */
+@Data
+public class OverviewParam {
+
+    @ApiModelProperty(name = "id", value = "单位id")
+    private String id;
+
+    @ApiModelProperty(name = "year", value = "年份")
+    private String year;
+
+    @ApiModelProperty(name = "month", value = "月份")
+    private List<String> month;
+
+    @Data
+    public static class OverviewDateParam {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "id", value = "单位id")
+        private String id;
+
+        @ApiModelProperty(name = "startTime", value = "开始时间")
+        private String startTime;
+
+        @ApiModelProperty(name = "endTime", value = "结束时间")
+        private String endTime;
+
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2023/1/11
+ */
+@Data
+public class PmsBaseParam {
+
+    @ApiModelProperty(value = "部门id")
+    private String deptId;
+
+
+    @ApiModelProperty(value = "电站id")
+    private String stationId;
+
+    @ApiModelProperty(value = "母线id")
+    private String generatrixId;
+}

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

@@ -2,14 +2,11 @@ package com.njcn.device.pms.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.device.biz.enums.LineFlagEnum;
-import com.njcn.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -1,10 +1,8 @@
 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;

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

@@ -1,11 +1,9 @@
 package com.njcn.device.pms.pojo.param;
 
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 

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

@@ -1,9 +1,7 @@
 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;

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.List;
 
 /**

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

@@ -1,17 +1,7 @@
 package com.njcn.device.pms.pojo.param;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 主网-告警统计(周)查询参数实体

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

@@ -1,10 +1,8 @@
 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;

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

@@ -4,9 +4,7 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

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

@@ -2,13 +2,10 @@ 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.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -3,7 +3,6 @@ package com.njcn.device.pms.pojo.po;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import jdk.nashorn.internal.ir.IdentNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -1,6 +1,5 @@
 package com.njcn.device.pms.pojo.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;

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

@@ -2,13 +2,10 @@ 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.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -1,15 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
-import java.io.Serializable;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * <p>
  *

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

@@ -2,8 +2,6 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -2,14 +2,10 @@ 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;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDate;
 
 /**
  * <p>

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

@@ -2,14 +2,10 @@ 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;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDate;
 
 /**
  * <p>

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

@@ -2,13 +2,8 @@ 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.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>
@@ -80,6 +75,7 @@ public class PowerDistributionarea extends BaseEntity {
      */
     private String voltageLevel;
 
+
     /**
      * 配变容量
      */

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

@@ -2,14 +2,10 @@ 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;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDate;
 
 /**
  * <p>

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

@@ -1,13 +1,9 @@
 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.LocalDateTime;
-
 import lombok.Data;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 配网运行指标统计-月表,配网监测指标数据质量统计-月表

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

@@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 (RDnOperatingIndexM)实体类

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 配网运行指标统计-年表,配网监测指标数据质量统计-年表

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 终端评价详情表

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 终端消缺明细数据表

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * @author jianghf
  * 监测点告警统计-月表

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 告警明细-日表
  * @TableName r_mp_pw_alarm_detail_d

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 监测点指标告警明细日表
  * @TableName r_mp_target_warn_d

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 主网运行指标统计-月表,主网监测指标数据质量统计-月表

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

@@ -3,8 +3,8 @@ package com.njcn.device.pms.pojo.po;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 主网运行指标统计实体类

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 主网运行指标统计-年表,主网监测指标数据质量统计-年表

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

@@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 区域告警统计(月)
  * @TableName r_stat_area_alarm_count_m

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

@@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * (RStatBusbarHarmonicY)实体类

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * 终端通信管理日表

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

@@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 监测点台账数据质量问题-核查详情(RStatMeasurementAccountDetail)实体类

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

@@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 区域分类统计年表(RStatOrgY)实体类

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

@@ -1,8 +1,9 @@
 package com.njcn.device.pms.pojo.po;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * @author jianghf

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

@@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * (RStatSubstationY)实体类

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

@@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类

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

@@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -2,16 +2,13 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * <p>
  *

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

@@ -0,0 +1,23 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * pms-device
+ * 主网监测关系表
+ * @author cdf
+ * @date 2023/1/11
+ */
+@Data
+@TableName(value = "pms_special_monitor")
+public class SpecialMonitor {
+
+
+    private String id;
+
+    private Integer type;
+
+
+    private Float capacity;
+}

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

@@ -3,14 +3,8 @@ package com.njcn.device.pms.pojo.po;
 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;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

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

@@ -2,13 +2,10 @@ 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.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -1,13 +1,9 @@
 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.LocalDateTime;
-
 import lombok.Data;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -2,14 +2,10 @@ 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;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDate;
 
 /**
  * <p>

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

@@ -1,13 +1,9 @@
 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 lombok.Data;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDate;
 
 /**
  * <p>

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

@@ -1,13 +1,9 @@
 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.LocalDateTime;
-
 import lombok.Data;
-import lombok.Getter;
+
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 /**
  * <p>

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

@@ -0,0 +1,117 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 配网监测点
+ * </p>
+ *
+ * @author wr
+ * @since 2022-12-30
+ */
+@Data
+public class DistributionMonitorVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 经度
+     */
+    @ApiModelProperty(name = "longitude", value = "经度")
+    private String longitude;
+    /**
+     * 维度
+     */
+    @ApiModelProperty(name = "latitude", value = "维度")
+    private String latitude;
+
+
+    /**
+     * 监测点类别(字典)
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别(字典)")
+    private String monitorSort;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "monitorId", value = "监测点ID")
+    private String monitorId;
+
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位id")
+    private String orgNo;
+
+    /**
+     * 电压等级(字典)
+     */
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
+    private String voltageLevel;
+
+    /**
+     * 是否发电用户：0-否；1-是；
+     */
+    @ApiModelProperty(name = "ifPowerUser", value = "是否发电用户：0-否；1-是；")
+    private Integer ifPowerUser;
+
+    /**
+     * 监测点状态(字典)
+     */
+    @ApiModelProperty(name = "monitorState", value = "监测点状态(字典)")
+    private String monitorState;
+
+    /**
+     * 创建日期
+     */
+    @ApiModelProperty(name = "createdDate", value = "创建日期")
+    private LocalDateTime createdDate;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    @ApiModelProperty(name = "status", value = "数据状态：0-删除；1-正常；")
+    private Integer status;
+
+    /**
+     * 关联的监测终端编号(外键)
+     */
+    @ApiModelProperty(name = "terminalId", value = "关联的监测终端编号(外键)")
+    private String terminalId;
+
+    /**
+     * 监测终端接线方式(字典)
+     */
+    @ApiModelProperty(name = "terminalWiringMethod", value = "监测终端接线方式(字典)")
+    private String terminalWiringMethod;
+
+    /**
+     * pt变比
+     */
+    @ApiModelProperty(name = "pt1", value = "pt变比1")
+    private Float pt1;
+
+    /**
+     * pt变比
+     */
+    @ApiModelProperty(name = "pt2", value = "pt变比2")
+    private Float pt2;
+
+    /**
+     * ct变比
+     */
+    @ApiModelProperty(name = "ct1", value = "ct变比")
+    private Float ct1;
+
+    /**
+     * ct变比
+     */
+    @ApiModelProperty(name = "ct2", value = "ct变比")
+    private Float ct2;
+
+}

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

@@ -0,0 +1,200 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <分布式光伏概览-信息>
+ *
+ * @author wr
+ * @createTime: 2022-12-29
+ */
+@Data
+public class OverviewVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+    private String monitorSort;
+    @ApiModelProperty(name = "sumNum", value = "监测点数量")
+    private String sumNum;
+    @ApiModelProperty(name = "ytbSumNum", value = "同比监测点数量")
+    private String ytbSumNum;
+    @ApiModelProperty(name = "yhbSumNum", value = "环比监测点数量")
+    private String yhbSumNum;
+    @ApiModelProperty(name = "sumNum", value = "同比监测点占比")
+    private String sameNum;
+    @ApiModelProperty(name = "sumNum", value = "环比监测点占比")
+    private String ringNum;
+
+    @Data
+    public static class AlarmVO {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private String monitorSort;
+
+        @ApiModelProperty(name = "vAlarm", value = "谐波电压")
+        private Float vAlarm;
+
+        @ApiModelProperty(name = "flickerAlarm", value = "闪变")
+        private Float flickerAlarm;
+
+        @ApiModelProperty(name = "unbalanceAlarm", value = "三项不平横")
+        private Float unbalanceAlarm;
+
+    }
+
+    @Data
+    public static class GroupVO {
+        private static final long serialVersionUID = 1L;
+
+        @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+        private String monitorSort;
+
+        @ApiModelProperty(name = "subset", value = "子集集合")
+        private List<?> subset;
+
+    }
+
+
+    /**
+     * 告警评级
+     */
+    @Data
+    public static class AreaAlarmCountVO {
+        private static final long serialVersionUID = 1L;
+        /**
+         * 单位名称
+         */
+        @ApiModelProperty(name = "orgName", value = "单位名称")
+        private String orgName;
+        /**
+         * 稳态指标评级结果（0 较差 1中等 2较好）
+         */
+        @ApiModelProperty(name = "harmonicTypeGrade", value = "稳态指标评级结果（0 较差 1中等 2较好）")
+        private Integer harmonicTypeGrade;
+        /**
+         * 暂态指标评级结果（0 较差 1中等 2较好）
+         */
+        @ApiModelProperty(name = "eventTypeGrade", value = "暂态指标评级结果（0 较差 1中等 2较好）")
+        private Integer eventTypeGrade;
+
+    }
+
+
+    /**
+     * 告警监测点数
+     */
+    @Data
+    public static class MonitorAlarmCountVO {
+        private static final long serialVersionUID = 1L;
+        /**
+         * 单位ID
+         */
+        private String orgNo;
+
+        /**
+         * 生成数据的时间,每月统计一次
+         */
+        private Date dataDate;
+
+        /**
+         * 数据类型(0:主网 1:配网)
+         */
+        private String dataType;
+
+        /**
+         * 监测点ID
+         */
+        private String measurementPointId;
+
+        /**
+         * 监测点类别
+         */
+        private String monitorSort;
+
+        /**
+         * 电压偏差告警情况(0:否 1:是)
+         */
+        private Integer vdevAlarmInfo;
+
+        /**
+         * 电压偏差严重度
+         */
+        private Integer vdevSeverity;
+
+        /**
+         * 频率偏差告警情况(0:否 1:是)
+         */
+        private Integer freqAlarmInfo;
+
+        /**
+         * 频率偏差严重度
+         */
+        private Integer freqSeverity;
+
+        /**
+         * 三相电压不平衡度告警情况(0:否 1:是)
+         */
+        private Integer unbalanceAlarmInfo;
+
+        /**
+         * 三相电压不平衡严重度
+         */
+        private Integer unbalanceSeverity;
+
+        /**
+         * 谐波电压告警情况(0:否 1:是)
+         */
+        private Integer vAlarmInfo;
+
+        /**
+         * 谐波电压严重度
+         */
+        private Integer vSeverity;
+
+        /**
+         * 闪变告警情况(0:否 1:是)
+         */
+        private Integer flickerAlarmInfo;
+
+        /**
+         * 闪变严重度
+         */
+        private Integer flickerSeverity;
+
+        /**
+         * 电压暂降告警情况(0:否 1:是)
+         */
+        private Integer sagAlarmInfo;
+
+        /**
+         * 电压暂降严重度
+         */
+        private Integer sagSeverity;
+
+        /**
+         * 短时中断告警情况(0:否 1:是)
+         */
+        private Integer interruptAlarmInfo;
+
+        /**
+         * 短时中断严重度
+         */
+        private Integer interruptSeverity;
+
+        /**
+         * 稳态指标评级结果（0 较差 1中等 2较好）
+         */
+        private Integer harmonicTypeGrade;
+
+        /**
+         * 暂态指标评级结果（0 较差 1中等 2较好）
+         */
+        private Integer eventTypeGrade;
+    }
+}

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.vo;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  *
  * @TableName pms_monitor

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

@@ -1,7 +1,5 @@
 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;

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

@@ -3,8 +3,6 @@ package com.njcn.device.pms.pojo.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 终端异常管理返回实体类
  * @Title RMpDevAbnormalManageVO

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

@@ -1,6 +1,5 @@
 package com.njcn.device.pms.pojo.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 区域分类统计表(RStatOrgY)实体类

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 变电站指标统计表实体类

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

@@ -1,9 +1,7 @@
 package com.njcn.device.pms.pojo.vo;
 
-import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 public class StatationStatVO implements Serializable {