diff --git a/pom.xml b/pom.xml
index adff767d3..72634fdfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,8 @@
${middle.server.url}:18848
-
+
+
f6df4a49-39cb-4355-a8fd-8aeb0c537eb1
@@ -60,7 +61,7 @@
${docker.server.url}:8090
njcn
- site
+ deploy
1.8
8
8
@@ -76,6 +77,7 @@
1.2.5
8.0.19
3.4.2
+ 1.5.1-RELEASE
3.5.1
2.3
0.9.1
@@ -197,6 +199,11 @@
mybatis-plus-generator
${mybatis-plus-generator.version}
+
+ com.github.jeffreyning
+ mybatisplus-plus
+ ${mybatis-plus.jeffreyning.version}
+
org.apache.velocity
velocity-engine-core
diff --git a/pqs-common/common-db/pom.xml b/pqs-common/common-db/pom.xml
index 55e7a2db8..c160a2fd6 100644
--- a/pqs-common/common-db/pom.xml
+++ b/pqs-common/common-db/pom.xml
@@ -53,6 +53,11 @@
com.baomidou
mybatis-plus-boot-starter
+
+
+
+
+
diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
index 7b68ff6af..e138686e5 100644
--- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
+++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
@@ -53,6 +53,8 @@ public class Knife4jSwaggerConfig {
public Docket defaultApi() {
List controllerPath = Stream.of(
"com.njcn.user.controller",
+ "com.njcn.prepare.harmonic.controller",
+ "com.njcn.prepare.event.controller",
"com.njcn.device.pq.controller",
"com.njcn.device.pms.controller",
"com.njcn.auth.controller",
diff --git a/pqs-device/pms-device/pms-device-api/pom.xml b/pqs-device/pms-device/pms-device-api/pom.xml
index 18864dfb5..7ffaf2a15 100644
--- a/pqs-device/pms-device/pms-device-api/pom.xml
+++ b/pqs-device/pms-device/pms-device-api/pom.xml
@@ -22,5 +22,11 @@
common-device-biz
${project.version}
+
+ com.njcn
+ pq-device-api
+ 1.0.0
+ compile
+
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
new file mode 100644
index 000000000..ac99e4e09
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
@@ -0,0 +1,69 @@
+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.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.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;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(
+ value = ServerInfo.DEVICE,
+ path = "/pms/monitor",
+ fallbackFactory = MonitorClientFallbackFactory.class)
+public interface MonitorClient {
+
+ /**
+ * 获取指定的监测点信息
+ *
+ * @param pmsMonitorInfoParam 获取监测点详情数据入参
+ * @return 指定的监测点信息
+ */
+ @PostMapping("/getMonitorInfo")
+ HttpResult> getMonitorInfo(@RequestBody PmsMonitorInfoParam pmsMonitorInfoParam);
+
+ /***
+ * 根据条件获取监测点信息列表
+ * @author jianghaifei
+ * @date 2022-10-20 22:53
+ * @param pmsMonitorParam
+ * @return com.njcn.common.pojo.response.HttpResult>
+ */
+ @PostMapping("/getMonitorInfoListByCond")
+ public HttpResult> getMonitorInfoListByCond(@RequestBody PmsMonitorParam pmsMonitorParam);
+
+
+ /**
+ * 根据监测点id获取限值
+ *
+ * @param id 监测点id
+ * @return 获取限值
+ */
+ @PostMapping("getOverLimitData")
+ HttpResult getOverLimitData(@RequestParam("id") String id);
+
+ /**
+ * 获取配网所有监测点信息
+ *
+ * @param pwPmsMonitorParam 参数条件
+ * @return 配网所有监测点信息
+ */
+ @PostMapping("/getPwMonitorList")
+ HttpResult> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
new file mode 100644
index 000000000..a761a681c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
@@ -0,0 +1,42 @@
+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.PmsGeneralDeviceInfoClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年02月14日 14:02
+ */
+@FeignClient(value = ServerInfo.DEVICE, path = "/pmsDeviceInfo", fallbackFactory = PmsGeneralDeviceInfoClientFallbackFactory.class)
+public interface PmsGeneralDeviceInfoClient {
+
+
+ /***
+ * 获取指定组织下台账综合信息
+ * @author hongawen
+ * @date 2022/10/18 10:12
+ * @param pmsDeviceInfoParam 查询条件
+ * @return HttpResult> 统计结果
+ */
+ @PostMapping("/getPmsDeviceInfoWithInOrg")
+ HttpResult> getPmsDeviceInfoWithInOrg(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam);
+
+ /***
+ * 获取指定组织下台账综合信息
+ * @author cdf
+ * @date 2022/10/18 10:12
+ * @param pmsDeviceInfoParam 查询条件
+ * @return HttpResult> 统计结果
+ */
+ @PostMapping("/getPwPmsDeviceInfoWithOrgId")
+ HttpResult> getPwPmsDeviceInfoWithOrgId(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam);
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
new file mode 100644
index 000000000..2c07625b9
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
@@ -0,0 +1,33 @@
+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.PmsGeneratrixClientFallbackFactory;
+import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+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 java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(value = ServerInfo.DEVICE,
+ path = "/pmsGeneratrix",
+ fallbackFactory = PmsGeneratrixClientFallbackFactory.class)
+public interface PmsGeneratrixClient {
+
+ /**
+ * 获取母线信息
+ *
+ * @param pmsGeneratrixParam 入参
+ * @return 母线信息
+ */
+ @PostMapping("/getGeneratrixInfo")
+ HttpResult> getGeneratrixInfo(@RequestBody PmsGeneratrixParam pmsGeneratrixParam);
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
new file mode 100644
index 000000000..1e67fd790
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
@@ -0,0 +1,34 @@
+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;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+@FeignClient(
+ value = ServerInfo.DEVICE,
+ path = "/pms/pwMonitor",
+ fallbackFactory = PwMonitorClientFallbackFactory.class)
+public interface PwMonitorClient {
+
+ /**
+ * 获取配网所有监测点信息
+ * @param pwPmsMonitorParam 参数条件
+ * @return 配网所有监测点信息
+ */
+ @PostMapping("/getPwMonitorList")
+ HttpResult> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
new file mode 100644
index 000000000..e372fa81a
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
@@ -0,0 +1,34 @@
+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.StatationStatClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+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 java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@FeignClient(value = ServerInfo.DEVICE,
+ path = "/pms/statationStat",
+ fallbackFactory = StatationStatClientFallbackFactory.class)
+public interface StatationStatClient {
+
+ /**
+ * 获取指定的变电站信息
+ *
+ * @param pmsStatationStatInfoParam 变电站详情数据入参
+ * @return 指定的变电站信息
+ */
+ @PostMapping("/getStatationStat")
+ HttpResult> getStatationStatInfo(@RequestBody PmsStatationStatInfoParam pmsStatationStatInfoParam);
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
new file mode 100644
index 000000000..dca7c1cac
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
@@ -0,0 +1,64 @@
+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.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.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 java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Slf4j
+@Component
+public class MonitorClientFallbackFactory implements FallbackFactory {
+
+ @Override
+ public MonitorClient create(Throwable throwable) {
+ //判断抛出异常是否为解码器抛出的业务异常
+ Enum> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+ if (throwable.getCause() instanceof BusinessException) {
+ BusinessException businessException = (BusinessException) throwable.getCause();
+ exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+ }
+ Enum> finalExceptionEnum = exceptionEnum;
+ return new MonitorClient()
+ {
+ @Override
+ public HttpResult> getMonitorInfo(PmsMonitorInfoParam pmsMonitorInfoParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取指定的监测点信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+
+ @Override
+ public HttpResult> getMonitorInfoListByCond(PmsMonitorParam pmsMonitorParam) {
+ log.error("{}异常,降级处理,异常为:{}", "根据条件获取监测点信息列表", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+ @Override
+ public HttpResult> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取配网所有监测点信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+
+ @Override
+ public HttpResult getOverLimitData(String id) {
+ log.error("{}异常,降级处理,异常为:{}", "根据监测点Id获取限值 ", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+ };
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java
new file mode 100644
index 000000000..33ee43349
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneralDeviceInfoClientFallbackFactory.java
@@ -0,0 +1,51 @@
+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.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月18日 10:09
+ */
+@Slf4j
+@Component
+public class PmsGeneralDeviceInfoClientFallbackFactory implements FallbackFactory {
+
+
+ @Override
+ public PmsGeneralDeviceInfoClient create(Throwable throwable) {
+ //判断抛出异常是否为解码器抛出的业务异常
+ Enum> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+ if (throwable.getCause() instanceof BusinessException) {
+ BusinessException businessException = (BusinessException) throwable.getCause();
+ exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+ }
+ Enum> finalExceptionEnum = exceptionEnum;
+ return new PmsGeneralDeviceInfoClient()
+ {
+ @Override
+ public HttpResult> getPmsDeviceInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取指定组织下台账综合信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+
+ @Override
+ public HttpResult> getPwPmsDeviceInfoWithOrgId(PmsDeviceInfoParam pmsDeviceInfoParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取指定组织下配网台账综合信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+ };
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java
new file mode 100644
index 000000000..851ae2fbc
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java
@@ -0,0 +1,43 @@
+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.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;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Slf4j
+@Component
+public class PmsGeneratrixClientFallbackFactory implements FallbackFactory {
+ @Override
+ public PmsGeneratrixClient create(Throwable throwable) {
+ //判断抛出异常是否为解码器抛出的业务异常
+ Enum> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+ if (throwable.getCause() instanceof BusinessException) {
+ BusinessException businessException = (BusinessException) throwable.getCause();
+ exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+ }
+ Enum> finalExceptionEnum = exceptionEnum;
+ return new PmsGeneratrixClient() {
+ @Override
+ public HttpResult> getGeneratrixInfo(PmsGeneratrixParam pmsGeneratrixParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取母线信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+ };
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java
new file mode 100644
index 000000000..786d59feb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java
@@ -0,0 +1,43 @@
+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;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+
+@Slf4j
+@Component
+public class PwMonitorClientFallbackFactory implements FallbackFactory {
+ @Override
+ public PwMonitorClient create(Throwable throwable) {
+ //判断抛出异常是否为解码器抛出的业务异常
+ Enum> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+ if (throwable.getCause() instanceof BusinessException) {
+ BusinessException businessException = (BusinessException) throwable.getCause();
+ exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+ }
+ Enum> finalExceptionEnum = exceptionEnum;
+ return new PwMonitorClient() {
+ @Override
+ public HttpResult> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取配网所有监测点信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+ };
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
new file mode 100644
index 000000000..57ca95961
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
@@ -0,0 +1,42 @@
+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.StatationStatClient;
+import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
+import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
+import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Slf4j
+@Component
+public class StatationStatClientFallbackFactory implements FallbackFactory {
+
+ @Override
+ public StatationStatClient create(Throwable throwable) {
+ //判断抛出异常是否为解码器抛出的业务异常
+ Enum> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+ if (throwable.getCause() instanceof BusinessException) {
+ BusinessException businessException = (BusinessException) throwable.getCause();
+ exceptionEnum = PmsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
+ }
+ Enum> finalExceptionEnum = exceptionEnum;
+ return new StatationStatClient() {
+ @Override
+ public HttpResult> getStatationStatInfo(PmsStatationStatInfoParam pmsStatationStatInfoParam) {
+ log.error("{}异常,降级处理,异常为:{}", "获取指定的变电站信息", throwable.toString());
+ throw new BusinessException(finalExceptionEnum);
+ }
+ };
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
new file mode 100644
index 000000000..79f82a374
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.enums;
+
+import lombok.Getter;
+
+/**
+ * pqs
+ * 终端枚举
+ * @author cdf
+ * @date 2021/6/21
+ */
+@Getter
+public enum PmsDeviceResponseEnum {
+
+ /**
+ * A0250 ~ A0349 用于终端模块的枚举
+ */
+ DEVICE_COMMON_ERROR("A00349","终端模块异常"),
+ ORG_ITEM_EMPTY("A00360","未查询到指定组织机构"),
+ Operation_ITEM_EMPTY("A00361","未查询到指定运维单位"),
+ VOLTAGE_EMPTY("A00362","未查询到指定母线"),
+ LINE_EMPTY("A00363","未查询到指定线路"),
+ MODEL_NAME_REPEAT("A00350","名称不可重复");
+
+
+ private final String code;
+
+ private final String message;
+
+ PmsDeviceResponseEnum(String code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java
deleted file mode 100644
index b5dfa5b8b..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.njcn.device.pms.pojo.bo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.njcn.device.pms.pojo.vo.DeviceRunExVO;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 终端异常信息类
- * @author yangj
- * @date 2022/09/14
- */
-@Data
-public class DeviceRunExBO extends DeviceRunExVO implements Serializable {
-
- private String id;
-
- private String pid;
-
- private String pidS;
-
- private String name;
-
- private Integer level;
-
- private Integer sort;
-
- private String remark;
-
- private Integer state;
-
- private String createBy;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private Date createTime;
-
- private String updateBy;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private Date updateTime;
-
- private List children;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java
new file mode 100644
index 000000000..215febdc0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExVO.java
@@ -0,0 +1,4 @@
+package com.njcn.device.pms.pojo.bo;
+
+public class DeviceRunExVO {
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java
new file mode 100644
index 000000000..b95ca6310
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneralDeviceDTO.java
@@ -0,0 +1,63 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年09月07日 10:48
+ * name对应统计名称:如 区域:南京市、苏州市;电压等级:10kV、220kV...
+ * index对应统计索引:如 区域:南京市索引、苏州市索引;电压等级:10kV索引、220kV索引...
+ * gdIndexes:供电公司索引集合
+ * subIndexes:变电站索引集合
+ * deviceIndexes:终端索引集合
+ * voltageIndexes:母线索引集合
+ * lineIndexes:监测点索引集合
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PmsGeneralDeviceDTO implements Serializable {
+
+ /**
+ * name对应统计名称:如 区域:南京市、苏州市;电压等级:10kV、220kV...
+ */
+ private String name;
+
+ /**
+ * index对应统计索引:如 区域:南京市索引、苏州市索引;电压等级:10kV索引、220kV索引...
+ */
+ private String index;
+
+ /**
+ * subIndexes:变电站索引集合
+ */
+ private List powerrIdList = new ArrayList<>();
+
+ /**
+ * deviceIndexes:终端索引集合
+ */
+ private List terminalIdList = new ArrayList<>();
+
+ /**
+ * voltageIndexes:母线索引集合
+ */
+ private List generatrixIdList = new ArrayList<>();
+
+ /**
+ * lineIndexes:监测点索引集合
+ */
+ private List monitorIdList = new ArrayList<>();
+
+ /**
+ * lineIndexes:监测线路集合
+ */
+ private List lineIdList = new ArrayList<>();
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java
new file mode 100644
index 000000000..af5e41e32
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java
@@ -0,0 +1,63 @@
+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;
+
+/**
+ * 母线信息
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+public class PmsGeneratrixDTO implements Serializable {
+
+ /**
+ * 单位id
+ */
+ private String orgId;
+
+ /**
+ * 单位名称
+ */
+ private String orgName;
+
+ /**
+ * 电站编号
+ */
+ private String powerId;
+ /**
+ * 电站名称
+ */
+ private String powerName;
+
+ /**
+ * 母线id
+ */
+ private String generatrixId;
+
+ /**
+ * 母线名称
+ */
+ private String generatrixName;
+
+ /**
+ * 监测点id
+ */
+ private String monitorId;
+
+ /**
+ * 监测点名称
+ */
+ private String monitorName;
+
+ /**
+ * 母线电压等级
+ */
+ private String generatrixVoltageLevel;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
new file mode 100644
index 000000000..0d810d7a6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java
@@ -0,0 +1,50 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年10月17日 16:44
+ */
+@Data
+public class PmsMonitorBaseDTO implements Serializable {
+
+ /***
+ * 监测点ID
+ */
+ private String monitorId;
+
+ /***
+ * 运维单位ID
+ */
+ private String operationId;
+
+ /***
+ * 电站ID
+ */
+ private String powerrId;
+
+ /***
+ * 终端ID
+ */
+ private String terminalId;
+
+ /***
+ * 母线ID
+ */
+ private String generatrixId;
+
+ /***
+ * 监测线路名称
+ */
+ private String lineName;
+
+ /***
+ * 监测线路ID
+ */
+ private String lineId;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java
new file mode 100644
index 000000000..f518376f2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorDTO.java
@@ -0,0 +1,199 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Title PmsMonitorDTO
+ * @Package com.njcn.device.pms.pojo.dto
+ * @Author jianghaifei
+ * @Date 2022-10-20 20:14
+ * @Version V1.0
+ */
+@Data
+public class PmsMonitorDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测点ID
+ */
+ private String id;
+
+ /**
+ * 监测点名称
+ */
+ private String name;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+
+ /**
+ * 运维单位名称
+ */
+ private String operationName;
+
+ /**
+ * 运维单位ID(外键)
+ */
+ private String operationId;
+
+ /**
+ * 变电站名称
+ */
+ private String powerrName;
+
+ /**
+ * 电站ID(外键)
+ */
+ private String powerrId;
+
+ /**
+ * 母线名称
+ */
+ private String generatrixName;
+
+ /**
+ * 母线ID(外键)
+ */
+ private String generatrixId;
+
+ /**
+ * 监测线路名称
+ */
+ private String lineName;
+
+ /**
+ * 监测线路ID
+ */
+ private String lineId;
+
+ /**
+ * 电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 监测点状态(字典)
+ */
+ private String monitorState;
+
+ /**
+ * 监测点类型(字典)
+ */
+ private String monitorType;
+
+ /**
+ * 最小短路容量
+ */
+ private Float minShortCircuitCapacity;
+
+ /**
+ * 供电设备容量
+ */
+ private Float powerSupplyEqCapacity;
+
+ /**
+ * 用户协议容量
+ */
+ private Float userAgreementCapacity;
+
+ /**
+ * 电压偏差限值(上)
+ */
+ private Float voltageDeviationUpperLimit;
+
+ /**
+ * 电压偏差限值(下)
+ */
+ private Float voltageDeviationLowerLimit;
+
+ /**
+ * 电压互感器类型(字典)
+ */
+ private String potentialTransFormerType;
+
+ /**
+ * 中性点接地方式(字典)
+ */
+ private String neutralGroundingMode;
+
+ /**
+ * 是否用户专线(字典)
+ */
+ private String isSpecialSupplyElectricity;
+
+ /**
+ * 监测点标签
+ */
+ private String monitorTag;
+
+ /**
+ * 监测对象类型(字典)
+ */
+ private String monitorObjectType;
+
+ /**
+ * 监测对象编号
+ */
+ private String monitorObjectId;
+
+ /**
+ * 监测对象名称
+ */
+ private String monitorObjectName;
+
+ /**
+ * 统计间隔
+ */
+ private Integer statisticalInterval;
+
+ /**
+ * 关联的监测终端编号(外键)
+ */
+ private String terminalId;
+
+ /**
+ * 监测终端接线方式(字典)
+ */
+ private String terminalWiringMethod;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Boolean isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Boolean status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java
new file mode 100644
index 000000000..e53e87314
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorInfoDTO.java
@@ -0,0 +1,71 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 监测点详情数据dto
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+public class PmsMonitorInfoDTO implements Serializable {
+
+ /**
+ * 单位id
+ */
+ private String orgId;
+
+ /**
+ * 单位名称
+ */
+ private String orgName;
+
+ /**
+ * 电站编号
+ */
+ private String powerId;
+ /**
+ * 电站名称
+ */
+ private String powerName;
+
+ /**
+ * 母线id
+ */
+ private String generatrixId;
+
+ /**
+ * 母线名称
+ */
+ private String generatrixName;
+
+ /**
+ * 监测点id
+ */
+ private String monitorId;
+
+ /**
+ * 监测点名称
+ */
+ private String monitorName;
+
+ /**
+ * 监测点电压等级
+ */
+ private String monitorVoltageLevel;
+
+ /**
+ * 监测点类型
+ */
+ private String monitorType;
+
+ /**
+ * 监测点状态
+ */
+ private String monitorState;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java
new file mode 100644
index 000000000..cc2490942
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java
@@ -0,0 +1,66 @@
+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;
+
+/**
+ * 变电站详情数据dto
+ *
+ * @author yzh
+ * @since 2022-10-18 14:58:24
+ */
+@Data
+public class PmsStatationStatInfoDTO implements Serializable {
+ private static final long serialVersionUID = 852679416130821111L;
+
+
+ /**
+ * 单位id
+ */
+ private String orgId;
+
+ /**
+ * 单位名称
+ */
+ private String orgName;
+
+ /**
+ * 母线id
+ */
+ private String generatrixId;
+
+ /**
+ * 母线名称
+ */
+ private String generatrixName;
+
+ /**
+ * 监测点id
+ */
+ private String monitorId;
+
+ /**
+ * 监测点名称
+ */
+ private String monitorName;
+
+ /**
+ * 电站编号
+ */
+ private String powerId;
+ /**
+ * 电站名称
+ */
+ private String powerName;
+
+ /**
+ * 变电站电压等级
+ */
+ private String powerVoltageLevel;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java
new file mode 100644
index 000000000..b6f59b631
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PwPmsMonitorDTO.java
@@ -0,0 +1,104 @@
+package com.njcn.device.pms.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 配网监测点信息
+ *
+ * @author yzh
+ * @date 2022/10/27
+ */
+
+@Data
+public class PwPmsMonitorDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 单位id
+ */
+ @ApiModelProperty(name = "orgId",value = "单位id")
+ private String orgId;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(name = "orgName",value = "单位名称")
+ private String orgName;
+
+ /**
+ * 监测点类别(字典)
+ */
+ @ApiModelProperty(name = "monitorSort", value = "监测点类别(字典)")
+ private String monitorSort;
+
+ /**
+ * 监测点id
+ */
+ @ApiModelProperty(name = "monitorId", value = "监测点id")
+ private String monitorId;
+
+ /**
+ * 监测点名称
+ */
+ @ApiModelProperty(name = "monitorName", value = "监测点名称")
+ private String monitorName;
+
+ /**
+ * 电压等级(字典)
+ */
+ @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
+ private String voltageLevel;
+
+ /**
+ * 是否发电用户:0-否;1-是
+ */
+ @ApiModelProperty(name = "ifPowerUser", value = "是否发电用户:0-否;1-是")
+ private String ifPowerUser;
+
+ /**
+ * 监测点状态(字典)
+ */
+ @ApiModelProperty(name = "monitorState", value = "监测点状态(字典)")
+ private String monitorState;
+
+ /**
+ * 创建日期
+ */
+ @ApiModelProperty(name = "createdDate", value = "创建日期")
+ private String createdDate;
+
+ /**
+ * 数据状态:0-删除;1-正常
+ */
+ @ApiModelProperty(name = "status", value = "数据状态:0-删除;1-正常")
+ private String status;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(name = "createBy", value = "创建用户")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ private String createTime;
+
+ /**
+ * 更新用户
+ */
+ @ApiModelProperty(name = "updateBy", value = "更新用户")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ private String updateTime;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java
deleted file mode 100644
index 79e6ec3c7..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java
+++ /dev/null
@@ -1,26 +0,0 @@
-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 java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class DeviceQueryParam extends BaseParam {
-
-
- @ApiModelProperty(value = "manufacturer",name = "制造厂商")
- private List manufacturer;
-
- @ApiModelProperty(value = "type",name = "设备类型")
- private List type;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java
deleted file mode 100644
index 81f08676c..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java
+++ /dev/null
@@ -1,25 +0,0 @@
-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 java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class DistributedQueryParam extends BaseParam {
-
- @ApiModelProperty(value = "name",name = "分布式光伏台账名称")
- private String name;
-
- @ApiModelProperty(value = "scale",name = "电压等级")
- private List scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java
new file mode 100644
index 000000000..6ee6e28a3
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java
@@ -0,0 +1,50 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class DistributionMonitorParam {
+
+ /**
+ * 监测点类别(字典)
+ */
+ @ApiModelProperty(value = "监测点类别(字典)")
+ @NotBlank(message = "监测点类别不能为空")
+ private String monitorSort;
+
+ /**
+ * 监测点ID
+ */
+
+ private String monitorId;
+
+ /**
+ * 电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 是否发电用户:0-否;1-是;
+ */
+ private Boolean ifPowerUser;
+
+ /**
+ * 监测点状态(字典)
+ */
+ private String monitorState;
+
+ /**
+ * 创建日期
+ */
+ private LocalDateTime createdDate;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java
new file mode 100644
index 000000000..808bae39d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java
@@ -0,0 +1,37 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class GeneratrixParam {
+ @ApiModelProperty(value = "母线名称",required = true)
+ @NotBlank(message = "母线名称不可为空")
+ private String generatrixName;
+
+ @ApiModelProperty(value = "电站id",required = true)
+ @NotBlank(message = "电站id不可为空")
+ private String statationId;
+
+ @ApiModelProperty(value = "母线电压等级",required = true)
+ @NotBlank(message = "母线电压等级不可为空")
+ private String scale;
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class UpdateGeneratrixParam extends GeneratrixParam {
+
+ @ApiModelProperty(value = "母线id",required = true)
+ @NotBlank(message = "母线id不可为空")
+ private String generatrixId;
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java
new file mode 100644
index 000000000..42ffa2966
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java
@@ -0,0 +1,36 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class GeneratrixWireParam {
+
+ @ApiModelProperty(value = "线路名称",required = true)
+ @NotBlank(message = "线路名称不可为空")
+ private String wireName;
+
+ @ApiModelProperty(value = "母线id",required = true)
+ @NotBlank(message = "母线id不可为空")
+ private String generatrixId;
+
+
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class UpdateGeneratrixWireParam extends GeneratrixWireParam {
+
+ @ApiModelProperty(value = "线路id",required = true)
+ @NotBlank(message = "线路id不可为空")
+ private String wireId;
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java
deleted file mode 100644
index 7e13ef521..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LineDetailQueryParam extends BaseParam {
-
- @ApiModelProperty(value = "scale",name = "分布式光伏台账名称",required = true)
- private String name;
-
- @ApiModelProperty(value = "scale",name = "电压等级")
- private String scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java
deleted file mode 100644
index db7aa986e..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java
+++ /dev/null
@@ -1,28 +0,0 @@
-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 java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LvUserQueryParam extends BaseParam {
-
- @ApiModelProperty(value = "scale",name = "低压侧台账名称")
- private String name;
-
- @ApiModelProperty(value = "userCode",name = "用户编号")
- private String userCode;
-
- @ApiModelProperty(value = "scale",name = "电压等级")
- private List scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
new file mode 100644
index 000000000..e3e17c1d8
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
@@ -0,0 +1,218 @@
+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
+ *
+ * @author cdf
+ * @date 2022/10/25
+ */
+@Data
+public class MonitorParam {
+
+ /**
+ * 监测点名称
+ */
+ @ApiModelProperty(value = "监测点名称")
+ @NotBlank(message = "监测点名称不能为空")
+ private String name;
+
+
+ /**
+ * 组织机构ID(外键)
+ */
+ @ApiModelProperty(value = "组织机构ID(外键)")
+ @NotBlank(message = "组织机构ID不能为空")
+ private String orgId;
+
+
+ /**
+ * 运维单位ID(外键)
+ */
+ @ApiModelProperty(value = "运维单位ID")
+ @NotBlank(message = "运维单位ID不能为空")
+ private String operationId;
+
+
+ /**
+ * 电站ID(外键)
+ */
+ @ApiModelProperty(value = "电站ID(外键)")
+ @NotBlank(message = "电站ID不能为空")
+ private String powerrId;
+
+ /**
+ * 母线ID(外键)
+ */
+ @ApiModelProperty(value = "母线ID(外键)")
+ @NotBlank(message = "母线ID不能为空")
+ private String generatrixId;
+
+ /**
+ * 监测线路名称
+ */
+ @ApiModelProperty(value = "监测点名称")
+ @NotBlank(message = "监测线路名称不能为空")
+ private String lineName;
+
+ /**
+ * 监测线路ID
+ */
+ @ApiModelProperty(value = "监测线路ID")
+ @NotBlank(message = "监测线路ID不可为空")
+ private String lineId;
+
+ /**
+ * 电压等级(字典)
+ */
+ @ApiModelProperty(value = "电压等级(字典)")
+ @NotBlank(message = "电压等级不能为空")
+ private String voltageLevel;
+
+ /**
+ * 监测点状态(字典)
+ */
+ @ApiModelProperty(value = "监测点状态(字典)")
+ @NotBlank(message = "监测点状态不能为空")
+ private String monitorState;
+
+ /**
+ * 监测点类型(字典)
+ */
+ @ApiModelProperty(value = "监测点类型(字典)")
+ @NotBlank(message = "监测点类型不能为空")
+ private String monitorType;
+
+ /**
+ * 最小短路容量
+ */
+ @ApiModelProperty(value = "最小短路容量")
+ @NotNull(message = "最小短路容量不可为空")
+ private Float minShortCircuitCapacity;
+
+ /**
+ * 供电设备容量
+ */
+ @ApiModelProperty(value = "供电设备容量")
+ @NotNull(message = "供电设备容量不可为空")
+ private Float powerSupplyEqCapacity;
+
+ /**
+ * 用户协议容量
+ */
+ @ApiModelProperty(value = "用户协议容量")
+ @NotNull(message = "用户协议容量不可为空")
+ private Float userAgreementCapacity;
+
+ /**
+ * 电压偏差限值(上)
+ */
+ @ApiModelProperty(value = "电压偏差限值(上)")
+ @NotNull(message = "电压偏差限值(上)不可为空")
+ private Float voltageDeviationUpperLimit;
+
+ /**
+ * 电压偏差限值(下)
+ */
+ @ApiModelProperty(value = "电压偏差限值(下)")
+ @NotNull(message = "电压偏差限值(下)不可为空")
+ private Float voltageDeviationLowerLimit;
+
+ /**
+ * 电压互感器类型(字典)
+ */
+ @ApiModelProperty(value = "电压互感器类型(字典)")
+ @NotBlank(message = "电压互感器类型不可为空")
+ private String potentialTransFormerType;
+
+ /**
+ * 中性点接地方式(字典)
+ */
+ @ApiModelProperty(value = "中性点接地方式(字典)")
+ @NotBlank(message = "中性点接地方式不可为空")
+ private String neutralGroundingMode;
+
+ /**
+ * 是否用户专线(字典)
+ */
+ @ApiModelProperty(value = "是否用户专线(字典)")
+ @NotBlank(message = "是否用户专线不可为空")
+ private String isSpecialSupplyElectricity;
+
+ /**
+ * 监测点标签
+ */
+ @ApiModelProperty(value = "监测点标签")
+ @NotBlank(message = "监测点标签不可为空")
+ private String monitorTag;
+
+ /**
+ * 监测对象类型(字典)
+ */
+ @ApiModelProperty(value = "监测对象类型(字典)")
+ @NotBlank(message = "监测对象类型不可为空")
+ private String monitorObjectType;
+
+ /**
+ * 监测对象编号
+ */
+ @ApiModelProperty(value = "监测对象编号")
+ @NotBlank(message = "监测对象编号不可为空")
+ private String monitorObjectId;
+
+ /**
+ * 监测对象名称
+ */
+ @ApiModelProperty(value = "监测对象名称")
+ @NotBlank(message = "监测对象名称不可为空")
+ private String monitorObjectName;
+
+ /**
+ * 统计间隔
+ */
+ @ApiModelProperty(value = "统计间隔")
+ @NotNull(message = "统计间隔不可为空")
+ private Integer statisticalInterval;
+
+ /**
+ * 关联的监测终端编号(外键)
+ */
+ @ApiModelProperty(value = "关联的监测终端编号(外键)")
+ @NotBlank(message = "关联的监测终端编号不可为空")
+ private String terminalId;
+
+ /**
+ * 监测终端接线方式(字典)
+ */
+ @ApiModelProperty(value = "监测终端接线方式(字典)")
+ @NotBlank(message = "监测终端接线方式不可为空")
+ private String terminalWiringMethod;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ @ApiModelProperty(value = "是否是上送国网监测点,0-否 1-是")
+ @NotNull(message = "是否是上送国网监测点不可为空")
+ private Integer isUpToGrid;
+
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class UpdateMonitorParam extends MonitorParam{
+
+ /**
+ * 监测线路ID
+ */
+ @ApiModelProperty(value = "监测点ID")
+ @NotBlank(message = "监测点ID不可为空")
+ private String id;
+ }
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java
new file mode 100644
index 000000000..193e8d693
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java
@@ -0,0 +1,114 @@
+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;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年02月23日 19:04
+ */
+@Data
+@ApiModel
+@NoArgsConstructor
+public class PmsDeviceInfoParam implements Serializable {
+
+ /**
+ * 统计类型
+ */
+ @ApiModelProperty(name = "statisticalType", value = "统计类型",required = true)
+ @NotNull(message = "统计类型不可为空")
+ private SimpleDTO statisticalType;
+
+ @ApiModelProperty(name = "deptIndex", value = "部门索引",required = true)
+ @NotBlank(message = "部门索引不可为空")
+ private String deptIndex;
+
+
+ @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+ private List voltageLevel;
+
+
+ @ApiModelProperty(name = "manufacturer", value = "终端厂家")
+ private List manufacturer;
+
+
+ @ApiModelProperty(name = "monitorObjectType", value = "监测点对象类型")
+ private List monitorObjectType;
+
+
+ @ApiModelProperty(name = "monitorState", value = "监测点状态")
+ private List monitorState;
+
+
+ @ApiModelProperty(name = "upToGrid", value = "是否上送国网0-否 1-是")
+ private Integer upToGrid;
+
+ /**
+ * 默认全部监测点
+ * @param deptIndex 部门索引
+ */
+ public PmsDeviceInfoParam(String deptIndex) {
+ this.deptIndex = deptIndex;
+ }
+
+
+ /**
+ * 自定义上报方式、电网侧方式的统计
+ */
+ public PmsDeviceInfoParam(SimpleDTO statisticalType, String deptIndex, List voltageLevel, List manufacturer, List monitorObjectType, List monitorState) {
+ this.statisticalType = statisticalType;
+ this.deptIndex = deptIndex;
+ this.voltageLevel = voltageLevel;
+ this.manufacturer = manufacturer;
+ this.monitorObjectType = monitorObjectType;
+ this.monitorState = monitorState;
+ }
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class BusinessParam extends PmsDeviceInfoParam{
+
+ @ApiModelProperty("开始时间")
+ @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+ private String searchBeginTime;
+
+ @ApiModelProperty("结束时间")
+ @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+ private String searchEndTime;
+
+ @ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月")
+ private Integer timeFlag;
+
+ }
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class CompareBusinessParam extends BusinessParam{
+
+ @ApiModelProperty("比较开始时间")
+ @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+ private String periodBeginTime;
+
+ @ApiModelProperty("比较结束时间")
+ @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
+ private String periodEndTime;
+
+ }
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java
new file mode 100644
index 000000000..cd2d62604
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java
@@ -0,0 +1,40 @@
+package com.njcn.device.pms.pojo.param;
+
+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;
+
+/**
+ * 母线信息入参
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+@ApiModel("母线信息入参")
+public class PmsGeneratrixParam implements Serializable {
+
+ /**
+ * 母线id集合
+ */
+ @ApiModelProperty(name = "generatrixIds", value = "母线id集合")
+ @NotNull(message = "母线id集合不可为空")
+ private List generatrixIds;
+
+ /**
+ * 母线名称
+ */
+ @ApiModelProperty(name = "generatrixName", value = "母线名称")
+ private String generatrixName;
+
+ /**
+ * 母线电压等级
+ */
+ @ApiModelProperty(name = "generatrixVoltageLevel", value = "母线电压等级")
+ private List generatrixVoltageLevel;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java
new file mode 100644
index 000000000..1b4a84318
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorInfoParam.java
@@ -0,0 +1,60 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 获取监测点详情数据入参
+ *
+ * @author yzh
+ * @date 2022/10/18
+ */
+
+@Data
+@ApiModel(value = "获取监测点详情数据入参")
+@NoArgsConstructor
+public class PmsMonitorInfoParam implements Serializable {
+
+ /**
+ * 监测点id集合
+ */
+ @ApiModelProperty(name = "monitorIds",value = "监测点id集合")
+ @NotNull(message = "监测点id集合不可为空")
+ private List monitorIds;
+
+ /**
+ * 监测点名称
+ */
+ @ApiModelProperty(name = "monitorName",value = "监测点名称")
+ private String monitorName;
+
+ /**
+ * 电压等级
+ */
+ @ApiModelProperty(name = "monitorVoltageLevel",value = "电压等级")
+ private List monitorVoltageLevel;
+
+ /**
+ * 监测点类型
+ */
+ @ApiModelProperty(name = "monitorType",value = "监测点类型")
+ private List monitorType;
+
+ /**
+ * 监测点类别
+ */
+ @ApiModelProperty(name = "monitorSort",value = "监测点类别")
+ private List monitorSort;
+
+ /**
+ * 监测点状态
+ */
+ @ApiModelProperty(name = "monitorState",value = "监测点状态")
+ private List monitorState;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
new file mode 100644
index 000000000..1c0431f96
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
@@ -0,0 +1,40 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Title PmsMonitorParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-20 20:17
+ * @Version V1.0
+ */
+@Data
+@ApiModel
+public class PmsMonitorParam {
+
+ @ApiModelProperty(name = "orgIds", value = "部门id")
+ private List orgIds;
+
+ @ApiModelProperty(name = "monitorIds", value = "监测点id")
+ private List monitorIds;
+
+ @ApiModelProperty(name = "monitorName", value = "监测点名称")
+ private String monitorName;
+
+ @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+ private List voltageLevels;
+
+ @ApiModelProperty(name = "monitorType",value = "监测点类型")
+ private String monitorType;
+
+ @ApiModelProperty(name = "monitorState",value = "监测点状态")
+ private String monitorState;
+
+ @ApiModelProperty(name = "powerrIds",value = "变电站id")
+ private List powerrIds;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java
new file mode 100644
index 000000000..f48003883
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java
@@ -0,0 +1,39 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 变电站详情数据入参
+ * @author yzh
+ * @date 2022/10/18
+ */
+@Data
+@ApiModel(value = "变电站详情数据入参")
+@NoArgsConstructor
+public class PmsStatationStatInfoParam {
+
+ /**
+ * 变电站id集合
+ */
+ @ApiModelProperty(name = "powerIds",value = "变电站id集合")
+ @NotNull(message = "变电站id集合不可为空")
+ private List powerIds;
+
+ /**
+ * 变电站名称
+ */
+ @ApiModelProperty(name = "powerName",value = "变电站名称")
+ private String powerName;
+
+ /**
+ * 变电站电压等级
+ */
+ @ApiModelProperty(name = "powerVoltageLevel",value = "变电站电压等级")
+ private List powerVoltageLevel;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
new file mode 100644
index 000000000..a49232c48
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
@@ -0,0 +1,78 @@
+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;
+
+/**
+ * @author hany
+ * @since 2022-10-27
+ */
+@Data
+public class PmsTerminalParam {
+
+ @ApiModelProperty(name = "id",value = "终端编号")
+ private String id;
+
+ @ApiModelProperty(name = "Name", value = "终端名称")
+ private String Name;
+
+ @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+ private String OrgName;
+
+ @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+ private String OrgId;
+
+ @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+ private String OperationName;
+
+ @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+ private String OperationId;
+
+ @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+ private String PowerrName;
+
+ @ApiModelProperty(name = "PowerStationId", value = "所属电站ID")
+ private String PowerStationId;
+
+ @ApiModelProperty(name = "TerminalState", value = "终端状态")
+ private String TerminalState;
+
+ @ApiModelProperty(name = "TerminalLevel", value = "终端级别")
+ private String TerminalLevel;
+
+ @ApiModelProperty(name = "DeviceModel", value = "装置型号")
+ private String DeviceModel;
+
+ @ApiModelProperty(name = "Manufacture", value = "生产厂家")
+ private String Manufacture;
+
+ @ApiModelProperty(name = "VerificationDate", value = "检定日期")
+ private String VerificationDate;
+
+ @ApiModelProperty(name = "UseDate", value = "投用日期")
+ private String UseDate;
+
+ @ApiModelProperty(name = "InputType", value = "测量信号输入形式")
+ private String InputType;
+
+ @ApiModelProperty(name = "Ip", value = "IP地址")
+ private String Ip;
+
+ @ApiModelProperty(name = "Port", value = "通信端口")
+ private String Port;
+
+ @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer IsUpToGrid;
+
+ /**
+ * 查询数据实体
+ */
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class QueryParam extends BaseParam {
+
+ private Integer Status;
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java
new file mode 100644
index 000000000..61eb8f73d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java
@@ -0,0 +1,200 @@
+package com.njcn.device.pms.pojo.param;
+
+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.time.LocalDate;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/27
+ */
+@Data
+public class PowerClientParam {
+
+ /**
+ * 用户编号
+ */
+ @ApiModelProperty(value = "用户编号",required = true)
+ @NotBlank(message = "用户编号不可为空")
+ private String id;
+
+ /**
+ * 用户名称
+ */
+ @ApiModelProperty(value = "用户名称",required = true)
+ @NotBlank(message = "用户名称不可为空")
+ private String name;
+
+
+ /**
+ * 组织机构ID(外键)
+ */
+ @ApiModelProperty(value = " 组织机构ID(外键)",required = true)
+ @NotBlank(message = "组织机构ID不可为空")
+ private String orgId;
+
+
+
+ /**
+ * 运维单位ID(外键)
+ */
+ @ApiModelProperty(value = "运维单位ID(外键)",required = true)
+ @NotBlank(message = "运维单位ID不可为空")
+ private String operationId;
+
+ /**
+ * 用户分类(字典)
+ */
+ @ApiModelProperty(value = "用户分类(字典)",required = true)
+ @NotBlank(message = "用户分类不可为空")
+ private String userType;
+
+ /**
+ * 行业分类(字典)
+ */
+ @ApiModelProperty(value = "行业分类(字典)",required = true)
+ @NotBlank(message = "行业分类不可为空")
+ private String industryType;
+
+ /**
+ * 用电类别(字典)
+ */
+ @ApiModelProperty(value = "用电类别(字典)",required = true)
+ @NotBlank(message = "用电类别不可为空")
+ private String electricityType;
+
+ /**
+ * 合同容量
+ */
+ @ApiModelProperty(value = "合同容量",required = true)
+ @NotBlank(message = "合同容量不可为空")
+ private Float contractCapacity;
+
+ /**
+ * 运行容量
+ */
+ @ApiModelProperty(value = "运行容量",required = true)
+ @NotBlank(message = "运行容量不可为空")
+ private Float operatingCapacity;
+
+ /**
+ * 生产班次(字典)
+ */
+ @ApiModelProperty(value = "生产班次(字典)",required = true)
+ @NotBlank(message = "生产班次不可为空")
+ private String productionShift;
+
+ /**
+ * 负荷性质(字典)
+ */
+ @ApiModelProperty(value = "负荷性质(字典)",required = true)
+ @NotBlank(message = "负荷性质不可为空")
+ private String loadNature;
+
+ /**
+ * 供电电压(字典)
+ */
+ @ApiModelProperty(value = "供电电压(字典)",required = true)
+ @NotBlank(message = "供电电压不可为空")
+ private String voltageLevel;
+
+ /**
+ * 高耗能行业类别(字典)
+ */
+ @ApiModelProperty(value = "高耗能行业类别(字典)",required = true)
+ @NotBlank(message = "高耗能行业类别不可为空")
+ private String highIndustryType;
+
+ /**
+ * 送电日期
+ */
+ @ApiModelProperty(value = "送电日期",required = true)
+ @NotNull(message = "送电日期不可为空")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDate powerTransmissionDate;
+
+ /**
+ * 重要性等级(字典)
+ */
+ @ApiModelProperty(value = "重要性等级",required = true)
+ @NotBlank(message = "重要性等级不可为空")
+ private String importanceLevel;
+
+ /**
+ * 用电客户状态(字典)
+ */
+ @ApiModelProperty(value = "用电客户状态",required = true)
+ @NotBlank(message = "用电客户状态不可为空")
+ private String eccStat;
+
+ /**
+ * 是否敏感用户:0-否;1:是;
+ */
+ @ApiModelProperty(value = "是否敏感用户",required = true)
+ @NotNull(message = "用户编号不可为空")
+ private Integer ifSensitiveUser;
+
+ /**
+ * 是否影响电能质量:0-否;1:是;
+ */
+ @ApiModelProperty(value = "是否影响电能质量:0-否;1:是;",required = true)
+ @NotBlank(message = "是否影响电能质量不可为空")
+ private Integer ifPowerQuality;
+
+ /**
+ * 是否重要客户:0-否;1:是;
+ */
+ @ApiModelProperty(value = "是否重要客户:0-否;1:是;",required = true)
+ @NotBlank(message = "是否重要客户不可为空")
+ private Integer ifKeyCustomers;
+
+ /**
+ * 敏感用户类别(字典)
+ */
+ @ApiModelProperty(value = "敏感用户类别",required = true)
+ @NotBlank(message = "敏感用户类别不可为空")
+ private String sensitiveType;
+
+ /**
+ * 供电变电站(外键)
+ */
+ @ApiModelProperty(value = "供电变电站",required = true)
+ @NotBlank(message = "供电变电站不可为空")
+ private String powerStationId;
+
+ /**
+ * 供电线路(外键)
+ */
+ @ApiModelProperty(value = "供电线路",required = true)
+ @NotBlank(message = "供电线路不可为空")
+ private String lineId;
+
+ /**
+ * 供电台区(外键)
+ */
+ @ApiModelProperty(value = "供电台区",required = true)
+ @NotBlank(message = "供电台区不可为空")
+ private String platformId;
+
+ /**
+ * 用户标签
+ */
+ @ApiModelProperty(value = "用户标签",required = true)
+ @NotBlank(message = "用户标签不可为空")
+ private String userTag;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ @ApiModelProperty(value = "是否是上送国网监测点,0-否 1-是",required = true)
+ @NotNull(message = "是否是上送国网监测点不可为空")
+ private Integer isUpToGrid;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
new file mode 100644
index 000000000..ca4db1313
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
@@ -0,0 +1,90 @@
+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;
+
+/**
+ * @author hany
+ * @since 2022-10-26
+ */
+@Data
+public class PowerDistributionareaParam {
+
+ @ApiModelProperty("id")
+ private String id;
+
+ @ApiModelProperty(name = "Name", value = "台区名称")
+ private String Name;
+
+ @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+ private String OrgName;
+
+ @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+ private String OrgId;
+
+ @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+ private String OperationName;
+
+ @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+ private String OperationId;
+
+ @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+ private String PowerrName;
+
+ @ApiModelProperty(name = "PowerStationId", value = "电站ID")
+ private String PowerStationId;
+
+ @ApiModelProperty(name = "LineName", value = "监测线路名称")
+ private String LineName;
+
+ @ApiModelProperty(name = "LineId", value = "所属线路ID")
+ private String LineId;
+
+ @ApiModelProperty(name = "PCapacity", value = "配变容量")
+ private Float PCapacity;
+
+ @ApiModelProperty(name = "Regionalism", value = "地区特征")
+ private String Regionalism;
+
+ @ApiModelProperty(name = "IfRuralPowerGrid", value = "是否农网:0-否;1:是")
+ private Integer IfRuralPowerGrid;
+
+ @ApiModelProperty(name = "NatureOfUse", value = "使用性质")
+ private String NatureOfUse;
+
+ @ApiModelProperty(name = "PowerSupplyRadius", value = "供电半径")
+ private Float PowerSupplyRadius;
+
+ @ApiModelProperty(name = "LineLength", value = "供电线路总长度")
+ private Float LineLength;
+
+ @ApiModelProperty(name = "State", value = "运行状态")
+ private String State;
+
+ @ApiModelProperty(name = "DistributedPhotovoltaicNum", value = "分布式光伏用户数")
+ private Integer DistributedPhotovoltaicNum;
+
+ @ApiModelProperty(name = "PhotovoltaicCapacity", value = "分布式光伏总装机容量")
+ private Float PhotovoltaicCapacity;
+
+ @ApiModelProperty(name = "IfBevAp", value = "是否有电动汽车接入:0-否;1:是")
+ private Integer IfBevAp;
+
+ @ApiModelProperty(name = "ApLoadType", value = "接入负荷类型")
+ private String ApLoadType;
+
+ @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer IsUpToGrid;
+
+ /**
+ * 查询数据实体
+ */
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class QueryParam extends BaseParam {
+
+ private Integer Status;
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java
new file mode 100644
index 000000000..890742447
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerGenerationUserParam.java
@@ -0,0 +1,143 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/27
+ */
+@Data
+public class PowerGenerationUserParam {
+
+ /**
+ * 用户编号
+ */
+ @ApiModelProperty(value = "用户编号",required = true)
+ @NotBlank(message = "用户编号不可为空")
+ private String id;
+
+ /**
+ * 用户名称
+ */
+ @ApiModelProperty(value = "用户名称",required = true)
+ @NotBlank(message = "用户名称不可为空")
+ private String name;
+
+
+
+ /**
+ * 组织机构ID(外键)
+ */
+ @ApiModelProperty(value = "组织机构ID(外键)",required = true)
+ @NotBlank(message = "组织机构ID不可为空")
+ private String orgId;
+
+
+ /**
+ * 运维单位ID(外键)
+ */
+ @ApiModelProperty(value = "运维单位ID(外键)",required = true)
+ @NotBlank(message = "运维单位ID不可为空")
+ private String operationId;
+
+ /**
+ * 电源类别(字典)
+ */
+ @ApiModelProperty(value = "电源类别(字典)",required = true)
+ @NotBlank(message = "电源类别不可为空")
+ private String powerCategory;
+
+ /**
+ * 电站类型(字典)
+ */
+ @ApiModelProperty(value = "电站类型(字典)",required = true)
+ @NotBlank(message = "电站类型不可为空")
+ private String powerStationType;
+
+ /**
+ * 发电方式(字典)
+ */
+ @ApiModelProperty(value = "发电方式(字典)",required = true)
+ @NotBlank(message = "发电方式不可为空")
+ private String powerGenerationMode;
+
+ /**
+ * 并网电压等级(字典)
+ */
+ @ApiModelProperty(value = "并网电压等级(字典)",required = true)
+ @NotBlank(message = "并网电压等级不可为空")
+ private String voltageLevel;
+
+ /**
+ * 总装机容量
+ */
+ @ApiModelProperty(value = "总装机容量",required = true)
+ @NotBlank(message = "总装机容量不可为空")
+ private Float sourceCapacity;
+
+ /**
+ * 并网日期
+ */
+ @ApiModelProperty(value = "并网日期",required = true)
+ @NotBlank(message = "并网日期不可为空")
+ private LocalDate connectionDate;
+
+ /**
+ * 能源消纳方式(字典)
+ */
+ @ApiModelProperty(value = "能源消纳方式(字典)",required = true)
+ @NotBlank(message = "能源消纳方式不可为空")
+ private String connectionMode;
+
+ /**
+ * 客户状态(字典)
+ */
+ @ApiModelProperty(value = "客户状态(字典)",required = true)
+ @NotBlank(message = "客户状态不可为空")
+ private String gcStat;
+
+ /**
+ * 供电变电站(外键)
+ */
+ @ApiModelProperty(value = "供电变电站(外键)",required = true)
+ @NotBlank(message = "供电变电站不可为空")
+ private String powerStationId;
+
+ /**
+ * 供电线路(外键)
+ */
+ @ApiModelProperty(value = "供电线路(外键)",required = true)
+ @NotBlank(message = "供电线路不可为空")
+ private String lineId;
+
+ /**
+ * 供电台区(外键)
+ */
+ @ApiModelProperty(value = "供电台区(外键)",required = true)
+ @NotBlank(message = "供电台区不可为空")
+ private String platformId;
+
+ /**
+ * 用户标签
+ */
+ @ApiModelProperty(value = "用户标签",required = true)
+ @NotBlank(message = "用户标签不可为空")
+ private String userTag;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ @ApiModelProperty(value = "是否是上送国网监测点,0-否 1-是",required = true)
+ @NotNull(message = "是否是上送国网监测点不可为空")
+ private Integer isUpToGrid;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java
deleted file mode 100644
index 5149d5ff2..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-import java.time.LocalDate;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_device")
-public class PvDeviceParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 终端类型(电能质量监测终端、智能电表、智能融合终端),字典表
- */
- @ApiModelProperty(name = "type",value = "终端类型(电能质量监测终端、智能电表、智能融合终端),字典表",required = true)
- @NotBlank(message = "终端类型不可为空")
- private String type;
-
- @ApiModelProperty(name = "name",value = "装置名称",required = true)
- @NotBlank(message = "装置名称")
- private String name;
-
- /**
- * 用于保存PMS中电能质量监测终端Id、智能融合终端Id,智能电表Id
- */
- @ApiModelProperty(name = "devCode",value = "用于保存PMS中电能质量监测终端Id、智能融合终端Id,智能电表Id",required = true)
- @NotBlank(message = "终端Id不能为空")
- private String devCode;
-
- /**
- * 终端Ip
- */
- @ApiModelProperty(name = "ip",value = "终端Ip",required = true)
- @NotBlank(message = "终端Ip不能为空")
- private String ip;
-
- /**
- * 端口
- */
- @ApiModelProperty(name = "port",value = "端口",required = true)
- @NotNull(message = "端口不能为空")
- private Integer port;
-
- /**
- * 终端型号(570、580……)字典表
- */
- @ApiModelProperty(name = "devType",value = "终端型号(570、580……)字典表")
- private String devType;
-
- /**
- * 设备制造商,字典表
- */
- @ApiModelProperty(name = "manufacturer",value = "设备制造商,字典表",required = true)
- @NotBlank(message = "设备制造商不能为空")
- private String manufacturer;
-
- /**
- * 装置识别码(3ds加密)
- */
- @ApiModelProperty(name = "series",value = "装置识别码(3ds加密)")
- private String series;
-
- /**
- * 装置秘钥(3ds加密)
- */
- @ApiModelProperty(name = "devKey",value = "装置秘钥(3ds加密)")
- private String devKey;
-
-
- /**
- * 投运时间
- */
- @ApiModelProperty(name = "loadTime",value = "投运时间")
- @DateTimeStrValid(message = "投运时间格式错误")
- private LocalDate loadTime;
-
- /**
- * 装置通讯状态
- */
- @ApiModelProperty(name = "devStatus",value = "装置通讯状态")
- @NotNull(message = "装置通讯状态不能为空")
- @Range(min = 0,max = 1)
- private Integer devStatus;
-
-
- /**
- * 信号传输方式
- */
- @ApiModelProperty(name = "communicateType",value = "信号传输方式")
- private String communicateType;
-
- /**
- * 本次定检时间,默认等于投运时间
- */
- @ApiModelProperty(name = "thisTimeCheck",value = "本次定检时间,默认等于投运时间",required = true)
- @NotBlank(message = "本次定检时间不能为空")
- @DateTimeStrValid(message = "本次定检时间格式错误")
- private String thisTimeCheck;
-
- /**
- * 下次定检时间,默认为投运时间后推3年,假如时间小于3个月则为待检
- */
- @ApiModelProperty(name = "nextTimeCheck",value = "下次定检时间,默认为投运时间后推3年,假如时间小于3个月则为待检",required = true)
- @NotBlank(message = "下次定检时间不能为空")
- @DateTimeStrValid(message = "下次定检时间格式错误")
- private String nextTimeCheck;
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvDeviceParam extends PvDeviceParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java
deleted file mode 100644
index 70b6b9b0e..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("pv_dispatch")
-public class PvDispatchParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 调度表Id
- */
- private String id;
-
- /**
- * 调度名称
- */
- private String name;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java
deleted file mode 100644
index e50136835..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-06
- */
-@Data
-public class PvDistributedParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 分布式光伏名称
- */
- @ApiModelProperty(name = "name",value = "分布式光伏名称",required = true)
- @NotBlank(message = "分布式光伏名称不可为空")
- private String name;
-
- /**
- * 分布式光伏编号
- */
- @ApiModelProperty(name = "code",value = "分布式光伏编号",required = true)
- @NotBlank(message = "分布式光伏编号不可为空")
- private String code;
-
- /**
- * 用户编号(与低压用户台账表低压用户编号字段一致)
- */
- @ApiModelProperty(name = "userCode",value = "用户编号",required = true)
- @NotBlank(message = "用户编号不可为空")
- private String userCode;
-
- /**
- * 终端编号
- */
- @ApiModelProperty(name = "devCode",value = "终端编号")
- private String devCode;
-
- /**
- * 并网电压等级Id,字典表
- */
- @ApiModelProperty(name = "scale",value = "并网电压等级Id,字典表")
- private String scale;
-
- /**
- * 装机容量(KVA)
- */
- @ApiModelProperty(name = "machineCapacity",value = "装机容量(KVA)")
- private Float machineCapacity;
-
- /**
- * 上网方式
- */
- @ApiModelProperty(name = "inteType",value = "上网方式")
- private String inteType;
-
- /**
- * 接入相别
- */
- @ApiModelProperty(name = "phase",value = "接入相别")
- private String phase;
-
- /**
- * 储能配置容量(KVA)
- */
- @ApiModelProperty(name = "energyCapacity",value = "储能配置容量(KVA)")
- private Float energyCapacity;
-
- @ApiModelProperty(name = "smartSwitch",value = "智能开关编号")
- private String smartSwitch;
-
- @ApiModelProperty(name = "installTime",value = "安装时间")
- private String installTime;
-
- @ApiModelProperty(name = "runTime",value = "投运时间")
- private String runTime;
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvDistributedParam extends PvDistributedParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java
deleted file mode 100644
index 1c2c0e8f7..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvLineDetailParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 监测点名称
- */
- @ApiModelProperty(name = "name",value = "监测点名称",required = true)
- @NotBlank(message = "监测点名称不能为空")
- private String name;
-
- /**
- * 监测点编号
- */
- @ApiModelProperty(name = "code",value = "监测点编号",required = true)
- @NotBlank(message = "监测点编号不能为空")
- private String code;
-
- /**
- * 所属终端
- */
- @ApiModelProperty(name = "devId",value = "所属终端",required = true)
- @NotBlank(message = "所属终端id不能为空")
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "所属终端id违规")
- private String devId;
-
- /**
- * 监测点类型(I类监测点、II类监测点、III类监测点),字典表
- */
- @ApiModelProperty(name = "type",value = "监测点类型(I类监测点、II类监测点、III类监测点),字典表",required = true)
- @NotBlank(message = "监测点类型不能为空")
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "监测点类型违规")
- private String type;
-
- /**
- * 所属变电站(I类监测点)
- */
- @ApiModelProperty(name = "substationId",value = "所属变电站(I类监测点)")
- private String substationId;
-
- /**
- * 所属母线名称(I类监测点)
- */
- @ApiModelProperty(name = "voltageId",value = "所属母线名称(I类监测点)")
- private String voltageId;
-
- /**
- * 所属台区ID(II类监测点)
- */
- @ApiModelProperty(name = "subAreaId",value = "所属台区ID(II类监测点)")
- private String subAreaId;
-
- /**
- * 用户编号
- */
- @ApiModelProperty(name = "userCode",value = "用户编号")
- @NotBlank(message = "用户编号不能为空")
- private String userCode;
-
- @ApiModelProperty(name = "userCodeType",value = "用户编号区分 0.分布式 1.低压用户")
- @NotNull(message = "用户编号标识")
- private Integer userCodeType;
-
-
- /**
- * 电压等级
- */
- @ApiModelProperty(name = "scale",value = "电压等级")
- private String scale;
-
- /**
- * 线路号(在同一台设备中的监测点号)
- */
- @ApiModelProperty(name = "num",value = "线路号(在同一台设备中的监测点号)")
- private Integer num;
-
- /**
- * PT一次变比
- */
- @ApiModelProperty(name = "pt1",value = "PT一次变比")
- private Float pt1;
-
- /**
- * PT二次变比
- */
- @ApiModelProperty(name = "pt2",value = "PT二次变比")
- private Float pt2;
-
- /**
- * CT一次变比
- */
- @ApiModelProperty(name = "ct1",value = "CT一次变比")
- private Float ct1;
-
- /**
- * CT二次变比
- */
- @ApiModelProperty(name = "ct2",value = "CT二次变比")
- private Float ct2;
-
- /**
- * 设备容量
- */
- @ApiModelProperty(name = "devCapacity",value = "设备容量")
- private Float devCapacity;
-
- /**
- * 短路容量
- */
- @ApiModelProperty(name = "shortCapacity",value = "短路容量")
- private Float shortCapacity;
-
- /**
- * 基准容量
- */
- @ApiModelProperty(name = "standardCapacity",value = "基准容量")
- private Float standardCapacity;
-
- /**
- * 协议容量
- */
- @ApiModelProperty(name = "dealCapacity",value = "协议容量")
- private Float dealCapacity;
-
- /**
- * 接线类型字典表
- */
- @ApiModelProperty(name = "ptType",value = "接线类型字典表")
- private String ptType;
-
- /**
- * 测量间隔(1-10分钟)
- */
- @ApiModelProperty(name = "timeInterval",value = "测量间隔(1-10分钟)")
- private Integer timeInterval;
-
- /**
- * 干扰源类型,字典表
- */
- @ApiModelProperty(name = "loadType",value = "干扰源类型,字典表")
- private String loadType;
-
- /**
- * 行业类型,字典表
- */
-
- @ApiModelProperty(name = "businessType",value = "行业类型,字典表")
- private String businessType;
-
- /**
- * 网公司谐波监测平台标志(0-否;1-是),默认否
- */
- @ApiModelProperty(name = "monitorFlag",value = "网公司谐波监测平台标志(0-否;1-是),默认否")
- private Integer monitorFlag;
-
- /**
- * 电网标志(0-电网侧;1-非电网侧)
- */
- @ApiModelProperty(name = "powerFlag",value = "电网标志(0-电网侧;1-非电网侧)")
- private Integer powerFlag;
-
- /**
- * 国网谐波监测平台监测点号
- */
- @ApiModelProperty(name = "monitorId",value = "国网谐波监测平台监测点号")
- private String monitorId;
-
- /**
- * 监测点对象名称
- */
- @ApiModelProperty(name = "objName",value = "监测点对象名称")
- private String objName;
-
- /**
- * 监测点对象大类
- */
- @ApiModelProperty(name = "smallName",value = "监测点对象大类")
- private String smallName;
-
- /**
- * 监测点对象小类
- */
- @ApiModelProperty(name = "bigName",value = "监测点对象小类")
- private String bigName;
-
- /**
- * 人为干预是否参与统计(0:不参与,1:参与)默认参与统计
- */
- @ApiModelProperty(name = "statFlag",value = "人为干预是否参与统计(0:不参与,1:参与)默认参与统计")
- private Integer statFlag = 1;
-
- /**
- * 备注
- */
- @ApiModelProperty(name = "remark",value = "备注")
- private String remark;
-
- /**
- * 电压互感器类型,字典表
- */
- @ApiModelProperty(name = "tfType",value = "电压互感器类型,字典表")
- private String tfType;
-
- /**
- * 所属变压器编号
- */
- @ApiModelProperty(name = "tfCode",value = "所属变压器编号")
- private String tfCode;
-
- /**
- * 中性点接地方式,字典表
- */
- @ApiModelProperty(name = "groundType",value = "中性点接地方式,字典表")
- private String groundType;
-
- /**
- * 投运日期
- */
- @ApiModelProperty(name = "putIn",value = "投运日期")
- @DateTimeStrValid(message = "投运日期格式有误")
- private String putIn;
-
- /**
- * 接入日期
- */
- @ApiModelProperty(name = "access",value = "接入日期")
- @DateTimeStrValid(message = "接入日期格式有误")
- private String access;
-
- /**
- * 是否专项供电(0:否,1:是)默认参与统计
- */
- @ApiModelProperty(name = "powerSupply",value = "是否专项供电(0:否,1:是)默认参与统计")
- private Integer powerSupply;
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvLineDetailParam extends PvLineDetailParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java
deleted file mode 100644
index 7acb323a5..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvLvUserParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 低压用户编号(营销系统中查出)
- */
- @ApiModelProperty(name = "userCode",value = "低压用户编号")
- @NotBlank(message = "低压用户编号不为空")
- private String userCode;
-
- /**
- * 低压用户名称
- */
- @ApiModelProperty(name = "name",value = "低压用户名称")
- @NotBlank(message = "低压用户名称不为空")
- private String name;
-
- /**
- * 用户协议容量(kVA)
- */
- @ApiModelProperty(name = "userCapacity",value = "用户协议容量")
- private Float userCapacity;
-
- /**
- * 是否发生过投诉
- */
- @ApiModelProperty(name = "complain",value = "是否发生过投诉")
- private Integer complain;
-
- /**
- * 投诉内容
- */
- @ApiModelProperty(name = "complainPart",value = "投诉内容")
- private String complainPart;
-
- /**
- * 整改措施
- */
- @ApiModelProperty(name = "corrective",value = "整改措施")
- private String corrective;
-
- /**
- * 是否有治理装置
- */
- @ApiModelProperty(name = "devGovern",value = "是否有治理装置")
- private Integer devGovern;
-
- /**
- * 治理装置类型
- */
- @ApiModelProperty(name = "governType",value = "治理装置类型")
- private String governType;
-
- /**
- * 治理装置电压等级
- */
- @ApiModelProperty(name = "scale",value = "治理装置电压等级")
- private String scale;
-
- /**
- * 治理装置容量
- */
- @ApiModelProperty(name = "governCapacity",value = "治理装置容量")
- private Float governCapacity;
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvLvUserParam extends PvLvUserParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java
deleted file mode 100644
index 9d01e45cc..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvSubAreaParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
-
- /**
- * 所属10kV线路表Id(外键)
- */
- @ApiModelProperty(name = "tenVoltageId",value = "所属10kV线路表Id",required = true)
- @NotBlank(message = "所属10kV线路表Id不可为空")
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "所属10kV线路表Id格式有误")
- private String tenVoltageId;
-
- /**
- * 所属单位Id(台区所属的单位和变电站所属单位可能不是一个单位)
- */
- @ApiModelProperty(name = "unitId",value = "所属单位Id",required = true)
- @NotBlank(message = "所属单位Id不可为空")
- private String unitId;
-
- /**
- * 台区名称
- */
- @ApiModelProperty(name = "name",value = "台区名称",required = true)
- @NotBlank(message = "台区名称不可为空")
- private String name;
-
- /**
- * 台区编号
- */
- @ApiModelProperty(name = "code",value = "台区编号",required = true)
- @NotBlank(message = "台区编号不可为空")
- private String code;
-
- /**
- * 电缆长度字段
- */
- @ApiModelProperty(name = "cableLength",value = "电缆长度字段")
- private Double cableLength;
-
- /**
- * 电阻
- */
- @ApiModelProperty(name = "resistance",value = "电阻")
- private Double resistance;
-
- /**
- * 电抗
- */
- @ApiModelProperty(name = "reactance",value = "电抗")
- private Double reactance;
-
- /**
- * 变压器型号
- */
- @ApiModelProperty(name = "type",value = "变压器型号")
- private String type;
-
- /**
- * 变压器容量
- */
- @ApiModelProperty(name = "capacity",value = "变压器容量")
- private Float capacity;
-
- /**
- * 变压器调压方式
- */
- @ApiModelProperty(name = "regulationMode",value = "变压器调压方式")
- private Integer regulationMode;
-
- /**
- * 台区无功补偿容量(KVA)
- */
- @ApiModelProperty(name = "reactCapacity",value = "台区无功补偿容量(KVA)")
- private Float reactCapacity;
-
- /**
- * 是否安装智能融合终端
- */
- @ApiModelProperty(name = "devFusion",value = "是否安装智能融合终端")
- private Integer devFusion;
-
- /**
- * 是否有分布式光伏接入
- */
- @ApiModelProperty(name = "pv",value = "是否有分布式光伏接入")
- private Integer pv;
-
- /**
- * 分布式光伏总装机容量(KVA)
- */
- @ApiModelProperty(name = "totalC",value = "分布式光伏总装机容量(KVA)")
- private Float totalC;
-
- /**
- * 分布式光伏用户数量
- */
- @ApiModelProperty(name = "pvUsers",value = "分布式光伏用户数量")
- private Integer pvUsers;
-
- /**
- * 其他分布式电源装置容量
- */
- @ApiModelProperty(name = "powerPower",value = "其他分布式电源装置容量")
- private Float powerPower;
-
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvSubAreaParam extends PvSubAreaParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java
deleted file mode 100644
index 6d6cfee88..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvSubstationParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
-
- /**
- * 所属单位Id
- */
- @ApiModelProperty(name = "unitId",value = "所属单位Id",required = true)
- @NotBlank(message = "所属单位Id不能为空")
- private String unitId;
-
- /**
- * 变电站名称
- */
- @ApiModelProperty(name = "name",value = "变电站名称",required = true)
- @NotBlank(message = "变电站名称不能为空")
- private String name;
-
- @ApiModelProperty(name = "subCode",value = "变电站编号",required = true)
- @NotBlank(message = "变电站编号不能为空")
- private String subCode;
-
- /**
- * 电压等级Id,字典表
- */
- @ApiModelProperty(name = "scale",value = "电压等级Id",required = true)
- @NotBlank(message = "电压等级不能为空")
- private String scale;
-
- /**
- * 变电站总容量(MVA)(手动填写)
- */
- @ApiModelProperty(name = "totalCapacity",value = "变电站总容量",required = true)
- @NotNull(message = "变电站总容量不能为空")
- private Double totalCapacity;
-
- /**
- * 运维班组Code
- */
- @ApiModelProperty(name = "teamCode",value = "运维班组Code",required = true)
- @NotBlank(message = "运维班组Code不能为空")
- private String teamCode;
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvSubstationParam extends PvSubstationParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java
deleted file mode 100644
index 2b7d592c4..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import com.njcn.web.pojo.annotation.DateTimeStrValid;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvTenVoltageParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
-
- /**
- * 调度表Id(外键)
- */
- @ApiModelProperty(name = "dispatchId",value = "调度表Id",required = true)
- @NotBlank(message = "调度表Id不能为空")
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = "id格式违规")
- private String dispatchId;
-
-
- /**
- * 线路名称
- */
- @ApiModelProperty(name = "name",value = "线路名称",required = true)
- @NotBlank(message = "线路名称不能为空")
- private String name;
-
- /**
- * 线路编号
- */
- @ApiModelProperty(name = "code",value = "线路编号",required = true)
- @NotBlank(message = "线路编号不能为空")
- private String code;
-
- /**
- * 跨区域类型
- */
- @ApiModelProperty(name = "crType",value = "跨区域类型")
- private String crType;
-
- /**
- * 电压等级Id,字典表
- */
- @ApiModelProperty(name = "scale",value = "电压等级Id,字典表")
- private String scale;
-
- /**
- * 设计电压等级Id,字典表
- */
- @ApiModelProperty(name = "designScale",value = "设计电压等级Id,字典表")
- private String designScale;
-
- /**
- * 设备状态
- */
- @ApiModelProperty(name = "devStatus",value = "设备状态")
- private Integer devStatus;
-
- /**
- * 是否接地极(0:false;1:true)
- */
- @ApiModelProperty(name = "earthing",value = "是否接地极(0:false;1:true)")
- private Boolean earthing;
-
- /**
- * 线路性质
- */
- @ApiModelProperty(name = "quality",value = "线路性质")
- private String quality;
-
- /**
- * 所属主线
- */
- @ApiModelProperty(name = "masterStroke",value = "所属主线")
- private String masterStroke;
-
- /**
- * 专业分类
- */
- @ApiModelProperty(name = "major",value = "专业分类")
- private String major;
-
- /**
- * 设备主人
- */
- @ApiModelProperty(name = "master",value = "设备主人")
- private String master;
-
- /**
- * 起点电站
- */
- @ApiModelProperty(name = "startStation",value = "起点电站")
- private String startStation;
-
- /**
- * 终点电站
- */
- @ApiModelProperty(name = "endStation",value = "终点电站")
- private String endStation;
-
- /**
- * 运行负载限额
- */
- @ApiModelProperty(name = "runLoad",value = "运行负载限额")
- private Float runLoad;
-
- /**
- * 额定输出功率
- */
- @ApiModelProperty(name = "outputPower",value = "额定输出功率")
- private Float outputPower;
-
- /**
- * 最大允许电流
- */
- @ApiModelProperty(name = "maxCurrent",value = "最大允许电流")
- private Float maxCurrent;
-
- /**
- * 投运日期
- */
- @ApiModelProperty(name = "putIntoDate",value = "投运日期")
- @DateTimeStrValid(message = "投运时间格式错误",format = "yyyy-MM-dd HH:mm:ss")
- private String putIntoDate;
-
-
- /**
- * 是否有分布式光伏接入
- */
- @ApiModelProperty(name = "pvStatus",value = "是否有分布式光伏接入 0.否 1.是")
- private Integer pvStatus;
-
-
- /**
- * 分布式光伏接入容量
- */
- @ApiModelProperty(name = "pvCapacity",value = "分布式光伏接入容量")
- private Integer pvCapacity;
-
-
- /**
- * 分布式光伏接入数量
- */
- @ApiModelProperty(name = "pvNum",value = "分布式光伏接入数量")
- private Integer pvNum;
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvTenVoltageParam extends PvTenVoltageParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java
deleted file mode 100644
index bff311a16..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvTerminalBaseQuery extends BaseParam {
-
- @ApiModelProperty(name = "id",value = "单位变电站台区索引",required = true)
- @NotEmpty(message = "单位变电站台区索引不能为空")
- private String id;
-
- @ApiModelProperty(name = "level",value = "0.单位 1.变电站 2.台区",required = true)
- @NotNull(message = "树层级不可为空")
- private Integer level;
-
- @ApiModelProperty(name = "type",value = "字典类型 I II III类监测点类型id")
- private String type;
-
- @ApiModelProperty(name = "lineStatus",value = "监测点状态")
- private Integer lineStatus;
-
- @ApiModelProperty(name = "runTime",value = "投运时间")
- private Integer runTime;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java
deleted file mode 100644
index be7da54b8..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvUnitParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
-
- /**
- * 父节点(0为根节点)
- */
- @ApiModelProperty(name = "pid",value = "父节点(0为根节点)")
- @NotBlank(message = "父节点id不能为空")
- private String pid;
-
- /**
- * 单位名称
- */
- @ApiModelProperty(name = "name",value = "单位名称")
- @NotBlank(message = "单位名称不能为空")
- private String name;
-
- /**
- * 单位编码
- */
- @ApiModelProperty(name = "code",value = "单位编码")
- @NotBlank(message = "单位编码不能为空")
- private String code;
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvUnitParam extends PvUnitParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java
deleted file mode 100644
index 83149e73c..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.njcn.device.pms.pojo.param;
-
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-public class PvVoltageParam implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- /**
- * 母线名称
- */
- @ApiModelProperty(value = "母线名称",required = true)
- @NotBlank(message = "母线名称不可为空")
- private String name;
-
- /**
- * 母线号(在同一台设备中的电压通道号)
- */
- @ApiModelProperty(value = "母线号(在同一台设备中的电压通道号)",required = true)
- @NotNull(message = "母线号不可为空")
- @Range(min = 1,max = 6,message = "选择1-6路母线号线路")
- private Integer num;
-
- /**
- * 电压等级Id,字典表
- */
- @ApiModelProperty(value = "电压等级Id,字典表",required = true)
- @NotBlank(message = "电压等级不可为空")
- private String scale;
-
-
-
- @Data
- @EqualsAndHashCode(callSuper = true)
- public static class UpdatePvVoltageParam extends PvVoltageParam{
- /**
- * id
- */
- @ApiModelProperty("id")
- @NotBlank(message = ValidMessage.ID_NOT_BLANK)
- @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
- private String id;
- }
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java
new file mode 100644
index 000000000..4450cf1df
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java
@@ -0,0 +1,36 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/27
+ */
+
+@Data
+public class PwPmsMonitorParam {
+
+ @ApiModelProperty(name = "orgIds", value = "部门id",required = true)
+ @NotBlank(message = "部门索引不可为空")
+ private String orgId;
+
+ @ApiModelProperty(name = "monitorName",value = "监测点名称")
+ private String monitorName;
+
+ @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+ private List voltageLevels;
+
+ @ApiModelProperty(name = "monitorSort",value = "监测点类别(字典)")
+ private List monitorSort;
+
+ @ApiModelProperty(name = "monitorState",value = "监测点状态")
+ private List monitorState;
+
+ @ApiModelProperty(name = "ifPowerUser",value = "是否发电用户:0-否;1-是")
+ private String ifPowerUser;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java
new file mode 100644
index 000000000..abb98fd91
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RMpMonitorAlarmCountMParam.java
@@ -0,0 +1,26 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Title RMpMonitorAlarmCountMParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-13 08:58
+ * @Version V1.0
+ */
+@Data
+public class RMpMonitorAlarmCountMParam extends StatisticsBizBaseParam {
+
+ @ApiModelProperty(name = "voltage_Level", value = "电压等级id")
+ private String voltageLevel; //电压等级
+
+ @ApiModelProperty(name = "monitorObjectType", value = "监测点对象类型id")
+ private String monitorObjectType;
+
+ @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+ private String measurementPointName;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java
new file mode 100644
index 000000000..1938bffb8
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatAreaAlarmCountMParam.java
@@ -0,0 +1,15 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import lombok.Data;
+
+/**
+ * @Title RStatAreaAlarmCountMParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-10 15:17
+ * @Version V1.0
+ */
+@Data
+public class RStatAreaAlarmCountMParam extends StatisticsBizBaseParam {
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java
new file mode 100644
index 000000000..9ad46c990
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java
@@ -0,0 +1,23 @@
+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;
+
+/**
+ * 告警统计(周)查询参数实体
+ * @TableName r_stat_zw_alarm_count_w
+ */
+@Data
+public class RStatZwAlarmCountWParam extends StatisticsBizBaseParam {
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java
new file mode 100644
index 000000000..d4eec4cb2
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java
@@ -0,0 +1,51 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * pms-device
+ *
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+public class StatationStatParam {
+
+ /**
+ * 电站编号
+ */
+ @ApiModelProperty(value = "电站编号",required = true)
+ @NotBlank(message = "电站编号不可为空")
+ private String powerId;
+
+ /**
+ * 电站编号
+ */
+ @ApiModelProperty(value = "电站名称",required = true)
+ @NotBlank(message = "电站名称不可为空")
+ private String powerName;
+
+
+ @ApiModelProperty(value = "单位组织id",required = true)
+ @NotBlank(message = "单位组织id不可为空")
+ private String orgId;
+
+ /**
+ * 应设点数量
+ */
+ @ApiModelProperty(value = "应设点数量",required = true)
+ @NotNull(message = "应设点数量不可为空")
+ private Integer shouldBeNum;
+
+ /**
+ * 电压等级(字典)
+ */
+ @ApiModelProperty(value = "电压等级",required = true)
+ @NotBlank(message = "电压等级不可为空")
+ private String voltageLevel;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java
deleted file mode 100644
index c0660c536..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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 java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SubAreaQueryParam extends BaseParam {
-
- @ApiModelProperty("所属10kV线路id")
- private List tenVoltageId;
-
- @ApiModelProperty("所属单位id")
- private List unitId;
-
- @ApiModelProperty("台区名称")
- private String name;
-
- @ApiModelProperty("是否接入")
- private Boolean isJoin;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java
deleted file mode 100644
index 5933d9ecd..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java
+++ /dev/null
@@ -1,25 +0,0 @@
-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 java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/5
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SubstationQueryParam extends BaseParam {
-
- @ApiModelProperty(value = "单位id",name = "unitId")
- private List unitId;
-
- @ApiModelProperty(value = "电压等级",name = "scale")
- private List scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java
deleted file mode 100644
index 683023820..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java
+++ /dev/null
@@ -1,28 +0,0 @@
-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 java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/5
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class TenVoltageQueryParam extends BaseParam {
-
- @ApiModelProperty(name = "scale",value = "电压等级")
- private List scale;
-
- @ApiModelProperty(name = "designScale",value = "电压等级")
- private List designScale;
-
- @ApiModelProperty(name = "pvStatus",value = "是否有光伏接入")
- private Integer pvStatus;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java
new file mode 100644
index 000000000..b2db6bd16
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java
@@ -0,0 +1,74 @@
+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;
+
+@Data
+public class TractionStationParam {
+
+ @ApiModelProperty(name = "id",value = "牵引站编号")
+ private String id;
+
+ @ApiModelProperty(name = "Name", value = "牵引站名称")
+ private String Name;
+
+ @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+ private String OrgName;
+
+ @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+ private String OrgId;
+
+ @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+ private String OperationName;
+
+ @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+ private String OperationId;
+
+ @ApiModelProperty(name = "VoltageLevel", value = "供电电压等级")
+ private String VoltageLevel;
+
+ @ApiModelProperty(name = "RailwayLineId", value = "铁路线路编号")
+ private String RailwayLineId;
+
+ @ApiModelProperty(name = "RailwayLineName", value = "铁路线路名称")
+ private String RailwayLineName;
+
+ @ApiModelProperty(name = "ConnetGroupWay", value = "牵引站变压器接线方式")
+ private String ConnetGroupWay;
+
+ @ApiModelProperty(name = "RatedCapacity", value = "牵引站变电容量")
+ private Float RatedCapacity;
+
+ @ApiModelProperty(name = "PowerId", value = "供电变电站编号")
+ private String PowerId;
+
+ @ApiModelProperty(name = "PowerName", value = "供电变电站名称")
+ private String PowerName;
+
+ @ApiModelProperty(name = "PowerVoltageLevel", value = "供电变电站电压等级")
+ private String PowerVoltageLevel;
+
+ @ApiModelProperty(name = "IfSpecial", value = "是否专线供电:0-否;1-是;")
+ private Integer IfSpecial;
+
+ @ApiModelProperty(name = "CreatedDate", value = "创建日期")
+ private String CreatedDate;
+
+ @ApiModelProperty(name = "UserTag", value = "用户标签")
+ private String UserTag;
+
+ @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer IsUpToGrid;
+
+ /**
+ * 查询数据实体
+ */
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class QueryParam extends BaseParam {
+
+ private Integer Status;
+ }
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java
new file mode 100644
index 000000000..381d8cc89
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java
@@ -0,0 +1,58 @@
+package com.njcn.device.pms.pojo.param;
+
+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;
+
+/**
+ * 拓展前端参数
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UniversalFrontEndParam extends StatisticsBizBaseParam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 电压等级
+ */
+ @ApiModelProperty(name = "voltageLevel", value = "电压等级", required = true)
+ private List voltageLevel;
+
+ /**
+ * 监测点名称
+ */
+ @ApiModelProperty(name = "measurementPointId",value = "监测点名称")
+ private String measurementPointId;
+
+ /**
+ * 暂态指标类型
+ */
+ @ApiModelProperty(name = "typeOfTransientIndicators",value = "暂态指标类型")
+ private String typeOfTransientIndicators;
+
+ /**
+ * 监测点类别
+ */
+ @ApiModelProperty(name = "measurementPointCategory",value = "监测点类别")
+ private String measurementPointCategory;
+
+ /**
+ * 变电站名称
+ */
+ @ApiModelProperty(name = "subName",value = "变电站名称")
+ private String subName;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java
deleted file mode 100644
index e89491200..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/6
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class VoltageQueryParam extends BaseParam {
-
- @ApiModelProperty(value = "scale",name = "母线名称",required = true)
- private String name;
-
- @ApiModelProperty(value = "scale",name = "电压等级")
- private String scale;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
new file mode 100644
index 000000000..187c122b1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
@@ -0,0 +1,65 @@
+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;
+
+/**
+ *
+ * 配网监测点
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_distribution_monitor")
+public class DistributionMonitor extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测点类别(字典)
+ */
+ private String monitorSort;
+
+ /**
+ * 监测点ID
+ */
+ private String monitorId;
+
+ /**
+ * 电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 是否发电用户:0-否;1-是;
+ */
+ private Boolean ifPowerUser;
+
+ /**
+ * 监测点状态(字典)
+ */
+ private String monitorState;
+
+ /**
+ * 创建日期
+ */
+ private LocalDateTime createdDate;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Boolean status;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java
new file mode 100644
index 000000000..49ae2a8f6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java
@@ -0,0 +1,33 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import jdk.nashorn.internal.ir.IdentNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pms-device
+ * 母线
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_generatrix")
+public class Generatrix extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ private String generatrixId;
+
+ private String generatrixName;
+
+ private String statationId;
+
+ private String scale;
+
+ private Integer status;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
new file mode 100644
index 000000000..c1c0861d1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
@@ -0,0 +1,27 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pms-device
+ * 线路
+ * @author cdf
+ * @date 2022/10/26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_generatrix_wire")
+public class GeneratrixWire extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ private String wireId;
+
+ private String wireName;
+
+ private String generatrixId;
+
+ private Integer status;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java
new file mode 100644
index 000000000..511cf31c4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java
@@ -0,0 +1,104 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_harmonic_general_management")
+public class HarmonicGeneralManagement extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 普测计划编号
+ */
+ private String id;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+
+ /**
+ * 计划名称
+ */
+ private String plannedName;
+
+ /**
+ * 计划生成时间
+ */
+ private LocalDateTime plannedGenerationTime;
+
+ /**
+ * 计划开始时间
+ */
+ private LocalDateTime plannedStartTime;
+
+ /**
+ * 计划结束时间
+ */
+ private LocalDateTime plannedEndTime;
+
+ /**
+ * 实际完成时间
+ */
+ private LocalDateTime actualFinishTime;
+
+ /**
+ * 计划负责人(外键)
+ */
+ private String plannedUser;
+
+ /**
+ * 计划状态
+ */
+ private String plannedState;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Boolean status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java
new file mode 100644
index 000000000..804166464
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java
@@ -0,0 +1,876 @@
+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.Getter;
+import lombok.Setter;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_harmonic_general_management_data")
+public class HarmonicGeneralManagementData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String plannedId;
+
+ private String powerStationId;
+
+ private String powerStationName;
+
+ private String orgId;
+
+ private String devopsId;
+
+ private String powerrId;
+
+ private String monitorMxId;
+
+ private String intervalName;
+
+ private LocalDateTime generalStartTime;
+
+ private LocalDateTime generalEndTime;
+
+ private LocalDate monitorDataDate;
+
+ private LocalDate monitorDataUploadDate;
+
+ private String monitorFunctionary;
+
+ private Float frequencyMax;
+
+ private Float frequencyMin;
+
+ private Float frequencyAvg;
+
+ private Float frequency95;
+
+ private Float frequencyDeviationMax;
+
+ private Float frequencyDeviationMin;
+
+ private Float frequencyDeviationAvg;
+
+ private Float frequencyDeviation95;
+
+ private Float frequencyDeviationOverrunDuration;
+
+ private Float phaseVoltageEffectiveAMax;
+
+ private Float phaseVoltageEffectiveAMin;
+
+ private Float phaseVoltageEffectiveAAvg;
+
+ private Float phaseVoltageEffectiveA95;
+
+ private Float phaseVoltageEffectiveBMax;
+
+ private Float phaseVoltageEffectiveBMin;
+
+ private Float phaseVoltageEffectiveBAvg;
+
+ private Float phaseVoltageEffectiveB95;
+
+ private Float phaseVoltageEffectiveCMax;
+
+ private Float phaseVoltageEffectiveCMin;
+
+ private Float phaseVoltageEffectiveCAvg;
+
+ private Float phaseVoltageEffectiveC95;
+
+ private Float lineVoltageEffectiveAbMax;
+
+ private Float lineVoltageEffectiveAbMin;
+
+ private Float lineVoltageEffectiveAbAvg;
+
+ private Float lineVoltageEffectiveAb95;
+
+ private Float lineVoltageEffectiveBcMax;
+
+ private Float lineVoltageEffectiveBcMin;
+
+ private Float lineVoltageEffectiveBcAvg;
+
+ private Float lineVoltageEffectiveBc95;
+
+ private Float lineVoltageEffectiveAcMax;
+
+ private Float lineVoltageEffectiveAcMin;
+
+ private Float lineVoltageEffectiveAcAvg;
+
+ private Float lineVoltageEffectiveAc95;
+
+ private Float vDeUpAMax;
+
+ private Float vDeUpAMin;
+
+ private Float vDeUpAAvg;
+
+ private Float vDeUpA95;
+
+ private Float vDeUpBMax;
+
+ private Float vDeUpBMin;
+
+ private Float vDeUpBAvg;
+
+ private Float vDeUpB95;
+
+ private Float vDeUpCMax;
+
+ private Float vDeUpCMin;
+
+ private Float vDeUpCAvg;
+
+ private Float vDeUpC95;
+
+ private Float vDeLowAMax;
+
+ private Float vDeLowAMin;
+
+ private Float vDeLowAAvg;
+
+ private Float vDeLowA95;
+
+ private Float vDeLowBMax;
+
+ private Float vDeLowBMin;
+
+ private Float vDeLowBAvg;
+
+ private Float vDeLowB95;
+
+ private Float vDeLowCMax;
+
+ private Float vDeLowCMin;
+
+ private Float vDeLowCAvg;
+
+ private Float vDeLowC95;
+
+ private Float vDeOverrunDuration;
+
+ private Float currentEffectiveAMax;
+
+ private Float currentEffectiveAMin;
+
+ private Float currentEffectiveAAvg;
+
+ private Float currentEffectiveA95;
+
+ private Float currentEffectiveBMax;
+
+ private Float currentEffectiveBMin;
+
+ private Float currentEffectiveBAvg;
+
+ private Float currentEffectiveB95;
+
+ private Float currentEffectiveCMax;
+
+ private Float currentEffectiveCMin;
+
+ private Float currentEffectiveCAvg;
+
+ private Float currentEffectiveC95;
+
+ private Float spActivePowerAMax;
+
+ private Float spActivePowerAMin;
+
+ private Float spActivePowerAAvg;
+
+ private Float spActivePowerA95;
+
+ private Float spActivePowerBMax;
+
+ private Float spActivePowerBMin;
+
+ private Float spActivePowerBAvg;
+
+ private Float spActivePowerB95;
+
+ private Float spActivePowerCMax;
+
+ private Float spActivePowerCMin;
+
+ private Float spActivePowerCAvg;
+
+ private Float spActivePowerC95;
+
+ private Float spReactivePowerAMax;
+
+ private Float spReactivePowerAMin;
+
+ private Float spReactivePowerAAvg;
+
+ private Float spReactivePowerA95;
+
+ private Float spReactivePowerBMax;
+
+ private Float spReactivePowerBMin;
+
+ private Float spReactivePowerBAvg;
+
+ private Float spReactivePowerB95;
+
+ private Float spReactivePowerCMax;
+
+ private Float spReactivePowerCMin;
+
+ private Float spReactivePowerCAvg;
+
+ private Float spReactivePowerC95;
+
+ private Float spApparentPowerAMax;
+
+ private Float spApparentPowerAMin;
+
+ private Float spApparentPowerAAvg;
+
+ private Float spApparentPowerA95;
+
+ private Float spApparentPowerBMax;
+
+ private Float spApparentPowerBMin;
+
+ private Float spApparentPowerBAvg;
+
+ private Float spApparentPowerB95;
+
+ private Float spApparentPowerCMax;
+
+ private Float spApparentPowerCMin;
+
+ private Float spApparentPowerCAvg;
+
+ private Float spApparentPowerC95;
+
+ private Float spPowerFactorAMax;
+
+ private Float spPowerFactorAMin;
+
+ private Float spPowerFactorAAvg;
+
+ private Float spPowerFactorA95;
+
+ private Float spPowerFactorBMax;
+
+ private Float spPowerFactorBMin;
+
+ private Float spPowerFactorBAvg;
+
+ private Float spPowerFactorB95;
+
+ private Float spPowerFactorCMax;
+
+ private Float spPowerFactorCMin;
+
+ private Float spPowerFactorCAvg;
+
+ private Float spPowerFactorC95;
+
+ private Float spFundamentalPowerFactorAMax;
+
+ private Float spFundamentalPowerFactorAMin;
+
+ private Float spFundamentalPowerFactorAAvg;
+
+ private Float spFundamentalPowerFactorA95;
+
+ private Float spFundamentalPowerFactorBMax;
+
+ private Float spFundamentalPowerFactorBMin;
+
+ private Float spFundamentalPowerFactorBAvg;
+
+ private Float spFundamentalPowerFactorB95;
+
+ private Float spFundamentalPowerFactorCMax;
+
+ private Float spFundamentalPowerFactorCMin;
+
+ private Float spFundamentalPowerFactorCAvg;
+
+ private Float spFundamentalPowerFactorC95;
+
+ private Float totalActivePowerMax;
+
+ private Float totalActivePowerMin;
+
+ private Float totalActivePowerAvg;
+
+ private Float totalActivePower95;
+
+ private Float totalReactivePowerMax;
+
+ private Float totalReactivePowerMin;
+
+ private Float totalReactivePowerAvg;
+
+ private Float totalReactivePower95;
+
+ private Float totalApparentPowerMax;
+
+ private Float totalApparentPowerMin;
+
+ private Float totalApparentPowerAvg;
+
+ private Float totalApparentPower95;
+
+ private Float tpPowerFactorMax;
+
+ private Float tpPowerFactorMin;
+
+ private Float tpPowerFactorAvg;
+
+ private Float tpPowerFactor95;
+
+ private Float fundamentalPowerFactorMax;
+
+ private Float fundamentalPowerFactorMin;
+
+ private Float fundamentalPowerFactorAvg;
+
+ private Float fundamentalPowerFactor95;
+
+ private Float voltageHarmonicWaveAMax;
+
+ private Float voltageHarmonicWaveAMin;
+
+ private Float voltageHarmonicWaveAAvg;
+
+ private Float voltageHarmonicWaveA95;
+
+ private Float voltageHarmonicWaveBMax;
+
+ private Float voltageHarmonicWaveBMin;
+
+ private Float voltageHarmonicWaveBAvg;
+
+ private Float voltageHarmonicWaveB95;
+
+ private Float voltageHarmonicWaveCMax;
+
+ private Float voltageHarmonicWaveCMin;
+
+ private Float voltageHarmonicWaveCAvg;
+
+ private Float voltageHarmonicWaveC95;
+
+ private Float fundamentalVoltageAMax;
+
+ private Float fundamentalVoltageAMin;
+
+ private Float fundamentalVoltageAAvg;
+
+ private Float fundamentalVoltageA95;
+
+ private Float fundamentalVoltageBMax;
+
+ private Float fundamentalVoltageBMin;
+
+ private Float fundamentalVoltageBAvg;
+
+ private Float fundamentalVoltageB95;
+
+ private Float fundamentalVoltageCMax;
+
+ private Float fundamentalVoltageCMin;
+
+ private Float fundamentalVoltageCAvg;
+
+ private Float fundamentalVoltageC95;
+
+ private Float harmonicVoltageContent2_50AMax;
+
+ private Float harmonicVoltageContent2_50AMin;
+
+ private Float harmonicVoltageContent2_50AAvg;
+
+ private Float harmonicVoltageContent2_50A95;
+
+ private Float harmonicVoltageContent2_50BMax;
+
+ private Float harmonicVoltageContent2_50BMin;
+
+ private Float harmonicVoltageContent2_50BAvg;
+
+ private Float harmonicVoltageContent2_50B95;
+
+ private Float harmonicVoltageContent2_50CMax;
+
+ private Float harmonicVoltageContent2_50CMin;
+
+ private Float harmonicVoltageContent2_50CAvg;
+
+ private Float harmonicVoltageContent2_50C95;
+
+ private Float centreHarmonicVoltageContent1_50AMax;
+
+ private Float centreHarmonicVoltageContent1_50AMin;
+
+ private Float centreHarmonicVoltageContent1_50AAvg;
+
+ private Float centreHarmonicVoltageContent1_50A95;
+
+ private Float centreHarmonicVoltageContent1_50BMax;
+
+ private Float centreHarmonicVoltageContent1_50BMin;
+
+ private Float centreHarmonicVoltageContent1_50BAvg;
+
+ private Float centreHarmonicVoltageContent1_50B95;
+
+ private Float centreHarmonicVoltageContent1_50CMax;
+
+ private Float centreHarmonicVoltageContent1_50CMin;
+
+ private Float centreHarmonicVoltageContent1_50CAvg;
+
+ private Float centreHarmonicVoltageContent1_50C95;
+
+ private Float fundamentalCurrentAMax;
+
+ private Float fundamentalCurrentAMin;
+
+ private Float fundamentalCurrentAAvg;
+
+ private Float fundamentalCurrentA95;
+
+ private Float fundamentalCurrentBMax;
+
+ private Float fundamentalCurrentBMin;
+
+ private Float fundamentalCurrentBAvg;
+
+ private Float fundamentalCurrentB95;
+
+ private Float fundamentalCurrentCMax;
+
+ private Float fundamentalCurrentCMin;
+
+ private Float fundamentalCurrentCAvg;
+
+ private Float fundamentalCurrentC95;
+
+ private Float harmonicCurrentEffective2_50AMax;
+
+ private Float harmonicCurrentEffective2_50AMin;
+
+ private Float harmonicCurrentEffective2_50AAvg;
+
+ private Float harmonicCurrentEffective2_50A95;
+
+ private Float harmonicCurrentEffective2_50BMax;
+
+ private Float harmonicCurrentEffective2_50BMin;
+
+ private Float harmonicCurrentEffective2_50BAvg;
+
+ private Float harmonicCurrentEffective2_50B95;
+
+ private Float harmonicCurrentEffective2_50CMax;
+
+ private Float harmonicCurrentEffective2_50CMin;
+
+ private Float harmonicCurrentEffective2_50CAvg;
+
+ private Float harmonicCurrentEffective2_50C95;
+
+ private Float simpleHarmonicCurrentEffective2_50AMax;
+
+ private Float simpleHarmonicCurrentEffective2_50AMin;
+
+ private Float simpleHarmonicCurrentEffective2_50AAvg;
+
+ private Float simpleHarmonicCurrentEffective2_50A95;
+
+ private Float simpleHarmonicCurrentEffective2_50BMax;
+
+ private Float simpleHarmonicCurrentEffective2_50BMin;
+
+ private Float simpleHarmonicCurrentEffective2_50BAvg;
+
+ private Float simpleHarmonicCurrentEffective2_50B95;
+
+ private Float simpleHarmonicCurrentEffective2_50CMax;
+
+ private Float simpleHarmonicCurrentEffective2_50CMin;
+
+ private Float simpleHarmonicCurrentEffective2_50CAvg;
+
+ private Float simpleHarmonicCurrentEffective2_50C95;
+
+ private Float harmonicActivePower2_50AMax;
+
+ private Float harmonicActivePower2_50AMin;
+
+ private Float harmonicActivePower2_50AAvg;
+
+ private Float harmonicActivePower2_50A95;
+
+ private Float harmonicActivePower2_50BMax;
+
+ private Float harmonicActivePower2_50BMin;
+
+ private Float harmonicActivePower2_50BAvg;
+
+ private Float harmonicActivePower2_50B95;
+
+ private Float harmonicActivePower2_50CMax;
+
+ private Float harmonicActivePower2_50CMin;
+
+ private Float harmonicActivePower2_50CAvg;
+
+ private Float harmonicActivePower2_50C95;
+
+ private Float positiveSequenceVoltageMax;
+
+ private Float positiveSequenceVoltageMin;
+
+ private Float positiveSequenceVoltageAvg;
+
+ private Float positiveSequenceVoltage95;
+
+ private Float negativeSequenceVoltageMax;
+
+ private Float negativeSequenceVoltageMin;
+
+ private Float negativeSequenceVoltageAvg;
+
+ private Float negativeSequenceVoltage95;
+
+ private Float zeroSequenceVoltageMax;
+
+ private Float zeroSequenceVoltageMin;
+
+ private Float zeroSequenceVoltageAvg;
+
+ private Float zeroSequenceVoltage95;
+
+ private Float negativeSequenceVoltageUnbalanceMax;
+
+ private Float negativeSequenceVoltageUnbalanceMin;
+
+ private Float negativeSequenceVoltageUnbalanceAvg;
+
+ private Float negativeSequenceVoltageUnbalance95;
+
+ private Float zeroSequenceVoltageUnbalanceMax;
+
+ private Float zeroSequenceVoltageUnbalanceMin;
+
+ private Float zeroSequenceVoltageUnbalanceAvg;
+
+ private Float zeroSequenceVoltageUnbalance95;
+
+ private Float positiveSequenceCurrentMax;
+
+ private Float positiveSequenceCurrentMin;
+
+ private Float positiveSequenceCurrentAvg;
+
+ private Float positiveSequenceCurrent95;
+
+ private Float negativeSequenceCurrentMax;
+
+ private Float negativeSequenceCurrentMin;
+
+ private Float negativeSequenceCurrentAvg;
+
+ private Float negativeSequenceCurrent95;
+
+ private Float zeroSequenceCurrentMax;
+
+ private Float zeroSequenceCurrentMin;
+
+ private Float zeroSequenceCurrentAvg;
+
+ private Float zeroSequenceCurrent95;
+
+ private Float negativeSequenceCurrentUnbalanceMax;
+
+ private Float negativeSequenceCurrentUnbalanceMin;
+
+ private Float negativeSequenceCurrentUnbalanceAvg;
+
+ private Float negativeSequenceCurrentUnbalance95;
+
+ private Float zeroSequenceCurrentImbalanceMax;
+
+ private Float zeroSequenceCurrentImbalanceMin;
+
+ private Float zeroSequenceCurrentImbalanceAvg;
+
+ private Float zeroSequenceCurrentImbalance95;
+
+ private Float voltageFluctuationAMax;
+
+ private Float voltageFluctuationAMin;
+
+ private Float voltageFluctuationAAvg;
+
+ private Float voltageFluctuationA95;
+
+ private Float voltageFluctuationBMax;
+
+ private Float voltageFluctuationBMin;
+
+ private Float voltageFluctuationBAvg;
+
+ private Float voltageFluctuationB95;
+
+ private Float voltageFluctuationCMax;
+
+ private Float voltageFluctuationCMin;
+
+ private Float voltageFluctuationCAvg;
+
+ private Float voltageFluctuationC95;
+
+ private Float shortTermSeverityAMax;
+
+ private Float shortTermSeverityAMin;
+
+ private Float shortTermSeverityAAvg;
+
+ private Float shortTermSeverityA95;
+
+ private Float shortTermSeverityBMax;
+
+ private Float shortTermSeverityBMin;
+
+ private Float shortTermSeverityBAvg;
+
+ private Float shortTermSeverityB95;
+
+ private Float shortTermSeverityCMax;
+
+ private Float shortTermSeverityCMin;
+
+ private Float shortTermSeverityCAvg;
+
+ private Float shortTermSeverityC95;
+
+ private Float longTimeFlashingAMax;
+
+ private Float longTimeFlashingAMin;
+
+ private Float longTimeFlashingAAvg;
+
+ private Float longTimeFlashingA95;
+
+ private Float longTimeFlashingBMax;
+
+ private Float longTimeFlashingBMin;
+
+ private Float longTimeFlashingBAvg;
+
+ private Float longTimeFlashingB95;
+
+ private Float longTimeFlashingCMax;
+
+ private Float longTimeFlashingCMin;
+
+ private Float longTimeFlashingCAvg;
+
+ private Float longTimeFlashingC95;
+
+ private Float longTimeFlashingOverrunDuration;
+
+ private Float equivalentApparentPowerMax;
+
+ private Float equivalentApparentPowerMin;
+
+ private Float equivalentApparentPowerAvg;
+
+ private Float equivalentApparentPower95;
+
+ private Float equivalentPowerFactorMax;
+
+ private Float equivalentPowerFactorMin;
+
+ private Float equivalentPowerFactorAvg;
+
+ private Float equivalentPowerFactor95;
+
+ private Float fundamentalWaveApparentMax;
+
+ private Float fundamentalWaveApparentMin;
+
+ private Float fundamentalWaveApparentAvg;
+
+ private Float fundamentalWaveApparent95;
+
+ private Float nonfundamentalWaveApparentMax;
+
+ private Float nonfundamentalWaveApparentMin;
+
+ private Float nonfundamentalWaveApparentAvg;
+
+ private Float nonfundamentalWaveApparent95;
+
+ private Float unbalancedApparentPowerMax;
+
+ private Float unbalancedApparentPowerMin;
+
+ private Float unbalancedApparentPowerAvg;
+
+ private Float unbalancedApparentPower95;
+
+ private Float subharmonicCurrentContent2_50AMax;
+
+ private Float subharmonicCurrentContent2_50AMin;
+
+ private Float subharmonicCurrentContent2_50AAvg;
+
+ private Float subharmonicCurrentContent2_50A95;
+
+ private Float subharmonicCurrentContent2_50BMax;
+
+ private Float subharmonicCurrentContent2_50BMin;
+
+ private Float subharmonicCurrentContent2_50BAvg;
+
+ private Float subharmonicCurrentContent2_50B95;
+
+ private Float subharmonicCurrentContent2_50CMax;
+
+ private Float subharmonicCurrentContent2_50CMin;
+
+ private Float subharmonicCurrentContent2_50CAvg;
+
+ private Float subharmonicCurrentContent2_50C95;
+
+ private Float interHarmonicCurrent1_50AMax;
+
+ private Float interHarmonicCurrent1_50AMin;
+
+ private Float interHarmonicCurrent1_50AAvg;
+
+ private Float interHarmonicCurrent1_50A95;
+
+ private Float interHarmonicCurrent1_50BMax;
+
+ private Float interHarmonicCurrent1_50BMin;
+
+ private Float interHarmonicCurrent1_50BAvg;
+
+ private Float interHarmonicCurrent1_50B95;
+
+ private Float interHarmonicCurrent1_50CMax;
+
+ private Float interHarmonicCurrent1_50CMin;
+
+ private Float interHarmonicCurrent1_50CAvg;
+
+ private Float interHarmonicCurrent1_50C95;
+
+ private Float simpleHarmonicCurrentRate1_50AMax;
+
+ private Float simpleHarmonicCurrentRate1_50AMin;
+
+ private Float simpleHarmonicCurrentRate1_50AAvg;
+
+ private Float simpleHarmonicCurrentRate1_50A95;
+
+ private Float simpleHarmonicCurrentRate1_50BMax;
+
+ private Float simpleHarmonicCurrentRate1_50BMin;
+
+ private Float simpleHarmonicCurrentRate1_50BAvg;
+
+ private Float simpleHarmonicCurrentRate1_50B95;
+
+ private Float simpleHarmonicCurrentRate1_50CMax;
+
+ private Float simpleHarmonicCurrentRate1_50CMin;
+
+ private Float simpleHarmonicCurrentRate1_50CAvg;
+
+ private Float simpleHarmonicCurrentRate1_50C95;
+
+ private Float fundamentalRateofworkAMax;
+
+ private Float fundamentalRateofworkAMin;
+
+ private Float fundamentalRateofworkAAvg;
+
+ private Float fundamentalRateofworkA95;
+
+ private Float fundamentalRateofworkBMax;
+
+ private Float fundamentalRateofworkBMin;
+
+ private Float fundamentalRateofworkBAvg;
+
+ private Float fundamentalRateofworkB95;
+
+ private Float fundamentalRateofworkCMax;
+
+ private Float fundamentalRateofworkCMin;
+
+ private Float fundamentalRateofworkCAvg;
+
+ private Float fundamentalRateofworkC95;
+
+ private Float fundamentalActivePowerAMax;
+
+ private Float fundamentalActivePowerAMin;
+
+ private Float fundamentalActivePowerAAvg;
+
+ private Float fundamentalActivePowerA95;
+
+ private Float fundamentalActivePowerBMax;
+
+ private Float fundamentalActivePowerBMin;
+
+ private Float fundamentalActivePowerBAvg;
+
+ private Float fundamentalActivePowerB95;
+
+ private Float fundamentalActivePowerCMax;
+
+ private Float fundamentalActivePowerCMin;
+
+ private Float fundamentalActivePowerCAvg;
+
+ private Float fundamentalActivePowerC95;
+
+ private Float fundamentalWavePositiveMax;
+
+ private Float fundamentalWavePositiveMin;
+
+ private Float fundamentalWavePositiveAvg;
+
+ private Float fundamentalWavePositive95;
+
+ private Float harmonicVoltageOverrunDuration;
+
+ private Float tpVoltageUnbalanceOverrunDuration;
+
+ private Float receivableTargetNum;
+
+ private Float practicalTargetNum;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
new file mode 100644
index 000000000..e4b9a102c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
@@ -0,0 +1,187 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_monitor")
+public class Monitor extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测点ID
+ */
+ private String id;
+
+ /**
+ * 监测点名称
+ */
+ private String name;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+
+ /**
+ * 运维单位名称
+ */
+ private String operationName;
+
+ /**
+ * 运维单位ID(外键)
+ */
+ private String operationId;
+
+ /**
+ * 变电站名称
+ */
+ private String powerrName;
+
+ /**
+ * 电站ID(外键)
+ */
+ private String powerrId;
+
+ /**
+ * 母线名称
+ */
+ private String generatrixName;
+
+ /**
+ * 母线ID(外键)
+ */
+ private String generatrixId;
+
+ /**
+ * 监测线路名称
+ */
+ private String lineName;
+
+ /**
+ * 监测线路ID
+ */
+ private String lineId;
+
+ /**
+ * 电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 监测点状态(字典)
+ */
+ private String monitorState;
+
+ /**
+ * 监测点类型(字典)
+ */
+ private String monitorType;
+
+ /**
+ * 最小短路容量
+ */
+ private Float minShortCircuitCapacity;
+
+ /**
+ * 供电设备容量
+ */
+ private Float powerSupplyEqCapacity;
+
+ /**
+ * 用户协议容量
+ */
+ private Float userAgreementCapacity;
+
+ /**
+ * 电压偏差限值(上)
+ */
+ private Float voltageDeviationUpperLimit;
+
+ /**
+ * 电压偏差限值(下)
+ */
+ private Float voltageDeviationLowerLimit;
+
+ /**
+ * 电压互感器类型(字典)
+ */
+ private String potentialTransFormerType;
+
+ /**
+ * 中性点接地方式(字典)
+ */
+ private String neutralGroundingMode;
+
+ /**
+ * 是否用户专线(字典)
+ */
+ private String isSpecialSupplyElectricity;
+
+ /**
+ * 监测点标签
+ */
+ private String monitorTag;
+
+ /**
+ * 监测对象类型(字典)
+ */
+ private String monitorObjectType;
+
+ /**
+ * 监测对象编号
+ */
+ private String monitorObjectId;
+
+ /**
+ * 监测对象名称
+ */
+ private String monitorObjectName;
+
+ /**
+ * 统计间隔
+ */
+ private Integer statisticalInterval;
+
+ /**
+ * 关联的监测终端编号(外键)
+ */
+ private String terminalId;
+
+ /**
+ * 监测终端接线方式(字典)
+ */
+ private String terminalWiringMethod;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Integer status;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java
new file mode 100644
index 000000000..cb74beb47
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsMonitorPO.java
@@ -0,0 +1,58 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (PmsMonitor)实体类
+ *
+ * @author yzh
+ * @since 2022-10-14 10:23:20
+ */
+@Data
+public class PmsMonitorPO implements Serializable {
+ private static final long serialVersionUID = -72537315596058339L;
+ /**
+ * 监测点ID
+ */
+ private String id;
+ /**
+ * 监测点名称
+ */
+ private String name;
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+ /**
+ * 运维单位名称
+ */
+ private String operationName;
+ /**
+ * 运维单位ID(外键)
+ */
+ private String operationId;
+ /**
+ * 变电站名称
+ */
+ private String powerrName;
+ /**
+ * 电站ID(外键)
+ */
+ private String powerrId;
+ /**
+ * 母线名称
+ */
+ private String generatrixName;
+ /**
+ * 母线ID(外键)
+ */
+ private String generatrixId;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java
new file mode 100644
index 000000000..5effdd223
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java
@@ -0,0 +1,172 @@
+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;
+
+/**
+ *
+ * 发电用户
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_power_client")
+public class PowerClient extends BaseEntity {
+
+ 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 userType;
+
+ /**
+ * 行业分类(字典)
+ */
+ private String industryType;
+
+ /**
+ * 用电类别(字典)
+ */
+ private String electricityType;
+
+ /**
+ * 合同容量
+ */
+ private Float contractCapacity;
+
+ /**
+ * 运行容量
+ */
+ private Float operatingCapacity;
+
+ /**
+ * 生产班次(字典)
+ */
+ private String productionShift;
+
+ /**
+ * 负荷性质(字典)
+ */
+ private String loadNature;
+
+ /**
+ * 供电电压(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 高耗能行业类别(字典)
+ */
+ 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 powerStationId;
+
+ /**
+ * 供电线路(外键)
+ */
+ private String lineId;
+
+ /**
+ * 供电台区(外键)
+ */
+ private String platformId;
+
+ /**
+ * 用户标签
+ */
+ private String userTag;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Integer status;
+
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
new file mode 100644
index 000000000..cd4aaaca4
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
@@ -0,0 +1,164 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_power_distributionarea")
+public class PowerDistributionarea extends BaseEntity {
+
+ 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 powerrName;
+
+ /**
+ * 电站ID(外键)
+ */
+ private String powerStationId;
+
+ /**
+ * 监测线路名称
+ */
+ private String lineName;
+
+ /**
+ * 所属线路ID(外键)
+ */
+ private String lineId;
+
+ /**
+ * 配变容量
+ */
+ private Float pCapacity;
+
+ /**
+ * 地区特征(字典)
+ */
+ private String regionalism;
+
+ /**
+ * 是否农网:0-否;1:是;
+ */
+ private Integer ifRuralPowerGrid;
+
+ /**
+ * 使用性质
+ */
+ private String natureOfUse;
+
+ /**
+ * 供电半径
+ */
+ private Float powerSupplyRadius;
+
+ /**
+ * 供电线路总长度
+ */
+ private Float lineLength;
+
+ /**
+ * 运行状态(字典)
+ */
+ private String state;
+
+ /**
+ * 分布式光伏用户数
+ */
+ private Integer distributedPhotovoltaicNum;
+
+ /**
+ * 分布式光伏总装机容量
+ */
+ private Float photovoltaicCapacity;
+
+ /**
+ * 是否有电动汽车接入:0-否;1:是;
+ */
+ private Integer ifBevAp;
+
+ /**
+ * 接入负荷类型(字典)
+ */
+ private String apLoadType;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Integer status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java
new file mode 100644
index 000000000..877285b55
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java
@@ -0,0 +1,132 @@
+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;
+
+/**
+ *
+ * 发电用户
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_power_generation_user")
+public class PowerGenerationUser extends BaseEntity {
+
+ 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 powerCategory;
+
+ /**
+ * 电站类型(字典)
+ */
+ private String powerStationType;
+
+ /**
+ * 发电方式(字典)
+ */
+ private String powerGenerationMode;
+
+ /**
+ * 并网电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 总装机容量
+ */
+ private Float sourceCapacity;
+
+ /**
+ * 并网日期
+ */
+ private LocalDate connectionDate;
+
+ /**
+ * 能源消纳方式(字典)
+ */
+ private String connectionMode;
+
+ /**
+ * 客户状态(字典)
+ */
+ private String gcStat;
+
+ /**
+ * 供电变电站(外键)
+ */
+ private String powerStationId;
+
+ /**
+ * 供电线路(外键)
+ */
+ private String lineId;
+
+ /**
+ * 供电台区(外键)
+ */
+ private String platformId;
+
+ /**
+ * 用户标签
+ */
+ private String userTag;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Integer status;
+
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java
new file mode 100644
index 000000000..34ec6e99c
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java
@@ -0,0 +1,142 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_power_quality_matter")
+public class PowerQualityMatter {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 电能质量问题编号
+ */
+ private String powerQualityProblem;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID
+ */
+ private String orgId;
+
+ /**
+ * 问题来源(字典)
+ */
+ private String problemSources;
+
+ /**
+ * 变电站编号(外键)
+ */
+ private String checkPowerId;
+
+ /**
+ * 问题指标(字典)
+ */
+ private String problemIndicators;
+
+ /**
+ * 问题发生时间
+ */
+ private LocalDateTime problemOccurrenceDate;
+
+ /**
+ * 问题发生天数
+ */
+ private Integer problemOccurrenceDays;
+
+ /**
+ * 用户编号(外键)
+ */
+ private String customerId;
+
+ /**
+ * 用户名称
+ */
+ private String customerName;
+
+ /**
+ * 用户类别(字典)
+ */
+ private String sensitiveType;
+
+ /**
+ * 是否实现监测:0-否;1-是;
+ */
+ private Boolean ifOnlineMonitor;
+
+ /**
+ * 监测点编号(外键)
+ */
+ private String monitorId;
+
+ /**
+ * 投诉时间
+ */
+ private LocalDateTime complaintsDate;
+
+ /**
+ * 投诉内容
+ */
+ private String complaintContent;
+
+ /**
+ * 电网-受影响设备(字典)
+ */
+ private String gridAffectedUnit;
+
+ /**
+ * 用户-受影响设备(字典)
+ */
+ private String customerAffectedUnit;
+
+ /**
+ * 事件描述(投诉内容)
+ */
+ private String incidentDescription;
+
+ /**
+ * 原因分析结果
+ */
+ private String problemAnaly;
+
+ /**
+ * 计划整改措施
+ */
+ private String plannedCorrectiveAction;
+
+ /**
+ * 实际采取措施
+ */
+ private String actualMeasuresTaken;
+
+ /**
+ * 治理效果评价
+ */
+ private String governanceMode;
+
+ /**
+ * 报告
+ */
+ private String governanceReport;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java
deleted file mode 100644
index 9aff0d271..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDate;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_device")
-@EqualsAndHashCode(callSuper = true)
-public class PvDevice extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 终端台账表Id
- */
- private String id;
-
- private String name;
-
- /**
- * 终端类型(电能质量监测终端、智能电表、智能融合终端),字典表
- */
- private String type;
-
- /**
- * 用于保存PMS中电能质量监测终端Id、智能融合终端Id,智能电表Id
- */
- private String devCode;
-
- /**
- * 终端Ip
- */
- private String ip;
-
- /**
- * 端口
- */
- private Integer port;
-
- /**
- * 终端型号(570、580……)字典表
- */
- private String devType;
-
- /**
- * 设备制造商,字典表
- */
- private String manufacturer;
-
- /**
- * 装置识别码(3ds加密)
- */
- private String series;
-
- /**
- * 装置秘钥(3ds加密)
- */
- private String devKey;
-
- /**
- * 投运时间
- */
- private LocalDate loadTime;
-
- /**
- * 装置通讯状态
- */
- private Integer devStatus;
-
-
- /**
- * 信号传输方式
- */
- private String communicateType;
-
- /**
- * 本次定检时间,默认等于投运时间
- */
- private LocalDate thisTimeCheck;
-
- /**
- * 下次定检时间,默认为投运时间后推3年,假如时间小于3个月则为待检
- */
- private LocalDate nextTimeCheck;
-
- /**
- * 终端级别
- */
- private String devGrade;
- /**
- * 状态
- */
- private Integer state;
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java
deleted file mode 100644
index f286e3147..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("pv_dispatch")
-public class PvDispatch extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 调度表Id
- */
- private String id;
-
- /**
- * 调度名称
- */
- private String name;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java
deleted file mode 100644
index 6faecb87f..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDate;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-06
- */
-@Data
-@TableName("pv_distributed")
-@EqualsAndHashCode(callSuper = true)
-public class PvDistributed extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 分布式光伏台账表Id
- */
- private String id;
-
-
- /**
- * 分布式光伏名称
- */
- private String name;
-
-
- private String code;
-
- /**
- * 用户编号(与低压用户台账表低压用户编号字段一致)
- */
- private String userCode;
-
- /**
- * 终端编号
- */
- private String devCode;
-
- /**
- * 并网电压等级Id,字典表
- */
- private String scale;
-
- /**
- * 装机容量(KVA)
- */
- private Float machineCapacity;
-
- /**
- * 上网方式
- */
- private String inteType;
-
- /**
- * 接入相别
- */
- private String phase;
-
- /**
- * 储能配置容量(KVA)
- */
- private Float energyCapacity;
-
-
- private String smartSwitch;
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate installTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate runTime;
-
- /**
- * 状态
- */
- private Integer state;
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java
deleted file mode 100644
index 4b06b345c..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDate;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_line_detail")
-@EqualsAndHashCode(callSuper = true)
-public class PvLineDetail extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 监测点序号
- */
- private String id;
-
- private String name;
-
- private String code;
-
- /**
- * 所属终端
- */
- private String devId;
-
- /**
- * 监测点类型(I类监测点、II类监测点、III类监测点),字典表
- */
- private String type;
-
- /**
- * 所属变电站(I类监测点)
- */
- private String substationId;
-
- /**
- * 所属母线名称(I类监测点)
- */
- private String voltageId;
-
- /**
- * 所属台区ID(II类监测点)
- */
- private String subAreaId;
-
- private String userCode;
-
- private Integer userCodeType;
-
- /**
- * 电压等级
- */
- private String scale;
-
- /**
- * 线路号(在同一台设备中的监测点号)
- */
- private Integer num;
-
- /**
- * PT一次变比
- */
- private Float pt1;
-
- /**
- * PT二次变比
- */
- private Float pt2;
-
- /**
- * CT一次变比
- */
- private Float ct1;
-
- /**
- * CT二次变比
- */
- private Float ct2;
-
- /**
- * 设备容量
- */
- private Float devCapacity;
-
- /**
- * 短路容量
- */
- private Float shortCapacity;
-
- /**
- * 基准容量
- */
- private Float standardCapacity;
-
- /**
- * 协议容量
- */
- private Float dealCapacity;
-
- /**
- * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
- */
- private String ptType;
-
- /**
- * 测量间隔(1-10分钟)
- */
- private Integer timeInterval;
-
- /**
- * 干扰源类型,字典表
- */
- private String loadType;
-
- /**
- * 行业类型,字典表
- */
- private String businessType;
-
- /**
- * 网公司谐波监测平台标志(0-否;1-是),默认否
- */
- private Integer monitorFlag;
-
- /**
- * 电网标志(0-电网侧;1-非电网侧)
- */
- private Integer powerFlag;
-
- /**
- * 国网谐波监测平台监测点号
- */
- private String monitorId;
-
- /**
- * 监测点对象名称
- */
- private String objName;
-
-
- private String smallName;
-
- /**
- * 监测点对象小类
- */
- private String bigName;
-
- /**
- * 人为干预是否参与统计(0:不参与,1:参与)默认参与统计
- */
- private Integer statFlag;
-
- /**
- * 备注
- */
- private String remark;
-
- /**
- * 电压互感器类型,字典表
- */
- private String tfType;
-
- /**
- * 所属变压器编号
- */
- private String tfCode;
-
- /**
- * 中性点接地方式,字典表
- */
- private String groundType;
-
- /**
- * 投运日期
- */
- private LocalDate putIn;
-
- /**
- * 接入日期
- */
- private LocalDate access;
-
- /**
- * 是否专项供电(0:否,1:是)默认参与统计
- */
- private Integer powerSupply;
-
- /**
- * 状态
- */
- private Integer state;
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java
deleted file mode 100644
index 07e703c2a..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_lv_user")
-@EqualsAndHashCode(callSuper = true)
-public class PvLvUser extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 低压用户台账表Id
- */
- private String id;
-
-
- /**
- * 低压用户编号(营销系统中查出)
- */
- private String userCode;
-
- /**
- * 低压用户名称
- */
- private String name;
-
- /**
- * 用户协议容量(kVA)
- */
- private Float userCapacity;
-
- /**
- * 是否发生过投诉
- */
- private Integer complain;
-
- /**
- * 投诉内容
- */
- private String complainPart;
-
- /**
- * 整改措施
- */
- private String corrective;
-
- /**
- * 是否有治理装置
- */
- private Integer devGovern;
-
- /**
- * 治理装置类型
- */
- private String governType;
-
- /**
- * 治理装置电压等级
- */
- private String scale;
-
- /**
- * 治理装置容量
- */
- private Float governCapacity;
-
- /**
- * 状态
- */
- private Integer state;
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java
deleted file mode 100644
index 5f0a96066..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_sub_area")
-@EqualsAndHashCode(callSuper = true)
-public class PvSubArea extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 台区表Id
- */
- private String id;
-
- /**
- * 所属10kV线路表Id(外键)
- */
- private String tenVoltageId;
-
- /**
- * 所属单位Id(台区所属的单位和变电站所属单位可能不是一个单位)
- */
- private String unitId;
-
- /**
- * 台区名称
- */
- private String name;
-
- /**
- * 台区编号
- */
- private String code;
-
- /**
- * 电缆长度字段
- */
- private Double cableLength;
-
- /**
- * 电阻
- */
- private Double resistance;
-
- /**
- * 电抗
- */
- private Double reactance;
-
- /**
- * 变压器型号
- */
- private String type;
-
- /**
- * 变压器容量
- */
- private Float capacity;
-
- /**
- * 变压器调压方式
- */
- private Integer regulationMode;
-
- /**
- * 台区无功补偿容量(KVA)
- */
- private Float reactCapacity;
-
- /**
- * 是否安装智能融合终端
- */
- private Integer devFusion;
-
- /**
- * 是否有分布式光伏接入
- */
- private Integer pv;
-
- /**
- * 分布式光伏总装机容量(KVA)
- */
- private Float totalC;
-
- /**
- * 分布式光伏用户数量
- */
- private Integer pvUsers;
-
- /**
- * 其他分布式电源装置容量
- */
- private Float powerPower;
-
- /**
- * 状态
- */
- private Integer state;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java
deleted file mode 100644
index 430d0230f..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_substation")
-public class PvSubstation {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 变电站表Id
- */
- private String id;
-
- /**
- * 所属单位Id
- */
- private String unitId;
-
- /**
- * 变电站名称
- */
- private String name;
-
- /**
- * 变电站编号
- */
- private String subCode;
-
- /**
- * 电压等级Id,字典表
- */
- private String scale;
-
- /**
- * 变电站总容量(MVA)(手动填写)
- */
- private Double totalCapacity;
-
- /**
- * 运维班组Code
- */
- private String teamCode;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java
deleted file mode 100644
index a2f79afc6..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_ten_voltage")
-public class PvTenVoltage extends BaseEntity {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 线路表Id
- */
- private String id;
-
- /**
- * 调度表Id(外键)
- */
- private String dispatchId;
-
-
- /**
- * 线路名称
- */
- private String name;
-
- /**
- * 线路编号
- */
- private String code;
-
- /**
- * 跨区域类型
- */
- private String crType;
-
- /**
- * 电压等级Id,字典表
- */
- private String scale;
-
- /**
- * 设计电压等级Id,字典表
- */
- private String designScale;
-
- /**
- * 设备状态
- */
- private Integer devStatus;
-
- /**
- * 是否接地极(0:false;1:true)
- */
- private Boolean earthing;
-
- /**
- * 线路性质
- */
- private String quality;
-
- /**
- * 所属主线
- */
- private String masterStroke;
-
- /**
- * 专业分类
- */
- private String major;
-
- /**
- * 设备主人
- */
- private String master;
-
- /**
- * 起点电站
- */
- private String startStation;
-
- /**
- * 终点电站
- */
- private String endStation;
-
- /**
- * 运行负载限额
- */
- private Float runLoad;
-
- /**
- * 额定输出功率
- */
- private Float outputPower;
-
- /**
- * 最大允许电流
- */
- private Float maxCurrent;
-
- /**
- * 投运日期
- */
- private LocalDateTime putIntoDate;
-
- /**
- * 状态
- */
- private Integer state;
-
- /**
- * 是否有分布式光伏接入
- */
- private Integer pvStatus;
-
-
- /**
- * 分布式光伏接入容量
- */
- private Integer pvCapacity;
-
-
- /**
- * 分布式光伏接入数量
- */
- private Integer pvNum;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java
deleted file mode 100644
index c60908558..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("pv_unit")
-public class PvUnit implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 单位表Id
- */
- private String id;
-
- /**
- * 父节点(0为根节点)
- */
- private String pid;
-
- /**
- * 单位名称
- */
- private String name;
-
- /**
- * 单位编码
- */
- private String code;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java
deleted file mode 100644
index 1198190a8..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.njcn.device.pms.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- *
- *
- *
- *
- * @author cdf
- * @since 2022-07-05
- */
-@Data
-@TableName("pv_voltage")
-public class PvVoltage {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 母线序号
- */
- private String id;
-
-
- /**
- * 母线名称
- */
- private String name;
-
- /**
- * 母线号(在同一台设备中的电压通道号)
- */
- private Integer num;
-
- /**
- * 电压等级Id,字典表
- */
- private String scale;
-
-
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java
new file mode 100644
index 000000000..e53371d64
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PwPmsMonitorPO.java
@@ -0,0 +1,16 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yzh
+ * @date 2022/10/27
+ */
+
+@Data
+public class PwPmsMonitorPO implements Serializable {
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
new file mode 100644
index 000000000..7b69e19ca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
@@ -0,0 +1,120 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author jianghf
+ * 监测点告警统计-月表
+ * @TableName r_mp_monitor_alarm_count_m
+ */
+@Data
+@TableName("r_mp_monitor_alarm_count_m")
+public class RMpMonitorAlarmCountM implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 单位ID
+ */
+ private String orgNo;
+
+ /**
+ * 生成数据的时间,每月统计一次
+ */
+ private Date dataDate;
+
+ /**
+ * 数据类型(0:主网 1:配网)
+ */
+ private String dataType;
+
+ /**
+ * 监测点ID
+ */
+ private String measurementPointId;
+
+ /**
+ * 电压偏差告警情况(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;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java
new file mode 100644
index 000000000..daa9286ff
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java
@@ -0,0 +1,49 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 告警明细-日表
+ * @TableName r_mp_pw_alarm_detail_d
+ */
+@Data
+@TableName("r_mp_pw_alarm_detail_d")
+public class RMpPwAlarmDetailD implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 生成数据的时间,每日统计一次
+ */
+ private Date dataDate;
+
+ /**
+ * 监测点ID
+ */
+ private String measurementPointId;
+
+ /**
+ * 告警类型
+ */
+ private String alarmType;
+
+ /**
+ * 告警描述
+ */
+ private String alarmInfo;
+
+ /**
+ * 告警持续时间
+ */
+ private Double alarmLastTime;
+
+ /**
+ * 是否已经生成在线监测超标问题(0:否 1:是 默认为否)
+ */
+ private Integer isCreateProblem;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java
new file mode 100644
index 000000000..ac0c53e18
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java
@@ -0,0 +1,82 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 监测点指标告警明细日表
+ * @TableName r_mp_target_warn_d
+ */
+@Data
+@TableName("r_mp_target_warn_d")
+public class RMpTargetWarnD implements Serializable {
+ /**
+ * 监测点ID
+ */
+ private String measurementPointId;
+
+ /**
+ * 生成数据的时间,每日统计一次
+ */
+ private Date dataDate;
+
+ /**
+ * 是否是有效接入监测点(0:否 1:是)
+ */
+ private Integer isEffective;
+
+ /**
+ * 是否是稳态超标监测点(0:否 1:是)
+ */
+ private Integer isHarmonic;
+
+ /**
+ * 是否是发生暂态的监测点(0:否 1:是)
+ */
+ private Integer isEvent;
+
+ /**
+ * 是否是告警监测点数(0:否 1:是)
+ */
+ private Integer isWarn;
+
+ /**
+ * 电压偏差是否告警(0:否 1:是)
+ */
+ private Integer isVDevWarn;
+
+ /**
+ * 频率偏差是否告警(0:否 1:是)
+ */
+ private Integer isFreqWarn;
+
+ /**
+ * 三相电压不平衡度是否告警(0:否 1:是)
+ */
+ private Integer isUnbalanceWarn;
+
+ /**
+ * 谐波电压是否告警(0:否 1:是)
+ */
+ private Integer isVWarn;
+
+ /**
+ * 闪变是否告警(0:否 1:是)
+ */
+ private Integer isFlickerWarn;
+
+ /**
+ * 电压暂降是否告警(0:否 1:是)
+ */
+ private Integer isSagWarn;
+
+ /**
+ * 短时中断是否告警(0:否 1:是)
+ */
+ private Integer isInterruptWarn;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
new file mode 100644
index 000000000..5ca6f4f6b
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
@@ -0,0 +1,115 @@
+package com.njcn.device.pms.pojo.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 区域告警统计(月)
+ * @TableName r_stat_area_alarm_count_m
+ */
+@Data
+@TableName("r_stat_area_alarm_count_m")
+public class RStatAreaAlarmCountM implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 单位ID
+ */
+ private String orgNo;
+
+ /**
+ * 生成数据的时间,每月统计一次
+ */
+ private Date dataDate;
+
+ /**
+ * 数据类型(0:主网 1:配网)
+ */
+ private String dataType;
+
+ /**
+ * 电压偏差告警情况(0:否 1:是)
+ */
+ private Integer vdevAlarmInfo;
+
+ /**
+ * 电压偏差告警超标占比
+ */
+ private Integer vdevAlarmRatio;
+
+ /**
+ * 频率偏差告警情况(0:否 1:是)
+ */
+ private Integer freqAlarmInfo;
+
+ /**
+ * 频率偏差告警超标占比
+ */
+ private Integer freqAlarmRatio;
+
+ /**
+ * 三相电压不平衡度告警情况(0:否 1:是)
+ */
+ private Integer unbalanceAlarmInfo;
+
+ /**
+ * 三相电压不平衡度告警超标占比
+ */
+ private Integer unbalanceAlarmRatio;
+
+ /**
+ * 谐波电压告警情况(0:否 1:是)
+ */
+ private Integer vAlarmInfo;
+
+ /**
+ * 谐波电压告警超标占比
+ */
+ private Integer vAlarmRatio;
+
+ /**
+ * 闪变告警情况(0:否 1:是)
+ */
+ private Integer flickerAlarmInfo;
+
+ /**
+ * 闪变告警超标占比
+ */
+ private Integer flickerAlarmRatio;
+
+ /**
+ * 电压暂降告警情况(0:否 1:是)
+ */
+ private Integer sagAlarmInfo;
+
+ /**
+ * 电压暂降告警平均发生次数
+ */
+ private Integer sagAlarmAvgCount;
+
+ /**
+ * 短时中断告警情况(0:否 1:是)
+ */
+ private Integer interruptAlarmInfo;
+
+ /**
+ * 短时中断告警平均发生次数
+ */
+ private Integer interruptAlarmAvgCount;
+
+ /**
+ * 稳态指标评级结果(0 较差 1中等 2较好)
+ */
+ private Integer harmonicTypeGrade;
+
+ /**
+ * 暂态指标评级结果(0 较差 1中等 2较好)
+ */
+ private Integer eventTypeGrade;
+
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java
new file mode 100644
index 000000000..6ed24f82d
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicPO.java
@@ -0,0 +1,92 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (RStatBusbarHarmonicY)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:38:16
+ */
+@Data
+public class RStatBusbarHarmonicPO implements Serializable {
+ private static final long serialVersionUID = 398744755685851294L;
+ /**
+ * 母线ID
+ */
+ private String busbarId;
+ /**
+ * 生成数据的时间,每年统计一次
+ */
+ private Date dataDate;
+ /**
+ * 电压有效值最大
+ */
+ private Double vEffectiveMax;
+ /**
+ * 电压有效值最小
+ */
+ private Double vEffectiveMin;
+ /**
+ * 电压有效值平均
+ */
+ private Double vEffectiveAvg;
+ /**
+ * 电压有效值95概率大值
+ */
+ private Double vEffective95;
+ /**
+ * 电压总谐波畸变率最大
+ */
+ private Double vThdMax;
+ /**
+ * 电压总谐波畸变率最小
+ */
+ private Double vThdMin;
+ /**
+ * 电压总谐波畸变率平均
+ */
+ private Double vThdAvg;
+ /**
+ * 电压总谐波畸变率95概率大值
+ */
+ private Double vThd95;
+ /**
+ * 三相电压不平衡最大
+ */
+ private Double unbalanceMax;
+ /**
+ * 三相电压不平衡最小
+ */
+ private Double unbalanceMin;
+ /**
+ * 三相电压不平衡平均
+ */
+ private Double unbalanceAvg;
+ /**
+ * 三相电压不平衡95概率大值
+ */
+ private Double unbalance95;
+ /**
+ * 闪变最大
+ */
+ private Double flickerMax;
+ /**
+ * 闪变最小
+ */
+ private Double flickerMin;
+ /**
+ * 闪变平均
+ */
+ private Double flickerAvg;
+ /**
+ * 闪变95概率大值
+ */
+ private Double flicker95;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java
new file mode 100644
index 000000000..690681743
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatEventOrgPO.java
@@ -0,0 +1,82 @@
+package com.njcn.device.pms.pojo.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 监测点暂态指标数据统计表(RStatEventOrg)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:15:26
+ */
+
+@Data
+@ApiModel("监测点暂态指标数据统计表")
+public class RStatEventOrgPO implements Serializable {
+ private static final long serialVersionUID = -15971491825708754L;
+ /**
+ * 单位ID
+ */
+ @ApiModelProperty(name = "orgNo",value = "单位ID")
+ private String orgNo;
+
+ /**
+ * 生成数据的时间,每年统计一次
+ */
+ @ApiModelProperty(name = "dataDate",value = "生成数据的时间,每年统计一次")
+ private Date dataDate;
+
+ /**
+ * 稳态指标类型Id,字典表ID
+ */
+ @ApiModelProperty(name = "eventType",value = "稳态指标类型Id,字典表ID")
+ private String eventType;
+
+ /**
+ * 日均发生暂态监测点数(根据 发生暂态监测点数 取平均值)
+ */
+ @ApiModelProperty(name = "eventMeasurementAverage",value = "日均发生暂态监测点数(根据 发生暂态监测点数 取平均值)")
+ private Integer eventMeasurementAverage;
+
+ /**
+ * 累计发生暂态监测点数(监测点暂态指标超标明细日表
+ */
+ @ApiModelProperty(name = "eventMeasurementAccrued",value = "累计发生暂态监测点数(监测点暂态指标超标明细日表)")
+ private Integer eventMeasurementAccrued;
+
+ /**
+ * 暂态指标发生频次(日表的暂态指标发生次数之和/日表的发生暂态监测点数之和)
+ */
+ @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次(日表的暂态指标发生次数之和/日表的发生暂态监测点数之和)")
+ private Double eventFreq;
+
+ /**
+ * 暂态指标发生次数(日表的暂态指标发生次数之和)
+ */
+ @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数(日表的暂态指标发生次数之和)")
+ private Integer eventCount;
+
+ /**
+ * 日均发生暂态监测点数占比(根据 日均发生暂态监测点数占比 取平均值)
+ */
+ @ApiModelProperty(name = "eventMeasurementRatioAverage",value = "日均发生暂态监测点数占比(根据 日均发生暂态监测点数占比 取平均值)")
+ private Double eventMeasurementRatioAverage;
+
+ /**
+ * 累计发生暂态监测点数占比(此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数)
+ */
+ @ApiModelProperty(name = "eventMeasurementRatioAccrued",value = "累计发生暂态监测点数占比(此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数)")
+ private Double eventMeasurementRatioAccrued;
+
+ /**
+ * 数据类型,字典表(01:主网测点 02:配网测点)
+ */
+ @ApiModelProperty(name = "dataType",value = "数据类型,字典表(01:主网测点 02:配网测点)")
+ private String dataType;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java
new file mode 100644
index 000000000..0766b6d80
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java
@@ -0,0 +1,104 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 区域分类统计年表(RStatOrgY)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:37:24
+ */
+@Data
+public class RStatOrgPO implements Serializable {
+ private static final long serialVersionUID = -49993470994002009L;
+ /**
+ * 单位ID
+ */
+ private String orgNo;
+ /**
+ * 生成数据的时间,每年统计一次
+ */
+ private Date dataDate;
+ /**
+ * 监测点类别ID、监测对象类型ID
+ */
+ private String measurementTypeClass;
+ /**
+ * 总监测点数
+ */
+ private Integer allCount;
+ /**
+ * 日均有效接入监测点数
+ */
+ private Integer effectiveMeasurementAverage;
+ /**
+ * 累计有效接入监测点数
+ */
+ private Integer effectiveMeasurementAccrued;
+ /**
+ * 日均稳态超标监测点数
+ */
+ private Integer overLimitMeasurementAverage;
+ /**
+ * 累计稳态超标监测点数
+ */
+ private Integer overLimitMeasurementAccrued;
+ /**
+ * 日均稳态超标监测点数占比
+ */
+ private Integer harmonicMeasurementRatioAverage;
+ /**
+ * 稳态指标平均超标天数
+ */
+ private Double averageOverDay;
+ /**
+ * 频率偏差合格率
+ */
+ private Double freqPassRate;
+ /**
+ * 电压偏差合格率
+ */
+ private Double vDevPassRate;
+ /**
+ * 闪变合格率
+ */
+ private Double flickerPassRate;
+ /**
+ * 日均监测到暂态指标的监测点数
+ */
+ private Integer eventMeasurementAverage;
+ /**
+ * 累计监测到暂态指标的监测点数
+ */
+ private Integer eventMeasurementAccrued;
+ /**
+ * 日均暂态超标监测点数占比
+ */
+ private Integer eventMeasurementRatioAverage;
+ /**
+ * 暂态指标发生频次
+ */
+ private Double eventFreq;
+ /**
+ * 暂态指标发生次数
+ */
+ private Integer eventCount;
+ /**
+ * 应设点数
+ */
+ private Integer shouldCount;
+ /**
+ * 告警监测点数
+ */
+ private Integer warnCount;
+ /**
+ * 数据类型,字典表(01:主网测点 02:配网测点)
+ */
+ private String dataType;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java
new file mode 100644
index 000000000..7b9790247
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java
@@ -0,0 +1,103 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (RStatSubstationY)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:39:03
+ */
+@Data
+public class RStatSubstationPO implements Serializable {
+ private static final long serialVersionUID = -98896978437277100L;
+ /**
+ * 生成数据的时间,每年统计一次
+ */
+ private Date dataDate;
+ /**
+ * 变电站id
+ */
+ private Integer substationId;
+ /**
+ * 日均有效接入监测点数
+ */
+ private Integer effectiveMeasurementAverage;
+ /**
+ * 累计有效接入监测点数
+ */
+ private Integer effectiveMeasurementAccrued;
+ /**
+ * 稳态平均超标天数
+ */
+ private Double harmonicOverDay;
+ /**
+ * 频率偏差平均超标天数
+ */
+ private Double freqAverageOverDay;
+ /**
+ * 电压偏差平均超标天数
+ */
+ private Double vDevAverageOverDay;
+ /**
+ * 谐波电压平均超标天数
+ */
+ private Double vAverageOverDay;
+ /**
+ * 谐波电流平均超标天数
+ */
+ private Double iAverageOverDay;
+ /**
+ * 三相电压不平衡平均超标天数
+ */
+ private Double unbalanceAverageOverDay;
+ /**
+ * 负序电流平均超标天数
+ */
+ private Double iNegAverageOverDay;
+ /**
+ * 闪变平均超标天数
+ */
+ private Double flickerAverageOverDay;
+ /**
+ * 间谐波电压平均超标天数
+ */
+ private Double inuharmAverageOverDay;
+ /**
+ * 暂态指标发生次数
+ */
+ private Integer eventCount;
+ /**
+ * 暂态指标发生频次
+ */
+ private Double eventFreq;
+ /**
+ * 电压暂降发生次数
+ */
+ private Integer sagCount;
+ /**
+ * 电压暂降发生频次
+ */
+ private Double sagFreq;
+ /**
+ * 电压暂升发生次数
+ */
+ private Integer swellCount;
+ /**
+ * 电压暂升发生频次
+ */
+ private Double swellFreq;
+ /**
+ * 短时中断发生次数
+ */
+ private Integer interruptCount;
+ /**
+ * 短时中断发生频次
+ */
+ private Double interruptFreq;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java
new file mode 100644
index 000000000..87230c2b7
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java
@@ -0,0 +1,45 @@
+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;
+
+/**
+ *
+ * @TableName r_stat_zw_alarm_count_w
+ */
+@Data
+@TableName("r_stat_zw_alarm_count_w")
+public class RStatZwAlarmCountW implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 单位ID
+ */
+ private String orgNo;
+
+ /**
+ * 生成数据的时间,每周统计一次
+ */
+ private Date dataDate;
+
+ /**
+ * 有效监测点数量
+ */
+ private Integer monitorEffectiveCount;
+
+ /**
+ * 告警4次及以上监测点数量
+ */
+ private Integer warnMonitorCount;
+
+ /**
+ * 级别较差监测点数量
+ */
+ private Integer monitorGradeCount;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java
new file mode 100644
index 000000000..1f9cb91bb
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RmpEventDetailPO.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (RMpEventDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:34:55
+ */
+@Data
+public class RmpEventDetailPO implements Serializable {
+ private static final long serialVersionUID = 717547299960041571L;
+ /**
+ * 暂时事件ID
+ */
+ private String eventId;
+ /**
+ * 监测点ID
+ */
+ private String measurementPointId;
+ /**
+ * 事件类型
+ */
+ private String eventType;
+ /**
+ * 开始时间
+ */
+ private Long startTime;
+ /**
+ * 持续时间
+ */
+ private Double duration;
+ /**
+ * 特征幅值
+ */
+ private Double featureAmplitude;
+ /**
+ * 相别
+ */
+ private String phase;
+ /**
+ * 事件描述
+ */
+ private String eventDescribe;
+ /**
+ * 波形路径
+ */
+ private String wavePath;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java
new file mode 100644
index 000000000..b936bb6bf
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java
@@ -0,0 +1,141 @@
+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.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_source_management")
+public class SourceManagement extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户台帐编号
+ */
+ private String sourceId;
+
+ /**
+ * 用户名称
+ */
+ private String sourceName;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID
+ */
+ private String orgId;
+
+ /**
+ * 干扰源类型(字典)
+ */
+ private String sourceType;
+
+ /**
+ * 送电日期(并网日期)
+ */
+ private LocalDate powerTransmissionDate;
+
+ /**
+ * 合同容量(总装机容量)
+ */
+ private BigDecimal userAgreementCapacity;
+
+ /**
+ * 入网评估是否超标:0-否;1-是;
+ */
+ private String ifOverproof;
+
+ /**
+ * 超标指标(字典)
+ */
+ private String overproofTarget;
+
+ /**
+ * 计划采取措施
+ */
+ private String planningDiscipline;
+
+ /**
+ * 入网评估报告
+ */
+ private String networkAccessEvaluationId;
+
+ /**
+ * 入网评估报告上传时间
+ */
+ private LocalDateTime networkAccessEvaluationDate;
+
+ /**
+ * 实测报告
+ */
+ private String testReportId;
+
+ /**
+ * 测试报告是否超标:0-否;1-是;
+ */
+ private String ifTestReportProof;
+
+ /**
+ * 实测超标指标
+ */
+ private String testTarget;
+
+ /**
+ * 测试报告上传时间
+ */
+ private LocalDateTime testReportDate;
+
+ /**
+ * 建档时间
+ */
+ private LocalDate filingDate;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Boolean status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java
new file mode 100644
index 000000000..366cc73bc
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java
@@ -0,0 +1,60 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_statation_stat")
+public class StatationStat extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 电站编号
+ */
+ private String powerId;
+
+ /**
+ * 电站名称
+ */
+ private String powerName;
+
+ /**
+ * 机构组织id
+ */
+ private String orgId;
+
+ /**
+ * 应设点数量
+ */
+ private Integer shouldBeNum;
+
+ /**
+ * 电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Boolean status;
+
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java
new file mode 100644
index 000000000..6254db509
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java
@@ -0,0 +1,119 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_statistics_run_monitor")
+public class StatisticsRunMonitor extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+
+ /**
+ * 电压等级(字典)
+ */
+ private String voltageLevel;
+
+ /**
+ * 母线数量
+ */
+ private Integer generatrixSum;
+
+ /**
+ * 线路总数
+ */
+ private Integer lineNum;
+
+ /**
+ * 接入分布式光伏的线路总数
+ */
+ private Integer photovoltaicLineNum;
+
+ /**
+ * 台区总数
+ */
+ private Integer platformNum;
+
+ /**
+ * 光伏台区总数
+ */
+ private Integer photovoltaicCourtsNum;
+
+ /**
+ * 光伏容量超过台区容量25%的台区总数
+ */
+ private Integer exceedCourtscapNum;
+
+ /**
+ * 风电用户总数
+ */
+ private Integer windPowerNum;
+
+ /**
+ * 光伏用户总数
+ */
+ private Integer pvNum;
+
+ /**
+ * 冶炼负荷用户总数
+ */
+ private Integer smeltingLoadNum;
+
+ /**
+ * 日期
+ */
+ private LocalDateTime dataDate;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Boolean status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java
new file mode 100644
index 000000000..755078490
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Terminal.java
@@ -0,0 +1,145 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_terminal")
+public class Terminal extends BaseEntity {
+
+ 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 powerrName;
+
+ /**
+ * 所属电站ID(外键)
+ */
+ private String powerStationId;
+
+ /**
+ * 终端状态(字典)
+ */
+ private String terminalState;
+
+ /**
+ * 终端级别(字典)
+ */
+ private String terminalLevel;
+
+ /**
+ * 装置型号(字典)
+ */
+ private String deviceModel;
+
+ /**
+ * 生产厂家(字典)
+ */
+ private String manufacture;
+
+ /**
+ * 检定日期
+ */
+ private LocalDate verificationDate;
+
+ /**
+ * 投运日期
+ */
+ private LocalDate useDate;
+
+ /**
+ * 测量信号输入形式(字典)
+ */
+ private String inputType;
+
+ /**
+ * IP地址
+ */
+ private String ip;
+
+ /**
+ * 通信端口
+ */
+ private String port;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Integer status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java
new file mode 100644
index 000000000..9c107414e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java
@@ -0,0 +1,57 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_terminal_eliminate_data")
+public class TerminalEliminateData {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测终端编号
+ */
+ private String terminalId;
+
+ /**
+ * 故障时间
+ */
+ private LocalDateTime defectTime;
+
+ /**
+ * 故障类型(字典)
+ */
+ private String defectType;
+
+ /**
+ * 是否消缺:0-否;1-是;
+ */
+ private Boolean ifDefectRectify;
+
+ /**
+ * 消缺时间
+ */
+ private LocalDateTime defectHandlingTime;
+
+ /**
+ * 消缺措施
+ */
+ private String defectTreatment;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
new file mode 100644
index 000000000..5ccdb1ce6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
@@ -0,0 +1,144 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pms_traction_station")
+public class TractionStation extends BaseEntity {
+
+ 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 railwayLineId;
+
+ /**
+ * 铁路线路名称
+ */
+ private String railwayLineName;
+
+ /**
+ * 牵引站变压器接线方式(字典)
+ */
+ private String connetGroupWay;
+
+ /**
+ * 牵引站变电容量
+ */
+ private Float ratedCapacity;
+
+ /**
+ * 供电变电站编号
+ */
+ private String powerId;
+
+ /**
+ * 供电变电站名称
+ */
+ private String powerName;
+
+ /**
+ * 供电变电站电压等级(字典)
+ */
+ private String powerVoltageLevel;
+
+ /**
+ * 是否专线供电:0-否;1-是;
+ */
+ private Integer ifSpecial;
+
+ /**
+ * 创建日期
+ */
+ private LocalDateTime createdDate;
+
+ /**
+ * 用户标签
+ */
+ private String userTag;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ private Integer status;
+
+ /**
+ * 创建用户
+ */
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新用户
+ */
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java
new file mode 100644
index 000000000..99178f0ca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java
@@ -0,0 +1,62 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_transient_stastic_data")
+public class TransientStasticData {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+
+ /**
+ * 监测点编号(外键)
+ */
+ private String monitorId;
+
+ /**
+ * 持续时间
+ */
+ private Float durationTag;
+
+ /**
+ * 特征幅值
+ */
+ private Float featureAmplitudeTag;
+
+ /**
+ * 发生次数
+ */
+ private Integer frequency;
+
+ /**
+ * 日期
+ */
+ private LocalDate dataDate;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java
new file mode 100644
index 000000000..e1a63f5a0
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java
@@ -0,0 +1,67 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+@Data
+@TableName("pms_treat_transient_detail_data")
+public class TreatTransientDetailData {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测点编号
+ */
+ private String monitorId;
+
+ /**
+ * 组织机构名称
+ */
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ private String orgId;
+
+ /**
+ * 事件类型(字典)
+ */
+ private String eventType;
+
+ /**
+ * 开始时间
+ */
+ private LocalDateTime startTime;
+
+ /**
+ * 持续时间
+ */
+ private Float duration;
+
+ /**
+ * 特征幅值
+ */
+ private Float featureAmplitude;
+
+ /**
+ * 相别(字典)
+ */
+ private String phase;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java
deleted file mode 100644
index a814cb385..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 终端运行异常列表信息
- *
- * @author yangj
- * @date 2022/09/08
- */
-@Data
-public class DeviceRunExVO implements Serializable {
-
-
-
- /**
- * 日期
- */
- @ApiModelProperty("日期")
- @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private String time;
-
-
- /**
- * 告警描述
- */
- @ApiModelProperty("告警描述")
- private String alarmDesc;
-
- /**
- * 告警统计
- */
- @ApiModelProperty("告警统计")
- private Long alarmNum;
-
- /**
- * 中断描述
- */
- @ApiModelProperty("中断描述")
- private String comOutDesc;
-
- /**
- * 中断统计
- */
- @ApiModelProperty("中断统计")
- private Long comOutNum;
-
- /**
- * 终端id
- */
- @ApiModelProperty("终端id")
- private String devId;
-
- /**
- * 终端流量
- */
- @ApiModelProperty("终端流量")
- private Long flowNum;
-
- private Long flowStand;
-
- private Long overLimit;
-
- private Integer state;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java
deleted file mode 100644
index d6d31b015..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDate;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/28
- */
-@Data
-public class DisOrLvVO {
- /**
- * 低压用户台账表Id
- */
- private String id;
-
-
- /**
- * 低压用户编号(营销系统中查出)
- */
- private String userCode;
-
- /**
- * 低压用户名称
- */
- private String name;
-
- /**
- * 用户协议容量(kVA)
- */
- private Float userCapacity;
-
- /**
- * 是否发生过投诉
- */
- private Integer complain;
-
- /**
- * 投诉内容
- */
- private String complainPart;
-
- /**
- * 整改措施
- */
- private String corrective;
-
- /**
- * 是否有治理装置
- */
- private Integer devGovern;
-
- /**
- * 治理装置类型
- */
- private String governType;
-
- /**
- * 治理装置电压等级
- */
- private String scale;
-
- private String scaleName;
-
- /**
- * 治理装置容量
- */
- private Float governCapacity;
-
- /**
- * 状态
- */
- private Integer state;
-
-
-
-
-
-
-
-
- private String code;
-
- /**
- * 终端编号
- */
- private String devCode;
-
-
- /**
- * 装机容量(KVA)
- */
- private Float machineCapacity;
-
- /**
- * 上网方式
- */
- private String inteType;
-
- /**
- * 接入相别
- */
- private String phase;
-
- /**
- * 储能配置容量(KVA)
- */
- private Float energyCapacity;
-
-
- private String smartSwitch;
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate installTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate runTime;
-
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java
new file mode 100644
index 000000000..e7f7184ff
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java
@@ -0,0 +1,234 @@
+package com.njcn.device.pms.pojo.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @TableName pms_monitor
+ */
+@Data
+public class PmsMonitorVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测点ID
+ */
+ @ApiModelProperty(name = "id", value = "监测点ID")
+ private String id;
+
+ /**
+ * 监测点名称
+ */
+ @ApiModelProperty(name = "name", value = "监测点名称")
+ private String name;
+
+ /**
+ * 组织机构名称
+ */
+ @ApiModelProperty(name = "orgName", value = "组织机构名称")
+ private String orgName;
+
+ /**
+ * 组织机构ID(外键)
+ */
+ @ApiModelProperty(name = "orgId", value = "组织机构ID(外键)")
+ private String orgId;
+
+ /**
+ * 运维单位名称
+ */
+ @ApiModelProperty(name = "operationName", value = "运维单位名称")
+ private String operationName;
+
+ /**
+ * 运维单位ID(外键)
+ */
+ @ApiModelProperty(name = "operationId", value = "运维单位ID(外键)")
+ private String operationId;
+
+ /**
+ * 变电站名称
+ */
+ @ApiModelProperty(name = "powerrName", value = "变电站名称")
+ private String powerrName;
+
+ /**
+ * 电站ID(外键)
+ */
+ @ApiModelProperty(name = "powerrId", value = "电站ID(外键)")
+ private String powerrId;
+
+ /**
+ * 母线名称
+ */
+ @ApiModelProperty(name = "generatrixName", value = "母线名称")
+ private String generatrixName;
+
+ /**
+ * 母线ID(外键)
+ */
+ @ApiModelProperty(name = "generatrixId", value = "母线ID(外键)")
+ private String generatrixId;
+
+ /**
+ * 监测线路名称
+ */
+ @ApiModelProperty(name = "lineName", value = "监测线路名称")
+ private String lineName;
+
+ /**
+ * 监测线路ID
+ */
+ @ApiModelProperty(name = "lineId", value = "监测线路ID")
+ private String lineId;
+
+ /**
+ * 电压等级(字典)
+ */
+ @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
+ private String voltageLevel;
+
+ /**
+ * 监测点状态(字典)
+ */
+ @ApiModelProperty(name = "monitorState", value = "监测点状态(字典)")
+ private String monitorState;
+
+ /**
+ * 监测点类型
+ */
+ @ApiModelProperty(name = "monitorType", value = "监测点类型")
+ private String monitorType;
+
+ /**
+ * 最小短路容量
+ */
+ @ApiModelProperty(name = "minShortCircuitCapacity", value = "最小短路容量")
+ private Double minShortCircuitCapacity;
+
+ /**
+ * 供电设备容量
+ */
+ @ApiModelProperty(name = "powerSupplyEqCapacity", value = "供电设备容量")
+ private Double powerSupplyEqCapacity;
+
+ /**
+ * 用户协议容量
+ */
+ @ApiModelProperty(name = "userAgreementCapacity", value = "用户协议容量")
+ private Double userAgreementCapacity;
+
+ /**
+ * 电压偏差限值(上)
+ */
+ @ApiModelProperty(name = "voltageDeviationUpperLimit", value = "电压偏差限值(上)")
+ private Double voltageDeviationUpperLimit;
+
+ /**
+ * 电压偏差限值(下)
+ */
+ @ApiModelProperty(name = "voltageDeviationLowerLimit", value = "电压偏差限值(下)")
+ private Double voltageDeviationLowerLimit;
+
+ /**
+ * 电压互感器类型(字典)
+ */
+ @ApiModelProperty(name = "potentialTransFormerType", value = "电压互感器类型(字典)")
+ private String potentialTransFormerType;
+
+ /**
+ * 中性点接地方式(字典)
+ */
+ @ApiModelProperty(name = "neutralGroundingMode", value = "中性点接地方式(字典)")
+ private String neutralGroundingMode;
+
+ /**
+ * 是否用户专线(字典)
+ */
+ @ApiModelProperty(name = "isSpecialSupplyElectricity", value = "是否用户专线(字典)")
+ private String isSpecialSupplyElectricity;
+
+ /**
+ * 监测点标签
+ */
+ @ApiModelProperty(name = "monitorTag", value = "监测点标签")
+ private String monitorTag;
+
+ /**
+ * 监测对象类型(字典)
+ */
+ @ApiModelProperty(name = "monitorObjectType", value = "监测对象类型(字典)")
+ private String monitorObjectType;
+
+ /**
+ * 监测对象编号
+ */
+ @ApiModelProperty(name = "monitorObjectId", value = "监测对象编号")
+ private String monitorObjectId;
+
+ /**
+ * 监测对象名称
+ */
+ @ApiModelProperty(name = "monitorObjectName", value = "监测对象名称")
+ private String monitorObjectName;
+
+ /**
+ * 统计间隔
+ */
+ @ApiModelProperty(name = "statisticalInterval", value = "统计间隔")
+ private Integer statisticalInterval;
+
+ /**
+ * 关联的监测终端编号(外键)
+ */
+ @ApiModelProperty(name = "terminalId", value = "关联的监测终端编号(外键)")
+ private String terminalId;
+
+ /**
+ * 监测终端接线方式(字典)
+ */
+ @ApiModelProperty(name = "terminalWiringMethod", value = "监测终端接线方式(字典)")
+ private String terminalWiringMethod;
+
+ /**
+ * 是否是上送国网监测点,0-否 1-是
+ */
+ @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer isUpToGrid;
+
+ /**
+ * 数据状态:0-删除;1-正常;
+ */
+ @ApiModelProperty(name = "status", value = "数据状态:0-删除;1-正常;")
+ private Integer status;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(name = "createBy", value = "创建用户")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新用户
+ */
+ @ApiModelProperty(name = "updateBy", value = "更新用户")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ private Date updateTime;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java
new file mode 100644
index 000000000..55dc2f321
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsTerminalVO.java
@@ -0,0 +1,94 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class PmsTerminalVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(name = "Id", value = "终端编号")
+ private String Id;
+
+ @ApiModelProperty(name = "Name", value = "终端名称")
+ private String Name;
+
+ @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+ private String OrgName;
+
+ @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+ private String OrgId;
+
+ @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+ private String OperationName;
+
+ @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+ private String OperationId;
+
+ @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+ private String PowerrName;
+
+ @ApiModelProperty(name = "PowerStationId", value = "所属电站ID")
+ private String PowerStationId;
+
+ @ApiModelProperty(name = "TerminalState", value = "终端状态")
+ private String TerminalState;
+
+ @ApiModelProperty(name = "TerminalLevel", value = "终端级别")
+ private String TerminalLevel;
+
+ @ApiModelProperty(name = "DeviceModel", value = "装置型号")
+ private String DeviceModel;
+
+ @ApiModelProperty(name = "Manufacture", value = "生产厂家")
+ private String Manufacture;
+
+ @ApiModelProperty(name = "VerificationDate", value = "检定日期")
+ private String VerificationDate;
+
+ @ApiModelProperty(name = "UseDate", value = "投用日期")
+ private String UseDate;
+
+ @ApiModelProperty(name = "InputType", value = "测量信号输入形式")
+ private String InputType;
+
+ @ApiModelProperty(name = "Ip", value = "IP地址")
+ private String Ip;
+
+ @ApiModelProperty(name = "Port", value = "通信端口")
+ private String Port;
+
+ @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer IsUpToGrid;
+
+ @ApiModelProperty(name = "Status", value = "数据状态:0-删除;1-正常")
+ private Integer Status;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(name = "createBy", value = "创建用户")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新用户
+ */
+ @ApiModelProperty(name = "updateBy", value = "更新用户")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ private Date updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java
new file mode 100644
index 000000000..aef636acf
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PowerDistributionareaVO.java
@@ -0,0 +1,108 @@
+package com.njcn.device.pms.pojo.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class PowerDistributionareaVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(name = "Id", value = "台区编号")
+ private String Id;
+
+ @ApiModelProperty(name = "Name", value = "台区名称")
+ private String Name;
+
+ @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+ private String OrgName;
+
+ @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+ private String OrgId;
+
+ @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+ private String OperationName;
+
+ @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+ private String OperationId;
+
+ @ApiModelProperty(name = "PowerrName", value = "变电站名称")
+ private String PowerrName;
+
+ @ApiModelProperty(name = "PowerStationId", value = "电站ID")
+ private String PowerStationId;
+
+ @ApiModelProperty(name = "LineName", value = "监测线路名称")
+ private String LineName;
+
+ @ApiModelProperty(name = "LineId", value = "所属线路ID")
+ private String LineId;
+
+ @ApiModelProperty(name = "PCapacity", value = "配变容量")
+ private Float PCapacity;
+
+ @ApiModelProperty(name = "Regionalism", value = "地区特征")
+ private String Regionalism;
+
+ @ApiModelProperty(name = "IfRuralPowerGrid", value = "是否农网:0-否;1:是")
+ private Integer IfRuralPowerGrid;
+
+ @ApiModelProperty(name = "NatureOfUse", value = "使用性质")
+ private String NatureOfUse;
+
+ @ApiModelProperty(name = "PowerSupplyRadius", value = "供电半径")
+ private Float PowerSupplyRadius;
+
+ @ApiModelProperty(name = "LineLength", value = "供电线路总长度")
+ private Float LineLength;
+
+ @ApiModelProperty(name = "State", value = "运行状态")
+ private String State;
+
+ @ApiModelProperty(name = "DistributedPhotovoltaicNum", value = "分布式光伏用户数")
+ private Integer DistributedPhotovoltaicNum;
+
+ @ApiModelProperty(name = "PhotovoltaicCapacity", value = "分布式光伏总装机容量")
+ private Float PhotovoltaicCapacity;
+
+ @ApiModelProperty(name = "IfBevAp", value = "是否有电动汽车接入:0-否;1:是")
+ private Integer IfBevAp;
+
+ @ApiModelProperty(name = "ApLoadType", value = "接入负荷类型")
+ private String ApLoadType;
+
+ @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer IsUpToGrid;
+
+ @ApiModelProperty(name = "Status", value = "数据状态:0-删除;1-正常")
+ private Integer Status;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(name = "createBy", value = "创建用户")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新用户
+ */
+ @ApiModelProperty(name = "updateBy", value = "更新用户")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ private Date updateTime;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java
new file mode 100644
index 000000000..5e4287ba7
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ProblemMonitorDetailVO.java
@@ -0,0 +1,41 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 告警统计-监测点详情
+ * @Title ProblemMonitorDetailVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-13 19:35
+ * @Version V1.0
+ */
+@Data
+public class ProblemMonitorDetailVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(name = "orgNo", value = "单位id")
+ private String orgNo;
+
+ @ApiModelProperty(name = "orgName", value = "单位名称")
+ private String orgName;
+
+ @ApiModelProperty(name = "monitorId", value = "监测点id")
+ private String monitorId;
+
+ @ApiModelProperty(name = "monitorName", value = "监测点名称")
+ private String monitorName;
+
+ @ApiModelProperty(name = "powerName", value = "变电站名称")
+ private String powerName;
+
+ @ApiModelProperty(name = "voltageLevel", value = "变电站电压等级id")
+ private String voltageLevel;
+
+ @ApiModelProperty(name = "voltageLevelName", value = "变电站电压等级")
+ private String voltageLevelName;
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java
deleted file mode 100644
index b41d40886..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvDevice;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvDeviceVO extends PvDevice {
-
- private String devTypeName;
-
- private String typeName;
-
- private String typeCode;
-
- private String manufacturerName;
-
- /**
- * 终端级别中文名称
- */
- private String devGradeName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java
deleted file mode 100644
index cfac09819..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvDistributed;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvDistributedVO extends PvDistributed {
- private String scaleName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java
deleted file mode 100644
index b6af81f64..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import lombok.Data;
-
-import java.time.LocalDate;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/12
- */
-@Data
-public class PvLineAllDetailVO {
-
-
- /**
- * 监测点序号
- */
- private String id;
-
- private String name;
-
- private String code;
-
- /**
- * 所属终端
- */
- private String devName;
-
- private String devId;
-
- /**
- * 监测点类型(I类监测点、II类监测点、III类监测点),字典表
- */
- private String type;
-
- /**
- * 监测点类型(I类监测点、II类监测点、III类监测点),字典表
- */
- private String typeName;
-
- private String substationId;
- /**
- * 所属变电站(I类监测点)
- */
- private String substationName;
-
- /**
- * 所属母线名称(I类监测点)
- */
- private String voltageName;
-
- private String voltageId;
-
- /**
- * 所属台区ID(II类监测点)
- */
- private String subAreaName;
- private String subAreaId;
-
- private String userCode;
-
- private String userCodeType;
-
- /**
- * 分布式光伏名称
- */
- private String distributeName;
- private String distributeId;
-
- /**
- * 低压用户名称
- */
- private String lvUserName;
- private String lvUserId;
-
- /**
- * 电压等级
- */
- private String scale;
-
- private String scaleName;
-
- /**
- * 线路号(在同一台设备中的监测点号)
- */
- private Integer num;
-
- /**
- * PT一次变比
- */
- private Float pt1;
-
- /**
- * PT二次变比
- */
- private Float pt2;
-
- /**
- * CT一次变比
- */
- private Float ct1;
-
- /**
- * CT二次变比
- */
- private Float ct2;
-
- /**
- * 设备容量
- */
- private Float devCapacity;
-
- /**
- * 短路容量
- */
- private Float shortCapacity;
-
- /**
- * 基准容量
- */
- private Float standardCapacity;
-
- /**
- * 协议容量
- */
- private Float dealCapacity;
-
- /**
- * 接线类型
- */
- private String ptType;
-
- private String ptTypeName;
-
- /**
- * 测量间隔(1-10分钟)
- */
- private Integer timeInterval;
-
- /**
- * 干扰源类型,字典表
- */
- private String loadType;
- private String loadTypeName;
-
- /**
- * 行业类型,字典表
- */
- private String businessType;
-
- /**
- * 网公司谐波监测平台标志(0-否;1-是),默认否
- */
- private Integer monitorFlag;
-
- /**
- * 电网标志(0-电网侧;1-非电网侧)
- */
- private Integer powerFlag;
-
- /**
- * 国网谐波监测平台监测点号
- */
- private String monitorId;
-
- /**
- * 监测点对象名称
- */
- private String objName;
-
- /**
- * 监测点对象小类
- */
- private String smallName;
-
- /**
- * 监测点对象大类
- */
- private String bigName;
-
- /**
- * 人为干预是否参与统计(0:不参与,1:参与)默认参与统计
- */
- private Integer statFlag;
-
- /**
- * 备注
- */
- private String remark;
-
- /**
- * 电压互感器类型,字典表
- */
- private String tfType;
-
- private String tfTypeName;
-
- /**
- * 所属变压器编号
- */
- private String tfCode;
-
- /**
- * 中性点接地方式,字典表
- */
- private String groundType;
-
- private String groundTypeName;
-
- /**
- * 投运日期
- */
- private LocalDate putIn;
-
- /**
- * 接入日期
- */
- private LocalDate access;
-
- /**
- * 是否专项供电(0:否,1:是)默认参与统计
- */
- private Integer powerSupply;
-
- /**
- * 状态
- */
- private Integer state;
-
-
- /**
- * 监测点状态
- * @author cdf
- * @date 2022/7/27
- */
- private Integer lineStatus;
-
-}
-
-
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java
deleted file mode 100644
index 6feb82941..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvLvUser;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvLvUserVO extends PvLvUser {
- private String scaleName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java
deleted file mode 100644
index dc5e66e95..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvSubArea;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvSubAreaVO extends PvSubArea {
-
- @ApiModelProperty(name = "scaleName",value = "电压等级")
- private String scaleName;
-
- @ApiModelProperty(name = "unitName",value = "单位名称")
- private String unitName;
-
- @ApiModelProperty(name = "tenVoltageName",value = "10kv线路表")
- private String tenVoltageName;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java
deleted file mode 100644
index ced9c0b3a..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import lombok.Data;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/25
- */
-@Data
-public class PvSubstationVO {
-
- /**
- * 变电站表Id
- */
- private String id;
-
- /**
- * 所属单位Id
- */
- private String unitId;
-
-
- /**
- * 所属单位名称
- */
- private String unitName;
-
- /**
- * 变电站名称
- */
- private String name;
-
- /**
- * 变电站编号
- */
- private String subCode;
-
- /**
- * 电压等级Id,字典表
- */
- private String scale;
-
- /**
- * 电压等级名称
- */
- private String scaleName;
-
- /**
- * 变电站总容量(MVA)(手动填写)
- */
- private Double totalCapacity;
-
- /**
- * 运维班组Code
- */
- private String teamCode;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java
deleted file mode 100644
index 8309c1bc9..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import com.njcn.device.pms.pojo.po.PvTenVoltage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PvTenVoltageVO extends PvTenVoltage {
-
-
- private String scaleName;
-
- @ApiModelProperty(name = "designScaleName",value = "设计电压",required = true)
- private String designScaleName;
-
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java
new file mode 100644
index 000000000..75e347be1
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpMonitorAlarmCountMVO.java
@@ -0,0 +1,147 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author jianghf
+ * 监测点告警统计-月表
+ * @TableName r_mp_monitor_alarm_count_m
+ */
+@Data
+public class RMpMonitorAlarmCountMVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty(name = "orgNo", value = "所属单位id")
+ 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 = "monitorType", value = "监测点类型id")
+ private String monitorType;
+
+ @ApiModelProperty(name = "monitorTypeName", value = "监测点类型名称")
+ private String monitorTypeName;
+
+ @ApiModelProperty(name = "voltage_Level", value = "电压等级id")
+ private String voltageLevel;
+
+ @ApiModelProperty(name = "voltageLevelName", value = "电压等级名称")
+ private String voltageLevelName;
+
+ /**
+ * 生成数据的时间,每月统计一次
+ */
+ @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每月统计一次")
+ private Date dataDate;
+
+ /**
+ * 电压偏差告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "vdevAlarmInfo", value = "电压偏差告警情况(0:否 1:是)")
+ private Integer vdevAlarmInfo;
+
+ /**
+ * 电压偏差严重度
+ */
+ @ApiModelProperty(name = "vdevSeverity", value = "电压偏差严重度")
+ private Integer vdevSeverity;
+
+ /**
+ * 频率偏差告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "freqAlarmInfo", value = "频率偏差告警情况(0:否 1:是)")
+ private Integer freqAlarmInfo;
+
+ /**
+ * 频率偏差严重度
+ */
+ @ApiModelProperty(name = "freqSeverity", value = "频率偏差严重度")
+ private Integer freqSeverity;
+
+ /**
+ * 三相电压不平衡度告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "unbalanceAlarmInfo", value = "三相电压不平衡度告警情况(0:否 1:是)")
+ private Integer unbalanceAlarmInfo;
+
+ /**
+ * 三相电压不平衡度严重度
+ */
+ @ApiModelProperty(name = "unbalanceSeverity", value = "三相电压不平衡度严重度")
+ private Integer unbalanceSeverity;
+
+ /**
+ * 谐波电压告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "vAlarmInfo", value = "谐波电压告警情况(0:否 1:是)")
+ private Integer vAlarmInfo;
+
+ /**
+ * 谐波电压严重度
+ */
+ @ApiModelProperty(name = "vSeverity", value = "谐波电压严重度")
+ private Integer vSeverity;
+
+ /**
+ * 闪变告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "flickerAlarmInfo", value = "闪变告警情况(0:否 1:是)")
+ private Integer flickerAlarmInfo;
+
+ /**
+ * 闪变严重度
+ */
+ @ApiModelProperty(name = "flickerSeverity", value = "闪变严重度")
+ private Integer flickerSeverity;
+
+ /**
+ * 电压暂降告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "sagAlarmInfo", value = "电压暂降告警情况(0:否 1:是)")
+ private Integer sagAlarmInfo;
+
+ /**
+ * 电压暂降告严重度
+ */
+ @ApiModelProperty(name = "sagSeverity", value = "电压暂降严重度")
+ private Integer sagSeverity;
+
+ /**
+ * 短时中断告警情况(0:否 1:是)
+ */
+
+ @ApiModelProperty(name = "interruptAlarmInfo", value = "短时中断告警情况(0:否 1:是)")
+ private Integer interruptAlarmInfo;
+
+ /**
+ * 短时中断严重度
+ */
+ @ApiModelProperty(name = "interruptSeverity", value = "短时中断告严重度")
+ private Integer interruptSeverity;
+
+ /**
+ * 稳态指标评级结果(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;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java
new file mode 100644
index 000000000..86ef168ca
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java
@@ -0,0 +1,140 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author jianghf
+ * 区域告警统计(月)
+ * @TableName r_stat_area_alarm_count_m
+ */
+@Data
+public class RStatAreaAlarmCountMVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 单位ID
+ */
+ @ApiModelProperty(name = "orgNo", value = "单位ID")
+ private String orgNo;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(name = "orgName", value = "单位名称")
+ private String orgName;
+ /**
+ * 生成数据的时间,每月统计一次
+ */
+ @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每月统计一次")
+ private Date dataDate;
+
+ /**
+ * 数据类型(0:主网 1:配网)
+ */
+ @ApiModelProperty(name = "dataType", value = "数据类型(0:主网 1:配网)")
+ private Integer dataType;
+
+ /**
+ * 电压偏差告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "vdevAlarmInfo", value = "电压偏差告警情况(0:否 1:是)")
+ private Integer vdevAlarmInfo;
+
+ /**
+ * 电压偏差告警超标占比
+ */
+ @ApiModelProperty(name = "vdevAlarmRatio", value = "电压偏差告警超标占比")
+ private Integer vdevAlarmRatio;
+
+ /**
+ * 频率偏差告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "freqAlarmInfo", value = "频率偏差告警情况(0:否 1:是)")
+ private Integer freqAlarmInfo;
+
+ /**
+ * 频率偏差告警超标占比
+ */
+ @ApiModelProperty(name = "freqAlarmRatio", value = "频率偏差告警超标占比")
+ private Integer freqAlarmRatio;
+
+ /**
+ * 三相电压不平衡度告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "unbalanceAlarmInfo", value = "三相电压不平衡度告警情况(0:否 1:是)")
+ private Integer unbalanceAlarmInfo;
+
+ /**
+ * 三相电压不平衡度告警超标占比
+ */
+ @ApiModelProperty(name = "unbalanceAlarmRatio", value = "三相电压不平衡度告警超标占比")
+ private Integer unbalanceAlarmRatio;
+
+ /**
+ * 谐波电压告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "vAlarmInfo", value = "谐波电压告警情况(0:否 1:是)")
+ private Integer vAlarmInfo;
+
+ /**
+ * 谐波电压告警超标占比
+ */
+ @ApiModelProperty(name = "vAlarmRatio", value = "谐波电压告警超标占比")
+ private Integer vAlarmRatio;
+
+ /**
+ * 闪变告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "flickerAlarmInfo", value = "闪变告警情况(0:否 1:是)")
+ private Integer flickerAlarmInfo;
+
+ /**
+ * 闪变告警超标占比
+ */
+ @ApiModelProperty(name = "flickerAlarmRatio", value = "闪变告警超标占比")
+ private Integer flickerAlarmRatio;
+
+ /**
+ * 电压暂降告警情况(0:否 1:是)
+ */
+ @ApiModelProperty(name = "sagAlarmInfo", value = "电压暂降告警情况(0:否 1:是)")
+ private Integer sagAlarmInfo;
+
+ /**
+ * 电压暂降告警平均发生次数
+ */
+ @ApiModelProperty(name = "sagAlarmAvgCount", value = "电压暂降告警平均发生次数")
+ private Integer sagAlarmAvgCount;
+
+ /**
+ * 短时中断告警情况(0:否 1:是)
+ */
+
+ @ApiModelProperty(name = "interruptAlarmInfo", value = "短时中断告警情况(0:否 1:是)")
+ private Integer interruptAlarmInfo;
+
+ /**
+ * 短时中断告警平均发生次数
+ */
+ @ApiModelProperty(name = "interruptAlarmAvgCount", value = "短时中断告警平均发生次数")
+ private Integer interruptAlarmAvgCount;
+
+ /**
+ * 稳态指标评级结果(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;
+
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java
new file mode 100644
index 000000000..8795cac7f
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicVO.java
@@ -0,0 +1,186 @@
+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;
+
+import java.io.Serializable;
+
+/**
+ * 变电站母线电压指标年报返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/10/8
+ */
+
+@Data
+@ApiModel(value = "变电站母线电压指标年报返回前端实体类")
+public class RStatBusbarHarmonicVO implements Serializable {
+
+ private static final long serialVersionUID = 835979721790264805L;
+ /**
+ * 部门id
+ */
+ @ApiModelProperty(name = "deptId", value = "部门id")
+ private String deptId;
+
+ /**
+ * 所属单位
+ */
+ @ApiModelProperty(name = "company", value = "单位")
+ private String company;
+
+ /**
+ * 变电站id
+ */
+ @ApiModelProperty(name = "subId", value = "变电站id")
+ private String subId;
+
+ /**
+ * 变电站名称
+ */
+ @ApiModelProperty(name = "subName", value = "变电站名称")
+ private String subName;
+
+ /**
+ * 变电站电压等级
+ */
+ @ApiModelProperty(name = "subVoltageLevel", value = "变电站电压等级")
+ private String subVoltageLevel;
+
+ /**
+ * 母线名称
+ */
+ @ApiModelProperty(name = "busbarName", value = "母线名称")
+ private String busbarName;
+
+ /**
+ * 母线id
+ */
+ @ApiModelProperty(name = "busbarId", value = "母线id")
+ @TableField(value = "busbar_id")
+ private String busbarId;
+
+
+ /**
+ * 生成数据的时间,每年统计一次
+ */
+ @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
+ @TableField(value = "data_date")
+ private String dataDate;
+
+ /**
+ * 电压有效最大值
+ */
+ @ApiModelProperty(name = "vEffectiveMax", value = "电压有效最大值")
+ @TableField(value = "v_effective_max")
+ private Double vEffectiveMax;
+
+ /**
+ * 电压有效最小值
+ */
+ @ApiModelProperty(name = "vEffectiveMin", value = "电压有效最小值")
+ @TableField(value = "v_effective_min")
+ private Double vEffectiveMin;
+
+ /**
+ * 电压有效平均值
+ */
+ @ApiModelProperty(name = "vEffectiveAvg", value = "电压有效平均值")
+ @TableField(value = "v_effective_avg")
+ private Double vEffectiveAvg;
+
+ /**
+ * 电压有效值95概率大值
+ */
+ @ApiModelProperty(name = "vEffective95", value = "电压有效值95概率大值")
+ @TableField(value = "v_effective_95")
+ private Double vEffective95;
+
+ /**
+ * 电压总谐波畸变率最大值
+ */
+ @ApiModelProperty(name = "vThdMax", value = "电压总谐波畸变率最大值")
+ @TableField(value = "v_thd_max")
+ private Double vThdMax;
+
+ /**
+ * 电压总谐波畸变率最小值
+ */
+ @ApiModelProperty(name = "vThdMin", value = "电压总谐波畸变率最小值")
+ @TableField(value = "v_thd_min")
+ private Double vThdMin;
+
+ /**
+ * 电压总谐波畸变率平均值
+ */
+ @ApiModelProperty(name = "vThdAvg", value = "电压总谐波畸变率平均值")
+ @TableField(value = "v_thd_avg")
+ private Double vThdAvg;
+
+ /**
+ * 电压总谐波畸变率95概率大值
+ */
+ @ApiModelProperty(name = "vThd95", value = "电压总谐波畸变率95概率大值")
+ @TableField(value = "v_thd_95")
+ private Double vThd95;
+
+ /**
+ * 三相电压不平衡最大值
+ */
+ @ApiModelProperty(name = "unbalanceMax", value = "三相电压不平衡最大值")
+ @TableField(value = "unbalance_max")
+ private Double unbalanceMax;
+
+ /**
+ * 三相电压不平衡最小值
+ */
+ @ApiModelProperty(name = "unbalanceMin", value = "三相电压不平衡最小值")
+ @TableField(value = "unbalance_min")
+ private Double unbalanceMin;
+
+ /**
+ * 三相电压不平衡平均值
+ */
+ @ApiModelProperty(name = "unbalanceAvg", value = "三相电压不平衡平均值")
+ @TableField(value = "unbalance_avg")
+ private Double unbalanceAvg;
+
+ /**
+ * 三相电压不平衡95概率大值
+ */
+ @ApiModelProperty(name = "unbalance95", value = "三相电压不平衡95概率大值")
+ @TableField(value = "unbalance_95")
+ private Double unbalance95;
+
+ /**
+ * 闪变最大值
+ */
+ @ApiModelProperty(name = "flickerMax", value = "闪变最大值")
+ @TableField(value = "flicker_max")
+ private Double flickerMax;
+
+ /**
+ * 闪变最小值
+ */
+ @ApiModelProperty(name = "flickerMin", value = "闪变最小值")
+ @TableField(value = "flicker_min")
+ private Double flickerMin;
+
+ /**
+ * 闪变平均值
+ */
+ @ApiModelProperty(name = "flickerAvg", value = "闪变平均值")
+ @TableField(value = "flicker_avg")
+ private Double flickerAvg;
+
+ /**
+ * 闪变95概率大值
+ */
+ @ApiModelProperty(name = "flicker95", value = "闪变95概率大值")
+ @TableField(value = "flicker_95")
+ private Double flicker95;
+
+
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java
new file mode 100644
index 000000000..558939945
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java
@@ -0,0 +1,157 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 监测点暂态指标数据统计表(RStatEventOrg)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 18:15:26
+ */
+
+@Data
+@ApiModel("监测点暂态指标数据统计表")
+public class RStatEventOrgVO implements Serializable {
+ private static final long serialVersionUID = -15971491825708754L;
+ /**
+ * 单位ID
+ */
+ @ApiModelProperty(name = "orgNo", value = "单位ID")
+ private String orgNo;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(name = "orgName", value = "单位名称")
+ private String orgName;
+
+ /**
+ * 生成数据的时间,每年统计一次
+ */
+ @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
+ private Date dataDate;
+
+ /**
+ * 日均有效接入监测点数
+ */
+ @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+ private Integer effectiveMeasurementAverage;
+
+ /**
+ * 累计有效接入监测点数
+ */
+ @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+ private Integer effectiveMeasurementAccrued;
+
+ /**
+ * 日均监测到暂态指标的监测点数
+ */
+ @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+ private Integer eventMeasurementAverage;
+
+ /**
+ * 累计监测到暂态指标的监测点数
+ */
+ @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+ private Integer eventMeasurementAccrued;
+
+ /**
+ * 日均暂态超标监测点数占比
+ */
+ @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
+ private Integer eventMeasurementRatioAverage;
+
+ /**
+ * 累计暂态超标监测点数占比
+ */
+ @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
+ private Integer eventMeasurementRatioAccrued;
+
+ /**
+ * 暂态指标类型Id,字典表ID
+ */
+ @ApiModelProperty(name = "eventType", value = "暂态指标类型Id,字典表ID")
+ private String eventType;
+
+ /**
+ * 日均短时中断
+ */
+ @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均暂态指标")
+ private Integer eEventMeasurementAverage;
+
+ /**
+ * 累计短时中断
+ */
+ @ApiModelProperty(name = "eEventMeasurementAccrued", value = "累计暂态指标")
+ private Integer eEventMeasurementAccrued;
+
+ /**
+ * 日均短时中断占比
+ */
+ @ApiModelProperty(name = "eEventMeasurementRatioAverage", value = "日均暂态指标占比")
+ private Double eEventMeasurementRatioAverage;
+
+ /**
+ * 累计短时中断占比
+ */
+ @ApiModelProperty(name = "eEventMeasurementRatioAccrued", value = "累计暂态指标占比")
+ private Double eEventMeasurementRatioAccrued;
+
+
+
+ /**
+ * 暂态指标
+ */
+ @ApiModelProperty(name = "shortInterruptions", value = "短时中断")
+ private List eventStatis;
+
+
+ /**
+ * 暂态指标
+ */
+ @Data
+ public static class EventStatis {
+
+ /**
+ * 字典名称
+ */
+ private String dictDataName;
+
+ /**
+ * 暂态指标类型Id,字典表ID
+ */
+ @ApiModelProperty(name = "eventType", value = "暂态指标类型Id,字典表ID")
+ private String eventType;
+
+ /**
+ * 日均短时中断
+ */
+ @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均暂态指标")
+ private Integer eEventMeasurementAverage;
+
+ /**
+ * 累计短时中断
+ */
+ @ApiModelProperty(name = "eEventMeasurementAccrued", value = "累计暂态指标")
+ private Integer eEventMeasurementAccrued;
+
+ /**
+ * 日均短时中断占比
+ */
+ @ApiModelProperty(name = "eEventMeasurementRatioAverage", value = "日均暂态指标占比")
+ private Double eEventMeasurementRatioAverage;
+
+ /**
+ * 累计短时中断占比
+ */
+ @ApiModelProperty(name = "eEventMeasurementRatioAccrued", value = "累计暂态指标占比")
+ private Double eEventMeasurementRatioAccrued;
+ }
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java
new file mode 100644
index 000000000..cd89d5074
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java
@@ -0,0 +1,87 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 区域分类统计表(RStatOrgY)实体类
+ *
+ * @author yzh
+ * @date 2022/10/10
+ */
+
+@Data
+@ApiModel(value = "区域分类统计表(RStatOrgY)实体类")
+public class RStatOrgVO implements Serializable {
+ private static final long serialVersionUID = 642166320324597986L;
+ /**
+ * 单位ID
+ */
+ @ApiModelProperty(name = "orgNo", value = "单位ID")
+ private String orgNo;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(name = "orgName", value = "单位名称")
+ private String orgName;
+
+ /**
+ * 生成数据的时间
+ */
+ @ApiModelProperty(name = "dataDate", value = "生成数据的时间")
+ private String dataDate;
+
+ /**
+ * 日均有效接入监测点数
+ */
+ @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+ private Integer effectiveMeasurementAverage;
+
+ /**
+ * 累计有效接入监测点数
+ */
+ @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+ private Integer effectiveMeasurementAccrued;
+
+ /**
+ * 日均监测到暂态指标的监测点数
+ */
+ @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+ private Integer eventMeasurementAverage;
+
+ /**
+ * 累计监测到暂态指标的监测点数
+ */
+ @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+ private Integer eventMeasurementAccrued;
+
+ /**
+ * 日均暂态超标监测点数占比
+ */
+ @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
+ private Integer eventMeasurementRatioAverage;
+
+ /**
+ * 累计暂态超标监测点数占比
+ */
+ @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
+ private Integer eventMeasurementRatioAccrued;
+
+ /**
+ * 暂态指标发生频次
+ */
+ @ApiModelProperty(name = "eventFreq", value = "暂态指标发生频次")
+ private Double eventFreq;
+
+ /**
+ * 暂态指标发生次数
+ */
+ @ApiModelProperty(name = "eventCount", value = "暂态指标发生次数")
+ private Integer eventCount;
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java
new file mode 100644
index 000000000..76e6ed277
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java
@@ -0,0 +1,116 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 变电站指标统计表实体类
+ *
+ * @author yzh
+ * @since 2022-10-11 16:15:48
+ */
+@Data
+@ApiModel(value = "变电站指标统计表实体类")
+public class RStatSubstationVO implements Serializable {
+ private static final long serialVersionUID = 117875946877905400L;
+
+ /**
+ * 单位id
+ */
+ @ApiModelProperty(name = "deptId",value = "单位id")
+ private String deptId;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(name = "deptName",value = "单位名称")
+ private String deptName;
+
+ /**
+ * 变电站id
+ */
+ @ApiModelProperty(name = "substationId",value = "变电站id")
+ private String substationId;
+
+ /**
+ * 变电站名称
+ */
+ @ApiModelProperty(name = "substationName",value = "变电站名称")
+ private String substationName;
+
+ /**
+ * 生成数据的时间
+ */
+ @ApiModelProperty(name = "dataDate",value = "生成数据的时间")
+ private String dataDate;
+
+ /**
+ * 日均有效接入监测点数
+ */
+ @ApiModelProperty(name = "effectiveMeasurementAverage",value = "日均有效接入监测点数")
+ private Integer effectiveMeasurementAverage;
+
+ /**
+ * 累计有效接入监测点数
+ */
+ @ApiModelProperty(name = "effectiveMeasurementAccrued",value = "累计有效接入监测点数")
+ private Integer effectiveMeasurementAccrued;
+
+
+ /**
+ * 暂态指标发生次数
+ */
+ @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数")
+ private Integer eventCount;
+
+ /**
+ * 暂态指标发生频次
+ */
+ @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次")
+ private Double eventFreq;
+
+ /**
+ * 短时中断发生次数
+ */
+ @ApiModelProperty(name = "interruptCount",value = "短时中断发生次数")
+ private Integer interruptCount;
+
+ /**
+ * 短时中断发生频次
+ */
+ @ApiModelProperty(name = "interruptFreq",value = "短时中断发生频次")
+ private Double interruptFreq;
+
+
+
+ /**
+ * 电压暂升发生次数
+ */
+ @ApiModelProperty(name = "swellCount",value = "电压暂升发生次数")
+ private Integer swellCount;
+
+ /**
+ * 电压暂升发生频次
+ */
+ @ApiModelProperty(name = "swellFreq",value = "电压暂升发生频次")
+ private Double swellFreq;
+
+ /**
+ * 电压暂降发生次数
+ */
+ @ApiModelProperty(name = "sagCount",value = "电压暂降发生次数")
+ private Integer sagCount;
+
+ /**
+ * 电压暂降发生频次
+ */
+ @ApiModelProperty(name = "sagFreq",value = "电压暂降发生频次")
+ private Double sagFreq;
+
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java
new file mode 100644
index 000000000..5bffbf679
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java
@@ -0,0 +1,46 @@
+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;
+
+/**
+ * @author jianghf
+ * @TableName r_stat_zw_alarm_count_w
+ */
+@Data
+public class RStatZwAlarmCountWVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(name = "orgNo", value = "单位id")
+ private String orgNo;
+
+ @ApiModelProperty(name = "orgName", value = "单位名称")
+ private String orgName;
+
+ @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每周统计一次")
+ private Date dataDate;
+
+ @ApiModelProperty(name = "monitorEffectiveCount", value = "有效监测点数量")
+ private Integer monitorEffectiveCount;
+
+ @ApiModelProperty(name = "warnMonitorCount", value = "告警4次及以上监测点数量")
+ private Integer warnMonitorCount;
+
+ @ApiModelProperty(name = "monitorGradeCount", value = "级别较差监测点数量")
+ private Integer monitorGradeCount;
+
+ @ApiModelProperty(name = "warnMonitorRate", value = "告警四次及以上监测点占比")
+ private Double warnMonitorRate;
+
+ @ApiModelProperty(name = "monitorGradeRate", value = "级别'较差'监测点占比")
+ private Double monitorGradeRate;
+
+
+
+}
\ No newline at end of file
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java
new file mode 100644
index 000000000..9d0d46605
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RmpEventDetailVO.java
@@ -0,0 +1,94 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 监测点暂态事件明细数据(RMpEventDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-10-12 10:30:03
+ */
+
+@Data
+@ApiModel("监测点暂态事件明细数据")
+public class RmpEventDetailVO implements Serializable {
+ private static final long serialVersionUID = 544141879378917668L;
+
+ /**
+ * 单位id
+ */
+ @ApiModelProperty(name = "deptId",value = "单位id")
+ private String deptId;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(name = "deptName",value = "单位名称")
+ private String deptName;
+
+ /**
+ * 暂时事件ID
+ */
+ @ApiModelProperty(name = "eventId",value = "暂时事件ID")
+ private String eventId;
+
+ /**
+ * 监测点ID
+ */
+ @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
+ private String measurementPointId;
+
+ /**
+ * 监测点名称
+ */
+ @ApiModelProperty(name = "measurementPointName",value = "监测点名称")
+ private String measurementPointName;
+
+ /**
+ * 事件类型
+ */
+ @ApiModelProperty(name = "eventType",value = "事件类型")
+ private String eventType;
+
+ /**
+ * 开始时间
+ */
+ @ApiModelProperty(name = "startTime",value = "开始时间")
+ private Long startTime;
+
+ /**
+ * 持续时间
+ */
+ @ApiModelProperty(name = "duration",value = "持续时间")
+ private Double duration;
+
+ /**
+ * 特征幅值
+ */
+ @ApiModelProperty(name = "featureAmplitude",value = "特征幅值")
+ private Double featureAmplitude;
+
+ /**
+ * 相别
+ */
+ @ApiModelProperty(name = "phase",value = "相别")
+ private String phase;
+
+ /**
+ * 事件描述
+ */
+ @ApiModelProperty(name = "eventDescribe",value = "事件描述")
+ private String eventDescribe;
+
+ /**
+ * 波形路径
+ */
+ @ApiModelProperty(name = "wavePath",value = "波形路径")
+ private String wavePath;
+
+}
+
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java
new file mode 100644
index 000000000..1a5ee7b5e
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java
@@ -0,0 +1,55 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class StatationStatVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(name = "PowerId", value = "电站编号")
+ private String PowerId;
+
+ @ApiModelProperty(name = "PowerName", value = "电站名称")
+ private String PowerName;
+
+ @ApiModelProperty(name = "OrgId", value = "单位id")
+ private String OrgId;
+
+ @ApiModelProperty(name = "ShouldBeNum", value = "应设点数量")
+ private Integer ShouldBeNum;
+
+ @ApiModelProperty(name = "VoltageLevel", value = "电压等级")
+ private String VoltageLevel;
+
+ @ApiModelProperty(name = "status", value = "数据状态:0-删除;1-正常;")
+ private Integer status;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(name = "createBy", value = "创建用户")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新用户
+ */
+ @ApiModelProperty(name = "updateBy", value = "更新用户")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ private Date updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java
new file mode 100644
index 000000000..10d8a3062
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/TractionStationVO.java
@@ -0,0 +1,94 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class TractionStationVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(name = "id",value = "牵引站编号")
+ private String id;
+
+ @ApiModelProperty(name = "Name", value = "牵引站名称")
+ private String Name;
+
+ @ApiModelProperty(name = "OrgName", value = "组织机构名称")
+ private String OrgName;
+
+ @ApiModelProperty(name = "OrgId", value = "组织机构ID")
+ private String OrgId;
+
+ @ApiModelProperty(name = "OperationName", value = "运维单位名称")
+ private String OperationName;
+
+ @ApiModelProperty(name = "OperationId", value = "运维单位ID")
+ private String OperationId;
+
+ @ApiModelProperty(name = "VoltageLevel", value = "供电电压等级")
+ private String VoltageLevel;
+
+ @ApiModelProperty(name = "RailwayLineId", value = "铁路线路编号")
+ private String RailwayLineId;
+
+ @ApiModelProperty(name = "RailwayLineName", value = "铁路线路名称")
+ private String RailwayLineName;
+
+ @ApiModelProperty(name = "ConnetGroupWay", value = "牵引站变压器接线方式")
+ private String ConnetGroupWay;
+
+ @ApiModelProperty(name = "RatedCapacity", value = "牵引站变电容量")
+ private Float RatedCapacity;
+
+ @ApiModelProperty(name = "PowerId", value = "供电变电站编号")
+ private String PowerId;
+
+ @ApiModelProperty(name = "PowerName", value = "供电变电站名称")
+ private String PowerName;
+
+ @ApiModelProperty(name = "PowerVoltageLevel", value = "供电变电站电压等级")
+ private String PowerVoltageLevel;
+
+ @ApiModelProperty(name = "IfSpecial", value = "是否专线供电:0-否;1-是;")
+ private Integer IfSpecial;
+
+ @ApiModelProperty(name = "CreatedDate", value = "创建日期")
+ private String CreatedDate;
+
+ @ApiModelProperty(name = "UserTag", value = "用户标签")
+ private String UserTag;
+
+ @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+ private Integer IsUpToGrid;
+
+ @ApiModelProperty(name = "Status", value = "数据状态:0-删除;1-正常")
+ private Integer Status;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(name = "createBy", value = "创建用户")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新用户
+ */
+ @ApiModelProperty(name = "updateBy", value = "更新用户")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ private Date updateTime;
+}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java
deleted file mode 100644
index b420847b2..000000000
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.njcn.device.pms.pojo.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * pqs
- *
- * @author cdf
- * @date 2022/7/7
- */
-@Data
-public class UnitTreeVO {
-
- private String id;
-
- private String pid;
-
- private String name;
-
- private String code;
-
- private List children;
-}
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java
new file mode 100644
index 000000000..5828ef8b5
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/utils/ExcelUtilXlsx.java
@@ -0,0 +1,230 @@
+package com.njcn.device.pms.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
+import org.apache.poi.xssf.usermodel.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+/**
+ * Excel工具类
+ *
+ * @since 2022/7/22 17:06
+ **/
+@Slf4j
+public class ExcelUtilXlsx {
+ /**
+ * 数据写入
+ *
+ * @param title 表格标题
+ * @param colHead 列头(表头)
+ * @param dataList 数据列表
+ * @return 返回表格
+ */
+ public XSSFWorkbook createExcel(String title, String[] colHead, List