Merge remote-tracking branch 'origin/master'

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java

@@ -0,0 +1,301 @@
+package com.njcn.device.biz.utils;
+
+
+public class COverlimit {
+
+    private static int MAX_SCALE_NO = 9;
+    private static int MAXOVERLIMITNUM = 55+16;//WW 2017-08-10 overlimit增加电压偏差的下偏差值,原来个数是53 WW2017-11-29 54->53  新增负序电流 间谐波电压含有率
+    private static float[] fULimit = {
+            2.0f,1.6f,0.8f,10.0f,
+            // 3.0f,2.4f,1.2f,10.0f,
+            3.0f,2.4f,1.2f,10.0f,
+            4.0f,3.2f,1.6f,7.0f,
+            4.0f,3.2f,1.6f,7.0f,
+            5.0f, 4.0f, 2.0f,7.0f,
+            3.0f,2.4f,1.2f,10.0f,
+    };
+    private static float[] fUDevL_Limit = {-3, -7, -10};
+
+    private static float[] fILimit = {
+            12.0f, 9.6f, 6.0f, 9.6f, 4.0f, 6.8f, 3.0f, 3.2f, 2.4f, 4.3f, 2.0f, 3.7f, 1.7f, 1.9f, 1.5f, 2.8f, 1.3f, 2.5f, 1.2f, 1.4f, 1.1f, 2.1f, 1.0f, 1.9f,
+            //	16.0f,13.0f,8.1f,13.0f,5.4f,9.3f,4.1f,4.3f,3.3f,5.9f,2.7f,5.0f,2.3f,2.6f,2.0f,3.8f,1.8f,3.4f,1.6f,1.9f,1.5f,2.8f,1.4f,2.6f,
+            15.0f, 12.0f, 7.7f, 12.0f, 5.1f, 8.8f, 3.8f, 4.1f, 3.1f, 5.6f, 2.6f, 4.7f, 2.2f, 2.5f, 1.9f, 3.6f, 1.7f, 3.2f, 1.5f, 1.8f, 1.4f, 2.7f, 1.3f, 2.5f,
+            26.0f, 20.0f, 13.0f, 20.0f, 8.5f, 15.0f, 6.4f, 6.8f, 5.1f, 9.3f, 4.3f, 7.9f, 3.7f, 4.1f, 3.2f, 6.0f, 2.8f, 5.4f, 2.6f, 2.9f, 2.3f, 4.5f, 2.1f, 4.1f,
+            43.0f, 34.0f, 21.0f, 34.0f, 14.0f, 24.0f, 11.0f, 11.0f, 8.5f, 16.0f, 7.1f, 13.0f, 6.1f, 6.8f, 5.3f, 10.0f, 4.7f, 9.0f, 4.3f, 4.9f, 3.9f, 7.4f, 3.6f, 6.8f,
+            78.0f, 62.0f, 39.0f, 62.0f, 26.0f, 44.0f, 19.0f, 21.0f, 16.0f, 28.0f, 13.0f, 24.0f, 11.0f, 12.0f, 9.7f, 18.0f, 8.6f, 16.0f, 7.8f, 8.9f, 7.1f, 14.0f, 6.5f, 12.0f,
+    };
+
+    private static float[] fILimitCoe = {
+            2.0f, 1.1f, 2.0f, 1.2f, 2.0f, 1.4f, 2.0f, 2.0f, 2.0f, 1.8f, 2.0f, 1.9f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f
+    };
+
+    //间谐波含有率
+    private static float[] InharmLimit1 = {
+            0.16f, 0.16f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 0.4f
+    };
+    private static float[] InharmLimit2 = {
+            0.2f, 0.2f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f
+    };
+
+    private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率
+    {
+        if (nHarm < 0) {
+            return 0.0f;
+        }
+        if (iScaleSelect >= MAX_SCALE_NO) {
+            return 0.0f;
+        }
+        switch (iScaleSelect) {
+            case 6:
+                iScaleSelect = 4;
+                break;
+            case 7:
+                iScaleSelect = 2;
+                break;
+            case 8:
+                iScaleSelect = 0;
+                break;
+        }
+        if (iScaleSelect < 2) {
+            iScaleSelect = 0;
+        }
+        else {
+            iScaleSelect--;
+        }
+        int nSelect = iScaleSelect * 4 + 1;
+        if (nHarm % 2 == 0) {
+            nSelect = iScaleSelect * 4 + 2;
+        }
+
+        return fULimit[nSelect];
+    }
+
+    private static float GetVoltageJBLimit(int iScaleSelect)//谐波畸变率
+    {
+        if (iScaleSelect >= MAX_SCALE_NO)
+            return 0.0f;
+        switch (iScaleSelect) {
+            case 6:
+                iScaleSelect = 4;
+                break;
+            case 7:
+                iScaleSelect = 2;
+                break;
+            case 8:
+                iScaleSelect = 0;
+                break;
+        }
+        if (iScaleSelect < 2) {
+            iScaleSelect = 0;
+        }
+        else {
+            iScaleSelect--;
+        }
+        int nSelect = iScaleSelect * 4;
+        return fULimit[nSelect];
+    }
+
+    private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差
+    {
+        if (iScaleSelect >= MAX_SCALE_NO) {
+            return 0.0f;
+        }
+        switch (iScaleSelect) {
+            case 6:
+                iScaleSelect = 4;
+                break;
+            case 7:
+                iScaleSelect = 2;
+                break;
+            case 8:
+                iScaleSelect = 0;
+                break;
+        }
+        if (iScaleSelect < 2) {
+            iScaleSelect = 0;
+        }
+        else {
+            iScaleSelect--;
+        }
+        int nSelect = iScaleSelect * 4 + 3;
+        return fULimit[nSelect];
+    }
+
+    private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数
+    {
+        if (iScaleSelect >= MAX_SCALE_NO) {
+            return 0.0f;
+        }
+        int nReturn = 0;
+        if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) {
+            nReturn = 1;
+        }
+        else if (iScaleSelect == -1) {
+            nReturn = 2;
+        }
+        return fUDevL_Limit[nReturn];
+    }
+
+    private static float GetCurrentLimit(int nHarm, int iScaleSelect, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
+        if (nHarm < 0) {
+            return 0.0f;
+        }
+        if (iScaleSelect >= MAX_SCALE_NO) {
+            return 0.0f;
+        }
+        switch (iScaleSelect) {
+            case 6:
+                iScaleSelect = 4;
+                break;
+            case 7:
+                iScaleSelect = 2;
+                break;
+            case 8:
+                iScaleSelect = 0;
+                break;
+        }
+        if (iScaleSelect < 2) {
+            iScaleSelect = 0;
+        }
+        else {
+            iScaleSelect--;
+        }
+        int nBaseSelect = nHarm + iScaleSelect * 24;
+        float fRealLimit = fDLRL / fJZRL * fILimit[nBaseSelect];
+        fRealLimit = fRealLimit * (float) Math.pow(fXYRL / fSBRL, 1.0f / fILimitCoe[nHarm]);
+        return fRealLimit;
+    }
+
+    public static float GetFCurrentLimit(String strScale, float fDLRL){
+    	float uL = 0.0f;
+    	switch (strScale) {
+        case "0.38kV":
+        	uL = 0.4f;
+            break;
+        case "6kV":
+        	uL = 6.3f;
+            break;
+        case "10kV":
+        	uL = 10.5f;
+            break;
+        case "20kV":
+        	uL = 21.0f;
+            break;
+        case "35kV":
+        	uL = 36.5f;
+            break;
+        case "66kV":
+        	uL = 69.0f;
+            break;
+        case "110kV":
+        	uL = 115.0f;
+            break;
+        case "220kV":
+        	uL = 230.0f;
+            break;
+        case "330kV":
+        	uL = 345.0f;
+            break;
+        default:
+        	return 0.0f;
+    	}
+
+    	return 2.6f/100 * fDLRL * 1000  / ((float)Math.sqrt(3) * uL);
+    }
+
+    public static float GetInHarm(int i, int iScaleSelect){
+    	if(iScaleSelect == 5){
+    		return InharmLimit1[i];
+    	}else{
+    		return InharmLimit2[i];
+    	}
+    }
+
+    public static int TransStringScaleToInt(String strScale) {
+        if (strScale.equals("110kV")) {
+            return 1;
+        }
+        else if (strScale.equals("35kV") || strScale.equals("66kV")) {
+            return 2;
+        }
+        else if (strScale.equals("10kV")) {
+            return 3;
+        }
+        else if (strScale.equals("6kV")) {
+            return 4;
+        }
+        else if (strScale.equals("0.38kV")) {
+            return 5;
+        }
+        else if (strScale.equals("20kV")) {
+            return 6;
+        }
+        else if (strScale.equals("220kV")) {
+            return -1;
+        }
+
+        return 0;
+    }
+
+    public static float[] GetOverLimit(String strScale, float fDLRL, float fJZRL, float fXYRL, float fSBRL) {
+        int i = 0;
+
+        int nScale = TransStringScaleToInt(strScale);
+
+        float[] fLimit = new float[COverlimit.MAXOVERLIMITNUM];
+        //频率偏差
+        fLimit[0] = 0.2f;
+        //电压偏差
+        fLimit[1] = GetVoltageDevationLimit(nScale);
+        //电压不平衡
+        fLimit[2] = 2.0f;
+        //闪变
+        if (nScale < 2) {
+            fLimit[3] = 1.0f;
+        }
+        else {
+            fLimit[3] = 0.8f;
+        }
+        //畸变率
+        fLimit[4] = GetVoltageJBLimit(nScale);
+        //24谐波电压幅值
+        for (i = 0; i < 24; i++) {
+            fLimit[5 + i] = GetVoltageLimit(i, nScale);
+        }
+        //24谐波电流幅值
+        for (i = 0; i < 24; i++) {
+            fLimit[5 + 24 + i] = GetCurrentLimit(i, nScale, fDLRL, fJZRL, fXYRL, fSBRL);
+        }
+        /****************************
+         * Modify by yexb 20181015
+         *此项为电压下偏差
+         * 增加则MAXOVERLIMITNUM的值为54
+         * 不增加则MAXOVERLIMITNUM的值为53
+         ***************************/
+        fLimit[COverlimit.MAXOVERLIMITNUM-2-16] = GetVoltageDevationLimit_L(nScale);
+
+        //负序电流
+        fLimit[COverlimit.MAXOVERLIMITNUM-1-16] = GetFCurrentLimit(strScale,fDLRL);
+
+        //间谐波电压含有率
+        for (i = 0; i < 16; i++) {
+            fLimit[55 + i] = GetInHarm(i, nScale);
+        }
+
+        return fLimit;
+    }
+
+   /* public void addOverLimit(String lineId, String scaTmp) {
+        Overlimit overlimit = new Overlimit();
+        LineDetail tmp = lineDetailMapper.selectById(lineId);
+        float fDLRL = tmp.getShortCapacity();
+        float fJZRL = tmp.getStandardCapacity();
+        float fXYRL = tmp.getDealCapacity();
+        float fSBRL = tmp.getDevCapacity();
+
+        float[] fLimit = COverlimit.GetOverLimit(scaTmp, fDLRL, fJZRL, fXYRL, fSBRL);
+
+
+        overLimitMapper.insert(overlimit);
+    }*/
+}

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

@@ -5,13 +5,10 @@ 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;
@@ -57,13 +54,5 @@ public interface MonitorClient {
     @PostMapping("getOverLimitData")
     HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id);
 
-    /**
-     * 获取配网所有监测点信息
-     *
-     * @param pwPmsMonitorParam 参数条件
-     * @return 配网所有监测点信息
-     */
-    @PostMapping("/getPwMonitorList")
-    HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
 
 }

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

@@ -3,13 +3,10 @@ package com.njcn.device.pms.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.PmsGeneratrixClientFallbackFactory;
-import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 

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

@@ -2,12 +2,10 @@ package com.njcn.device.pms.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory;
 import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 

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

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

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

@@ -0,0 +1,38 @@
+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.TractionStationClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
+import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
+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 yzh
+ * @date 2022/11/8
+ */
+@FeignClient(
+        value = ServerInfo.DEVICE,
+        path = "/pms/tractionStation",
+        fallbackFactory = TractionStationClientFallbackFactory.class)
+public interface TractionStationClient {
+
+    /**
+     * 获取牵引站详细信息
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.PmsTractionStationDTO>>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    @PostMapping("/getPmsTractionStationInfo")
+    HttpResult<List<PmsTractionStationDTO>> getPmsTractionStationInfo(@RequestBody PmsTractionStationParam param);
+
+
+}

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

@@ -6,10 +6,8 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
-import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
-import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import com.njcn.device.pq.pojo.po.Overlimit;
 import feign.hystrix.FallbackFactory;
@@ -48,11 +46,6 @@ public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClie
                 log.error("{}异常，降级处理，异常为：{}", "根据条件获取监测点信息列表", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
-            @Override
-            public HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
-                log.error("{}异常，降级处理，异常为：{}", "获取配网所有监测点信息", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
 
             @Override
             public HttpResult<Overlimit> getOverLimitData(String id) {

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

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

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

@@ -3,14 +3,12 @@ package com.njcn.device.pms.api.fallback;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.api.PwMonitorClient;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -0,0 +1,40 @@
+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.TractionStationClient;
+import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
+import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
+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/11/8
+ */
+@Slf4j
+@Component
+public class TractionStationClientFallbackFactory implements FallbackFactory<TractionStationClient> {
+    @Override
+    public TractionStationClient 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 TractionStationClient() {
+            @Override
+            public HttpResult<List<PmsTractionStationDTO>> getPmsTractionStationInfo(PmsTractionStationParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "获取牵引站详细信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

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

@@ -19,6 +19,13 @@ public enum PmsDeviceResponseEnum {
     Operation_ITEM_EMPTY("A00361","未查询到指定运维单位"),
     VOLTAGE_EMPTY("A00362","未查询到指定母线"),
     LINE_EMPTY("A00363","未查询到指定线路"),
+    NO_USER_TYPE("A00364","未查询字典用户类型"),
+
+
+
+
+
+
     MODEL_NAME_REPEAT("A00350","名称不可重复");
 
 

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

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

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

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

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

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

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

@@ -0,0 +1,111 @@
+package com.njcn.device.pms.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * (PmsTractionStation)实体类
+ *
+ * @author yzh
+ * @since 2022-11-07 19:50:46
+ */
+@Data
+public class PmsTractionStationDTO implements Serializable {
+    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 Double ratedCapacity;
+    /**
+     * 供电变电站编号
+     */
+    private String powerId;
+    /**
+     * 供电变电站名称
+     */
+    private String powerName;
+    /**
+     * 供电变电站电压等级(字典)
+     */
+    private String powerVoltageLevel;
+    /**
+     * 是否专线供电：0-否；1-是；
+     */
+    private Integer ifSpecial;
+    /**
+     * 创建日期
+     */
+    private Date createdDate;
+    /**
+     * 用户标签
+     */
+    private String userTag;
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+    /**
+     * 数据状态：0-删除；1-正常； 
+     */
+    private Integer status;
+    /**
+     * 创建用户
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新用户
+     */
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
+

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

@@ -28,7 +28,16 @@ public class PwPmsMonitorDTO implements Serializable {
      */
     @ApiModelProperty(name = "orgName",value = "单位名称")
     private String orgName;
-
+    /**
+     * 线路id
+     */
+    @ApiModelProperty(name = "lineId",value = "线路id")
+    private String lineId;
+    /**
+     * 线路名称
+     */
+    @ApiModelProperty(name = "lineName",value = "线路名称")
+    private String lineName;
     /**
      * 监测点类别(字典)
      */
@@ -46,6 +55,16 @@ public class PwPmsMonitorDTO implements Serializable {
      */
     @ApiModelProperty(name = "monitorName", value = "监测点名称")
     private String monitorName;
+    /**
+     * 所属变电站id
+     */
+    @ApiModelProperty(name = "powerId", value = "所属变电站id")
+    private String powerId;
+    /**
+     * 所属变电站名称
+     */
+    @ApiModelProperty(name = "powerName", value = "所属变电站名称")
+    private String powerName;
 
     /**
      * 电压等级(字典)

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

@@ -0,0 +1,27 @@
+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 java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/11/7
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DataQualityDetailsParam extends StatisticsBizBaseParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 核查规则
+     */
+    @ApiModelProperty(name = "checkRules",value = "核查规则")
+    private List<String> checkRules;
+}

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

@@ -2,7 +2,6 @@ package com.njcn.device.pms.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 
@@ -15,6 +14,10 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class GeneratrixWireParam {
 
+    @ApiModelProperty(value = "线路id",required = true)
+    @NotBlank(message = "线路id不可为空")
+    private String wireId;
+
     @ApiModelProperty(value = "线路名称",required = true)
     @NotBlank(message = "线路名称不可为空")
     private String wireName;
@@ -25,12 +28,5 @@ public class GeneratrixWireParam {
 
 
 
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class UpdateGeneratrixWireParam extends GeneratrixWireParam {
 
-        @ApiModelProperty(value = "线路id",required = true)
-        @NotBlank(message = "线路id不可为空")
-        private String wireId;
-    }
 }

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

@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 /**
  * pms-device

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

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

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

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

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

@@ -1,9 +1,7 @@
 package com.njcn.device.pms.pojo.param;
 
-import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * @author hany
@@ -15,64 +13,56 @@ public class PmsTerminalParam {
     @ApiModelProperty(name = "id",value = "终端编号")
     private String id;
 
-    @ApiModelProperty(name = "Name", value = "终端名称")
-    private String Name;
+    @ApiModelProperty(name = "name", value = "终端名称")
+    private String name;
 
-    @ApiModelProperty(name = "OrgName", value = "组织机构名称")
-    private String OrgName;
+    @ApiModelProperty(name = "orgName", value = "组织机构名称")
+    private String orgName;
 
-    @ApiModelProperty(name = "OrgId", value = "组织机构ID")
-    private String OrgId;
+    @ApiModelProperty(name = "orgId", value = "组织机构ID")
+    private String orgId;
 
-    @ApiModelProperty(name = "OperationName", value = "运维单位名称")
-    private String OperationName;
+    @ApiModelProperty(name = "operationName", value = "运维单位名称")
+    private String operationName;
 
-    @ApiModelProperty(name = "OperationId", value = "运维单位ID")
-    private String OperationId;
+    @ApiModelProperty(name = "operationId", value = "运维单位ID")
+    private String operationId;
 
-    @ApiModelProperty(name = "PowerrName", value = "变电站名称")
-    private String PowerrName;
+    @ApiModelProperty(name = "powerrName", value = "变电站名称")
+    private String powerrName;
 
-    @ApiModelProperty(name = "PowerStationId", value = "所属电站ID")
-    private String PowerStationId;
+    @ApiModelProperty(name = "powerStationId", value = "所属电站ID")
+    private String powerStationId;
 
-    @ApiModelProperty(name = "TerminalState", value = "终端状态")
-    private String TerminalState;
+    @ApiModelProperty(name = "terminalState", value = "终端状态")
+    private String terminalState;
 
-    @ApiModelProperty(name = "TerminalLevel", value = "终端级别")
-    private String TerminalLevel;
+    @ApiModelProperty(name = "terminalLevel", value = "终端级别")
+    private String terminalLevel;
 
-    @ApiModelProperty(name = "DeviceModel", value = "装置型号")
-    private String DeviceModel;
+    @ApiModelProperty(name = "deviceModel", value = "装置型号")
+    private String deviceModel;
 
-    @ApiModelProperty(name = "Manufacture", value = "生产厂家")
-    private String Manufacture;
+    @ApiModelProperty(name = "manufacture", value = "生产厂家")
+    private String manufacture;
 
-    @ApiModelProperty(name = "VerificationDate", value = "检定日期")
-    private String VerificationDate;
+    @ApiModelProperty(name = "verificationDate", value = "检定日期")
+    private String verificationDate;
 
-    @ApiModelProperty(name = "UseDate", value = "投用日期")
-    private String UseDate;
+    @ApiModelProperty(name = "useDate", value = "投用日期")
+    private String useDate;
 
-    @ApiModelProperty(name = "InputType", value = "测量信号输入形式")
-    private String InputType;
+    @ApiModelProperty(name = "inputType", value = "测量信号输入形式")
+    private String inputType;
 
-    @ApiModelProperty(name = "Ip", value = "IP地址")
-    private String Ip;
+    @ApiModelProperty(name = "ip", value = "IP地址")
+    private String ip;
 
-    @ApiModelProperty(name = "Port", value = "通信端口")
-    private String Port;
+    @ApiModelProperty(name = "port", value = "通信端口")
+    private String port;
 
-    @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
-    private Integer IsUpToGrid;
+    @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
+    private Integer isUpToGrid;
 
-    /**
-     * 查询数据实体
-     */
-    @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class QueryParam extends BaseParam {
 
-        private Integer Status;
-    }
 }

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

@@ -0,0 +1,30 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 牵引站详细信息前端参数
+ *
+ * @author yzh
+ * @date 2022/11/7
+ */
+
+@Data
+@ApiModel("牵引站详细信息前端参数")
+public class PmsTractionStationParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(name = "orgIds",value = "单位id",required = true)
+    private List<String> orgIds;
+
+
+}

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -19,6 +18,9 @@ public class PwPmsMonitorParam {
     @NotBlank(message = "部门索引不可为空")
     private String orgId;
 
+    @ApiModelProperty(name = "powerId", value = "所属变电站")
+    private List<String> powerId;
+
     @ApiModelProperty(name = "monitorName",value = "监测点名称")
     private String monitorName;
 

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

@@ -0,0 +1,17 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import lombok.Data;
+
+/**
+ * 配网运行指标统计接收参数实体类（用于配网运行指标统计业务）
+ * @Title RDnOperatingParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-11-10 10:13
+ * @Version V1.0
+ */
+@Data
+public class PwRDnOperatingParam extends StatisticsBizBaseParam {
+
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import lombok.Data;
+
+/**
+ * 主网运行指标统计接收参数实体类（用于主网运行指标统计业务）
+ * @Title ROperatingIndexParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-11-09 19:02
+ * @Version V1.0
+ */
+@Data
+public class ROperatingIndexParam extends StatisticsBizBaseParam {
+}

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

@@ -0,0 +1,16 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import lombok.Data;
+
+/**
+ * 配网-告警统计(周)查询参数实体
+ * @Title RStatPwAlarmCountWParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-11-02 19:06
+ * @Version V1.0
+ */
+@Data
+public class RStatPwAlarmCountWParam extends StatisticsBizBaseParam {
+}

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

@@ -0,0 +1,29 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 告警明细参数实体
+ * @Title RStatPwAlarmDetailParam
+ * @Package com.njcn.device.pms.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-11-03 11:04
+ * @Version V1.0
+ */
+@Data
+public class RStatPwAlarmDetailParam extends StatisticsBizBaseParam {
+
+    //告警类型
+    @ApiModelProperty(name = "alarmType", value = "告警类型(字典)")
+    private String alarmType;
+
+    //监测点类型
+    @ApiModelProperty(name = "monitorType", value = "监测点类别(字典:I类、II类、III类)")
+    private String monitorSort;
+
+    //监测点名称
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+}

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

@@ -1,23 +1,13 @@
 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 {
 
-}
+}

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

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

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

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

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

@@ -2,7 +2,6 @@ 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;
 

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

@@ -1,5 +1,6 @@
 package com.njcn.device.pms.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
@@ -17,6 +18,7 @@ import lombok.EqualsAndHashCode;
 public class GeneratrixWire extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @TableId
     private String wireId;
 
     private String wireName;

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

@@ -2,17 +2,14 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hongawen
@@ -76,7 +73,7 @@ public class HarmonicGeneralManagement extends BaseEntity {
     private String plannedState;
 
     /**
-     * 数据状态：0-删除；1-正常； 
+     * 数据状态：0-删除；1-正常；
      */
     private Boolean status;
 

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

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

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

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

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

@@ -2,18 +2,14 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDate;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hongawen
@@ -22,7 +18,7 @@ import lombok.Setter;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("pms_terminal")
-public class Terminal extends BaseEntity {
+public class PmsTerminal extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -117,29 +113,10 @@ public class Terminal extends BaseEntity {
     private Integer isUpToGrid;
 
     /**
-     * 数据状态：0-删除；1-正常； 
+     * 数据状态：0-删除；1-正常；
      */
     private Integer status;
 
-    /**
-     * 创建用户
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新用户
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 
 
 }

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

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

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

@@ -2,17 +2,14 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hongawen
@@ -136,7 +133,7 @@ public class PowerDistributionarea extends BaseEntity {
     private Integer isUpToGrid;
 
     /**
-     * 数据状态：0-删除；1-正常； 
+     * 数据状态：0-删除；1-正常；
      */
     private Integer status;
 

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

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

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

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

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

@@ -0,0 +1,80 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 配网运行指标统计-月表,配网监测指标数据质量统计-月表
+ * @TableName r_dn_operating_index_m
+ */
+@Data
+public class RDnOperatingIndexM implements Serializable {
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 时间
+     */
+    private Date dataDate;
+
+    /**
+     * 监测点类型
+     */
+    private String measurementPointType;
+
+    /**
+     * 在运监测点数
+     */
+    private Integer measurementRunPoints;
+
+    /**
+     * 在线监测点数
+     */
+    private Integer transitMeasurementPoints;
+
+    /**
+     * 有效接入监测点数量
+     */
+    private Integer effectiveAccessMeasurementCount;
+
+    /**
+     * 有效接入率:有效接入监测点数量/在运监测点数
+     */
+    private String effectiveAccessRate;
+
+    /**
+     * 应设点数
+     */
+    private Integer shouldCount;
+
+    /**
+     * 应设点覆盖率
+     */
+    private Integer shouldPointCoverage;
+
+    /**
+     * 数据完整率
+     */
+    private Double dataIntegrityRate;
+
+    /**
+     * 数据准确率
+     */
+    private Double dataRightRate;
+
+    /**
+     * 指标完整率
+     */
+    private Double indexIntegrityRate;
+
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    private Integer isUnusual;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,87 @@
+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;
+
+/**
+ * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 (RDnOperatingIndexM)实体类
+ *
+ * @author yzh
+ * @since 2022-11-04 14:35:45
+ */
+@Data
+@ApiModel("配网运行指标统计")
+public class RDnOperatingPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "")
+    private String orgNo;
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "taDate", value = "")
+    private Date dataDate;
+    /**
+     * 监测点类型
+     */
+    @ApiModelProperty(name = "measurementPointType", value = "监测点类型")
+    private String measurementPointType;
+    /**
+     * 在运监测点数
+     */
+    @ApiModelProperty(name = " measurementRunPoints", value = "在运监测点数")
+    private Integer measurementRunPoints;
+    /**
+     * 在线监测点数
+     */
+    @ApiModelProperty(name = " transitMeasurementPoints", value = "在线监测点数")
+    private Integer transitMeasurementPoints;
+    /**
+     * 有效接入监测点数量
+     */
+    @ApiModelProperty(name = " effectiveAccessMeasurement", value = "有效接入监测点数量")
+    private Integer effectiveAccessMeasurementCount;
+    /**
+     * 有效接入率:有效接入监测点数量/在运监测点数
+     */
+    @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率:有效接入监测点数量/在运监测点数")
+    private String effectiveAccessRate;
+    /**
+     * 应设点数
+     */
+    @ApiModelProperty(name = " shouldCount", value = "应设点数")
+    private Integer shouldCount;
+    /**
+     * 应设点覆盖率
+     */
+    @ApiModelProperty(name = " shouldPointCoverage", value = "应设点覆盖率")
+    private Integer shouldPointCoverage;
+    /**
+     * 数据完整率
+     */
+    @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率")
+    private Double dataIntegrityRate;
+    /**
+     * 数据准确率
+     */
+    @ApiModelProperty(name = "dataRightRate", value = "数据准确率")
+    private Double dataRightRate;
+    /**
+     * 指标完整率
+     */
+    @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率")
+    private Double indexIntegrityRate;
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)")
+    private Integer isUnusual;
+
+}
+

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

@@ -0,0 +1,80 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 配网运行指标统计-年表,配网监测指标数据质量统计-年表
+ * @TableName r_dn_operating_y
+ */
+@Data
+public class RDnOperatingY implements Serializable {
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 时间
+     */
+    private Date dataDate;
+
+    /**
+     * 监测点类型
+     */
+    private String measurementPointType;
+
+    /**
+     * 在运监测点数
+     */
+    private Integer measurementRunPoints;
+
+    /**
+     * 在线监测点数
+     */
+    private Integer transitMeasurementPoints;
+
+    /**
+     * 有效接入监测点数量
+     */
+    private Integer effectiveAccessMeasurementCount;
+
+    /**
+     * 有效接入率
+     */
+    private String effectiveAccessRate;
+
+    /**
+     * 应设点数
+     */
+    private Integer shouldCount;
+
+    /**
+     * 应设点覆盖率
+     */
+    private Integer shouldPointCoverage;
+
+    /**
+     * 数据完整率
+     */
+    private Double dataIntegrityRate;
+
+    /**
+     * 数据准确率
+     */
+    private Double dataRightRate;
+
+    /**
+     * 指标完整率
+     */
+    private Double indexIntegrityRate;
+
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    private Integer isUnusual;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * @author jianghf
  * 监测点告警统计-月表
@@ -117,4 +117,4 @@ public class RMpMonitorAlarmCountM implements Serializable {
      */
     private Integer eventTypeGrade;
 
-}
+}

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 告警明细-日表
  * @TableName r_mp_pw_alarm_detail_d
@@ -46,4 +46,4 @@ public class RMpPwAlarmDetailD implements Serializable {
      */
     private Integer isCreateProblem;
 
-}
+}

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 监测点指标告警明细日表
  * @TableName r_mp_target_warn_d
@@ -79,4 +79,4 @@ public class RMpTargetWarnD implements Serializable {
     private Integer isInterruptWarn;
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -0,0 +1,80 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 主网运行指标统计-月表,主网监测指标数据质量统计-月表
+ * @TableName r_operating_index_m
+ */
+@Data
+public class ROperatingIndexM implements Serializable {
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 时间
+     */
+    private Date dataDate;
+
+    /**
+     * 在运监测点数
+     */
+    private Integer measurementRunPoints;
+
+    /**
+     * 在线监测点数
+     */
+    private Integer transitMeasurementPoints;
+
+    /**
+     * 有效接入监测点数量
+     */
+    private Integer effectiveAccessMeasurementCount;
+
+    /**
+     * 监测终端数
+     */
+    private Integer onlineMeasurementPoints;
+
+    /**
+     * 在线终端数
+     */
+    private Integer onlineMeasurementCount;
+
+    /**
+     * 应设点数
+     */
+    private Integer shouldCount;
+
+    /**
+     * 应设点覆盖率
+     */
+    private Double shouldPointCoverage;
+
+    /**
+     * 数据完整率
+     */
+    private Double dataIntegrityRate;
+
+    /**
+     * 数据准确率
+     */
+    private Double dataRightRate;
+
+    /**
+     * 指标完整率
+     */
+    private Double indexIntegrityRate;
+
+    /**
+     * 数据否异常(0:正常 1:异常)
+     */
+    private Integer isUnusual;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,85 @@
+package com.njcn.device.pms.pojo.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 主网运行指标统计实体类
+ *
+ * @author yzh
+ * @since 2022-11-01 18:47:18
+ */
+
+@Data
+public class ROperatingIndexPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "dataDate", value = "时间")
+    private Date dataDate;
+    /**
+     * 在运监测点数
+     */
+    @ApiModelProperty(name = " measurementRunPoints", value = "在运监测点数")
+    private Integer measurementRunPoints;
+    /**
+     * 在线监测点数
+     */
+    @ApiModelProperty(name = " transitMeasurementPoints", value = "在线监测点数")
+    private Integer transitMeasurementPoints;
+    /**
+     * 有效接入监测点数量
+     */
+    @ApiModelProperty(name = " effectiveAccessMeasurementCount", value = "有效接入监测点数量")
+    private Integer effectiveAccessMeasurementCount;
+    /**
+     * 监测终端数
+     */
+    @ApiModelProperty(name = " onlineMeasurementPoints", value = "监测终端数")
+    private Integer onlineMeasurementPoints;
+    /**
+     * 在线终端数
+     */
+    @ApiModelProperty(name = " onlineMeasurementCount", value = "在线终端数")
+    private Integer onlineMeasurementCount;
+    /**
+     * 应设点数
+     */
+    @ApiModelProperty(name = " shouldCount", value = "应设点数")
+    private Integer shouldCount;
+    /**
+     * 应设点覆盖率
+     */
+    @ApiModelProperty(name = "shouldPointCoverage", value = "应设点覆盖率")
+    private Double shouldPointCoverage;
+    /**
+     * 数据完整率
+     */
+    @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率")
+    private Double dataIntegrityRate;
+    /**
+     * 数据准确率
+     */
+    @ApiModelProperty(name = "dataRightRate", value = "数据准确率")
+    private Double dataRightRate;
+    /**
+     * 指标完整率
+     */
+    @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率")
+    private Double indexIntegrityRate;
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)")
+    private Integer isUnusual;
+}
+

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

@@ -0,0 +1,80 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 主网运行指标统计-年表,主网监测指标数据质量统计-年表
+ * @TableName r_operating_index_y
+ */
+@Data
+public class ROperatingIndexY implements Serializable {
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+
+    /**
+     * 时间
+     */
+    private Date dataDate;
+
+    /**
+     * 在运监测点数
+     */
+    private Integer measurementRunPoints;
+
+    /**
+     * 在线监测点数
+     */
+    private Integer transitMeasurementPoints;
+
+    /**
+     * 有效接入监测点数量
+     */
+    private Integer effectiveAccessMeasurementCount;
+
+    /**
+     * 监测终端数
+     */
+    private Integer onlineMeasurementPoints;
+
+    /**
+     * 在线终端数
+     */
+    private Integer onlineMeasurementCount;
+
+    /**
+     * 应设点数
+     */
+    private Integer shouldCount;
+
+    /**
+     * 应设点覆盖率
+     */
+    private Double shouldPointCoverage;
+
+    /**
+     * 数据完整率
+     */
+    private Double dataIntegrityRate;
+
+    /**
+     * 数据准确率
+     */
+    private Double dataRightRate;
+
+    /**
+     * 指标完整率
+     */
+    private Double indexIntegrityRate;
+
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    private Integer isUnusual;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,71 @@
+package com.njcn.device.pms.pojo.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 监测指标数据质量问题汇总统计-月表(r_quality_parameter_m)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 10:55:22
+ */
+@Data
+public class RQualityParameterPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 单位ID
+     */
+    @ApiModelProperty(name = "orgNo",value = "单位ID")
+    private String orgNo;
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    private Date dataDate;
+    /**
+     * 监测点数量
+     */
+    @ApiModelProperty(name = "measurementCount",value = "监测点数量")
+    private String measurementCount;
+    /**
+     * 有效接入监测点数量
+     */
+    @ApiModelProperty(name = "effectiveAccessMeasurementCount",value = "有效接入监测点数量")
+    private Integer effectiveAccessMeasurementCount;
+    /**
+     * 存在数据质量问题监测点
+     */
+    @ApiModelProperty(name = "problem",value = "存在数据质量问题监测点")
+    private Integer problem;
+    /**
+     * 监测点-母线-变电站匹配个数
+     */
+    @ApiModelProperty(name = "matchingCount",value = "监测点-母线-变电站匹配个数")
+    private String matchingCount;
+    /**
+     * 监测点-母线-变电站匹配个率
+     */
+    @ApiModelProperty(name = "matchingRate",value = "监测点-母线-变电站匹配个率")
+    private String matchingRate;
+    /**
+     * 监测点台账完整率
+     */
+    @ApiModelProperty(name = "monitoringIntegrityRate",value = "监测点台账完整率")
+    private String monitoringIntegrityRate;
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+    /**
+     * 存在数据质量问题监测点同比
+     */
+    @ApiModelProperty(name = "problemYearOnYear", value = "存在数据质量问题监测点同比")
+    private String problemYearOnYear;
+
+}
+

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

@@ -0,0 +1,96 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 16:07:15
+ */
+@Data
+public class RStatAccountCheckDataPO implements Serializable {
+    private static final long serialVersionUID = -1L;
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+    /**
+     * 时间
+     */
+    private Date dataDate;
+    /**
+     * 终端台帐-必填字段为空
+     */
+    private Integer devFieldNull;
+    /**
+     * 终端台帐-投运日期不规范
+     */
+    private Integer devRunTimeAbnormal;
+    /**
+     * 终端台帐-终端类型不正确
+     */
+    private Integer devTypeError;
+    /**
+     * 终端台帐-上次检定日期不合理
+     */
+    private Integer devCheckTimeAbnormal;
+    /**
+     * 终端台帐-IP地址不规范
+     */
+    private Integer devIpError;
+    /**
+     * 监测点台帐-必填字段为空
+     */
+    private Integer measurementFieldNull;
+    /**
+     * 监测点台帐-限值是否合理
+     */
+    private Integer measurementLimitAbnormal;
+    /**
+     * 监测点台帐-监测点名称不规范
+     */
+    private Integer measurementNameAbnormal;
+    /**
+     * 监测点台帐-监测对象名称不规范
+     */
+    private Integer measurementTypeAbnormal;
+    /**
+     * 监测点台帐-容量填写不准确
+     */
+    private Integer measurementCapacityError;
+    /**
+     * 监测点台帐-监测点与终端状态不匹配
+     */
+    private Integer measurementDevNotMatch;
+    /**
+     * 监测点台帐-监测点监测对象类型不准确
+     */
+    private Integer measurementTypeError;
+    /**
+     * 监测点台帐-牵引站监测点冗余
+     */
+    private Integer tractionStationMeasurementRedundancy;
+    /**
+     * 监测点台帐-电气化铁路监测点三个容量填写不准确
+     */
+    private Integer railwayCapacityError;
+    /**
+     * 牵引站-必填字段为空
+     */
+    private Integer tractionStationFieldNull;
+    /**
+     * 牵引站-牵引变容量格式不准确
+     */
+    private Integer tractionStationCapacityError;
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    private String dataType;
+
+
+}
+

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

@@ -1,11 +1,11 @@
 package com.njcn.device.pms.pojo.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 区域告警统计(月)
  * @TableName r_stat_area_alarm_count_m
@@ -112,4 +112,4 @@ public class RStatAreaAlarmCountM implements Serializable {
     private Integer eventTypeGrade;
 
 
-}
+}

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

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

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

@@ -0,0 +1,30 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 监测点台账数据质量问题-核查详情(RStatMeasurementAccountDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-11-04 15:53:10
+ */
+@Data
+public class RStatMeasurementAccountDetailPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 时间
+     */
+    private Date dataDate;
+    /**
+     * 核查规则
+     */
+    private String checkRules;
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+}
+

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

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

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

@@ -0,0 +1,37 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author jianghf
+ * @TableName r_stat_pw_alarm_count_w
+ */
+@Data
+public class RStatPwAlarmCountW implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    private String orgNo;
+
+    /**
+     * 数据生成时间
+     */
+    private Date dataDate;
+
+    /**
+     * 在线监测点数
+     */
+    private Integer onlineMonitorCount;
+
+    /**
+     * 告警监测点数
+     */
+    private Integer alarmMonitorCount;
+
+}

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

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

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

@@ -0,0 +1,111 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 监测指标数据质量核查-年表(RStatTargetCheckDataY)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 19:26:00
+ */
+@Data
+public class RStatTargetCheckDataPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 单位ID
+     */
+    private String orgNo;
+    /**
+     * 时间
+     */
+    private Date dataDate;
+    /**
+     * 基波电压指标数值不合理
+     */
+    private Integer fundamentalVoltageAbnormal;
+    /**
+     * 频率指标数值不合理
+     */
+    private Integer frequencyAbnormal;
+    /**
+     * 电压偏差指标数值不合理
+     */
+    private Integer vDevAbnormal;
+    /**
+     * 谐波电压指标数值不合理
+     */
+    private Integer harmonicVoltageAbnormal;
+    /**
+     * 间谐波电压指标数值不合理
+     */
+    private Integer centreHarmonicVoltage;
+    /**
+     * 三相电压不平衡指标数值不合理
+     */
+    private Integer tpVoltageUnbalance;
+    /**
+     * 电压偏差连续超标
+     */
+    private Integer vDevLastOverlimit;
+    /**
+     * 换流站监测点基波电压无数据或零
+     */
+    private Integer tractionStationMeasurementNone;
+    /**
+     * 电气化铁路监测点基波电压数值不合理或无数值
+     */
+    private Integer railwayFundamentalVoltageAbnormal;
+    /**
+     * 电气化铁路监测点基波电流数值不合理或为0值
+     */
+    private Integer railwayFundamentalCurrentAbnormal;
+    /**
+     * 电气化铁路监测点总有功功率不合理
+     */
+    private Integer railwayTotalActivePowerAbnormal;
+    /**
+     * 电气化铁路监测点谐波电压含有率不合理
+     */
+    private Integer railwayHarmonicVoltageContentAbnormal;
+    /**
+     * 频繁上传暂态事件
+     */
+    private Integer freqUploadEvent;
+    /**
+     * 录波文件未正确上传
+     */
+    private Integer waveUploadError;
+    /**
+     * 暂态事件持续时间不合理
+     */
+    private Integer eventLastTimeAbnormal;
+    /**
+     * 暂态事件类型与特征幅值不一致
+     */
+    private Integer eventTypeAmplitudeAtypism;
+    /**
+     * 暂态事件特征幅值不合理
+     */
+    private Integer eventTypeAmplitudeAbnormal;
+    /**
+     * 暂态事件相别为“未知”或“NONE”
+     */
+    private Integer eventPhaseNone;
+    /**
+     * 运行电压偏高（非实际电压暂升事件）
+     */
+    private Integer runVolatgeUp;
+    /**
+     * 运行电压偏低（非实际电压暂降事件）
+     */
+    private Integer runVolatgeLow;
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    private String dataType;
+
+}
+

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

@@ -0,0 +1,34 @@
+package com.njcn.device.pms.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-11-08 09:03:35
+ */
+@Data
+public class RStatTargetDetailPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 时间
+     */
+    private Date dataDate;
+    /**
+     * 核查规则
+     */
+    private String checkRules;
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+    /**
+     * 指标类型（稳态、暂态指标数据质量问题）
+     */
+    private String targetType;
+}
+

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

@@ -0,0 +1,33 @@
+package com.njcn.device.pms.pojo.po;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 牵引站台账数据质量问题-核查详情(RStatTractionStationAccountDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-11-09 09:42:42
+ */
+@Data
+@ApiModel("牵引站台账数据质量问题-核查详情")
+public class RStatTractionStationAccountDetailPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 时间
+     */
+    private Date dataDate;
+    /**
+     * 核查规则
+     */
+    private String checkRules;
+    /**
+     * 牵引站ID
+     */
+    private String substationId;
+
+}
+

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

@@ -2,13 +2,12 @@ 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
@@ -42,4 +41,4 @@ public class RStatZwAlarmCountW implements Serializable {
      */
     private Integer monitorGradeCount;
 
-}
+}

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

@@ -2,19 +2,16 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hongawen
@@ -113,7 +110,7 @@ public class SourceManagement extends BaseEntity {
     private LocalDate filingDate;
 
     /**
-     * 数据状态：0-删除；1-正常； 
+     * 数据状态：0-删除；1-正常；
      */
     private Boolean status;
 

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

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

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

@@ -2,17 +2,14 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hongawen
@@ -91,7 +88,7 @@ public class StatisticsRunMonitor extends BaseEntity {
     private LocalDateTime dataDate;
 
     /**
-     * 数据状态：0-删除；1-正常； 
+     * 数据状态：0-删除；1-正常；
      */
     private Boolean status;
 

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

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

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

@@ -2,17 +2,14 @@ package com.njcn.device.pms.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author hongawen
@@ -116,7 +113,7 @@ public class TractionStation extends BaseEntity {
     private Integer isUpToGrid;
 
     /**
-     * 数据状态：0-删除；1-正常； 
+     * 数据状态：0-删除；1-正常；
      */
     private Integer status;
 

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

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

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

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

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

@@ -0,0 +1,25 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * pms-device
+ * 发电用户用电用户
+ * @author cdf
+ * @date 2022/11/15
+ */
+@Data
+public class DoubleUserVO {
+
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+
+    @ApiModelProperty(value = "用户编号")
+    private String id;
+
+    @ApiModelProperty(value = "用户类型 0.用电 1.发电")
+    private Integer type;
+
+
+}

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

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

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

@@ -0,0 +1,57 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * * 配网运行指标统计返回实体类（用于配网运行指标统计业务）
+ * @Title PwRDnOperatingIndexCommonVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-11-10 14:09
+ * @Version V1.0
+ */
+@Data
+public class PwRDnOperatingIndexCommonVO {
+
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
+    private String orgNo;
+
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
+    @ApiModelProperty(name = "dataDate", value = "时间")
+    private Date dataDate;
+
+    @ApiModelProperty(name = " measurementPointsOne", value = "I监测点数")
+    private Integer measurementPointsOne;
+
+    @ApiModelProperty(name = " measurementPointsTwo", value = "II监测点数")
+    private Integer measurementPointsTwo;
+
+    @ApiModelProperty(name = " measurementPointsThree", value = "III监测点数")
+    private Integer measurementPointsThree;
+
+    @ApiModelProperty(name = " shouldCountOne", value = "I类应设点数")
+    private Integer shouldCountOne;
+
+    @ApiModelProperty(name = " shouldCountTwo", value = "II类应设点数")
+    private Integer shouldCountTwo;
+
+    @ApiModelProperty(name = " shouldCountThree", value = "III类应设点数")
+    private Integer shouldCountThree;
+
+    @ApiModelProperty(name = "shouldPointCoverage", value = "应设点覆盖率")
+    private Double shouldPointCoverage;
+
+    @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率")
+    private Double effectiveAccessRate;
+
+    @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率")
+    private Double dataIntegrityRate;
+
+    @ApiModelProperty(name = "dataRightRate", value = "数据准确率")
+    private Double dataRightRate;
+}

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

@@ -0,0 +1,112 @@
+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
+ * @date 2022/11/4
+ */
+
+@Data
+@ApiModel("获取配网数据质量-监测指标数据质量统计返回前端实体类")
+public class PwRDnOperatingVO 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;
+
+    /**
+     * 监测点数量
+     */
+    @ApiModelProperty(name = "measurementCount", value = "监测点数量")
+    private String measurementCount;
+
+    /**
+     * 有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveAccessMeasurementCount", value = "有效接入监测点数")
+    private String effectiveAccessMeasurementCount;
+
+    /**
+     * 有效接入监测点数同比
+     */
+    @ApiModelProperty(name = "effectiveAccessMeasurementCountYearOnYear", value = "有效接入监测点数同比")
+    private String effectiveAccessMeasurementCountYearOnYear;
+
+    /**
+     * 有效接入监测点数环比
+     */
+    @ApiModelProperty(name = "effectiveAccessMeasurementCountRingRatio", value = "有效接入监测点数环比")
+    private String effectiveAccessMeasurementCountRingRatio;
+
+    /**
+     * 有效接入率
+     */
+    @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率")
+    private String effectiveAccessRate;
+
+    /**
+     * 有效接入率同比
+     */
+    @ApiModelProperty(name = "effectiveAccessRateYearOnYear", value = "有效接入率同比")
+    private String effectiveAccessRateYearOnYear;
+
+    /**
+     * 有效接入率环比
+     */
+    @ApiModelProperty(name = "effectiveAccessRateRingRatio", value = "有效接入率环比")
+    private String effectiveAccessRateRingRatio;
+
+    /**
+     * 数据完整率
+     */
+    @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率")
+    private String dataIntegrityRate;
+
+    /**
+     * 数据完整绿同比
+     */
+    @ApiModelProperty(name = "dataIntegrityRateYearOnYear", value = "数据完整绿同比")
+    private String dataIntegrityRateYearOnYear;
+
+    /**
+     * 数据完整绿环比
+     */
+    @ApiModelProperty(name = "dataIntegrityRateRingRatio", value = "数据完整绿环比")
+    private String dataIntegrityRateRingRatio;
+
+    /**
+     * 指标完整率
+     */
+    @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率")
+    private String indexIntegrityRate;
+
+    /**
+     * 数据是否异常
+     */
+    @ApiModelProperty(name = "isUnusual", value = "数据是否异常")
+    private String isUnusual;
+}

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

@@ -0,0 +1,161 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 监测点告警统计-月表（配网）
+ * @Title PwRMpMonitorAlarmCountMVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-11-01 19:01
+ * @Version V1.0
+ */
+@Data
+public class PwRMpMonitorAlarmCountMVO 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 = "powerId", value = "所属变电站id")
+    private String powerId;
+
+    @ApiModelProperty(name = "powerName", value = "所属变电站名称")
+    private String powerName;
+
+    @ApiModelProperty(name = "PowerDistributionAreaId", value = "所属台区id")
+    private String powerDistributionAreaId; //台区id
+
+    @ApiModelProperty(name = "PowerDistributionAreaName", value = "所属台区名称")
+    private String powerDistributionAreaName; //台区名称
+
+    @ApiModelProperty(name = "powerClientId", value = "用户id")
+    private String powerClientId;
+
+    @ApiModelProperty(name = "powerClientName", value = "用户名称")
+    private String powerClientName;
+
+    @ApiModelProperty(name = "", value = "监测点类别(字典id)")
+    private String monitorSort;
+
+    @ApiModelProperty(name = "voltage_Level", value = "电压等级(字典id)")
+    private String voltageLevel;
+
+    @ApiModelProperty(name = "measurementPointId", value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+    /**
+     * 生成数据的时间,每月统计一次
+     */
+    @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;
+}

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

@@ -0,0 +1,56 @@
+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
+ * @date 2022/11/7
+ */
+
+@Data
+@ApiModel("获取配网数据质量-台账数据质量统计返回前端实体类")
+public class PwRQualityParameterVO implements Serializable {
+
+    /**
+     * 单位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 = "measurementCount", value = "监测点数量")
+    private String measurementCount;
+
+    /**
+     * 监测点台账完整数量
+     */
+    @ApiModelProperty(name = "measurementCompleteQuantity", value = "监测点台账完整数量")
+    private String measurementCompleteQuantity;
+
+    /**
+     * 监测点台帐完整率
+     */
+    @ApiModelProperty(name = "monitoringIntegrityRate", value = "监测点台帐完整率")
+    private String monitoringIntegrityRate;
+}

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

@@ -0,0 +1,129 @@
+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;
+
+/**
+ * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 16:07:15
+ */
+@Data
+@ApiModel("台账类数据质量核查返回前端实体类")
+public class PwRStatAccountCheckDataVO 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;
+
+    /**
+     * 终端台帐-必填字段为空
+     */
+    @ApiModelProperty(name = "devFieldNull", value = "终端台帐-必填字段为空")
+    private Integer devFieldNull;
+
+    /**
+     * 终端台帐-投运日期不规范
+     */
+    @ApiModelProperty(name = "devRunTimeAbnormal", value = "终端台帐-投运日期不规范")
+    private Integer devRunTimeAbnormal;
+
+    /**
+     * 终端台帐-终端类型不正确
+     */
+    @ApiModelProperty(name = "devTypeError", value = "终端台帐-终端类型不正确")
+    private Integer devTypeError;
+
+    /**
+     * 终端台帐-上次检定日期不合理
+     */
+    @ApiModelProperty(name = "devCheckTimeAbnormal", value = "终端台帐-上次检定日期不合理")
+    private Integer devCheckTimeAbnormal;
+
+    /**
+     * 终端台帐-IP地址不规范
+     */
+    @ApiModelProperty(name = "devIpError", value = "终端台帐-IP地址不规范")
+    private Integer devIpError;
+
+    /**
+     * 监测点台帐-必填字段为空
+     */
+    @ApiModelProperty(name = "measurementFieldNull", value = "监测点台帐-必填字段为空")
+    private Integer measurementFieldNull;
+
+    /**
+     * 监测点台帐-监测点名称不规范
+     */
+    @ApiModelProperty(name = "measurementNameAbnormal", value = "监测点台帐-监测点名称不规范")
+    private Integer measurementNameAbnormal;
+
+    /**
+     * 监测点台帐-监测对象名称不规范
+     */
+    @ApiModelProperty(name = "measurementTypeAbnormal", value = "监测点台帐-监测对象名称不规范")
+    private Integer measurementTypeAbnormal;
+
+    /**
+     * 监测点台帐-容量填写不准确
+     */
+    @ApiModelProperty(name = "measurementCapacityError", value = "监测点台帐-容量填写不准确")
+    private Integer measurementCapacityError;
+
+    /**
+     * 监测点台帐-监测点与终端状态不匹配
+     */
+    @ApiModelProperty(name = "measurementDevNotMatch", value = "监测点台帐-监测点与终端状态不匹配")
+    private Integer measurementDevNotMatch;
+
+    /**
+     * 监测点台帐-监测点监测对象类型不准确
+     */
+    @ApiModelProperty(name = "measurementTypeError", value = "监测点台帐-监测点监测对象类型不准确")
+    private Integer measurementTypeError;
+
+    /**
+     * 监测点台帐-牵引站监测点冗余
+     */
+    @ApiModelProperty(name = "tractionStationMeasurementRedundancy", value = "监测点台帐-牵引站监测点冗余")
+    private Integer tractionStationMeasurementRedundancy;
+
+    /**
+     * 监测点台帐-电气化铁路监测点三个容量填写不准确
+     */
+    @ApiModelProperty(name = "railwayCapacityError", value = "监测点台帐-电气化铁路监测点三个容量填写不准确")
+    private Integer railwayCapacityError;
+
+    /**
+     * 监测点台帐-牵引站信息缺失
+     */
+    @ApiModelProperty(name = "tractionStationMeasurementMissing",value = "监测点台帐-牵引站信息缺失")
+    private Integer tractionStationMeasurementMissing;
+
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+}
+

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

@@ -0,0 +1,67 @@
+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
+ * @date 2022/11/4
+ */
+@Data
+@ApiModel("获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题返回前端实体类")
+public class PwRStatMeasurementAccountDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName",value = "单位名称")
+    private String orgName;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    private Date dataDate;
+
+    /**
+     * 核查规则
+     */
+    @ApiModelProperty(name = "checkRules",value = "核查规则")
+    private String checkRules;
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerName",value = "变电站名称")
+    private String powerName;
+    /**
+     * 中压线路
+     */
+    @ApiModelProperty(name = "mediumVoltageLine",value = "中压线路")
+    private String mediumVoltageLine;
+    /**
+     * 台区名称
+     */
+    @ApiModelProperty(name = "platformAreaName",value = "台区名称")
+    private String platformAreaName;
+
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(name = "monitorId",value = "监测点id")
+    private String monitorId;
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "monitorName",value = "监测点名称")
+    private String monitorName;
+    /**
+     * 监测点电压等级
+     */
+    @ApiModelProperty(name = "monitorVoltageLevel",value = "监测点电压等级")
+    private String monitorVoltageLevel;
+}

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

@@ -0,0 +1,72 @@
+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;
+
+/**
+ * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-11-08 09:03:35
+ */
+@Data
+@ApiModel("获取配网数据质量-稳态指标类数据质量问题查询返回前端实体类")
+public class PwRStatTargetDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "dataDate", value = "时间")
+    private Date dataDate;
+    /**
+     * 核查规则
+     */
+    @ApiModelProperty(name = "checkRules", value = "核查规则")
+    private String checkRules;
+    /**
+     * 地市公司
+     */
+    @ApiModelProperty(name = "cityCompany",value = "地市公司")
+    private String cityCompany;
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerName",value = "变电站名称")
+    private String powerName;
+    /**
+     * 中压线路
+     */
+    @ApiModelProperty(name = "mediumVoltageLine",value = "中压线路")
+    private String mediumVoltageLine;
+    /**
+     * 台区名称
+     */
+    @ApiModelProperty(name = "platformAreaName",value = "台区名称")
+    private String platformAreaName;
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "monitorId", value = "监测点ID")
+    private String monitorId;
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+    /**
+     * 监测点电压等级
+     */
+    @ApiModelProperty(name = "monitorVoltageLevel", value = "监测点电压等级")
+    private String monitorVoltageLevel;
+    /**
+     * 指标类型（稳态、暂态指标数据质量问题）
+     */
+    @ApiModelProperty(name = "targetType", value = "指标类型（稳态、暂态指标数据质量问题）")
+    private String targetType;
+}
+

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

@@ -8,7 +8,7 @@ import java.util.Date;
 
 /**
  * @author jianghf
- * 监测点告警统计-月表
+ * 监测点告警统计-月表（主网）
  * @TableName r_mp_monitor_alarm_count_m
  */
 @Data

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

@@ -0,0 +1,82 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 主网运行指标统计返回实体类（用于主网运行指标统计业务）
+ * @Title ROperatingIndexCommonVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-11-09 20:03
+ * @Version V1.0
+ */
+
+@Data
+public class ROperatingIndexCommonVO {
+    /**
+     * 单位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 = " measurementRunPoints", value = "在运监测点数(监测点数)")
+    private Integer measurementRunPoints;
+    /**
+     * 在线监测点数
+     */
+    @ApiModelProperty(name = " transitMeasurementPoints", value = "在线监测点数")
+    private Integer transitMeasurementPoints;
+
+    @ApiModelProperty(name = " transitMeasurementRate", value = "在线监测率")
+    private Double transitMeasurementRate;
+    /**
+     * 在线终端数
+     */
+    @ApiModelProperty(name = " onlineMeasurementCount", value = "在线终端数")
+    private Integer onlineMeasurementCount;
+    /**
+     * 应设点数
+     */
+    @ApiModelProperty(name = " shouldCount", value = "应设点数")
+    private Integer shouldCount;
+
+    /**
+     * 数据完整率
+     */
+    @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率")
+    private Double dataIntegrityRate;
+    /**
+     * 数据准确率
+     */
+    @ApiModelProperty(name = "dataRightRate", value = "数据准确率")
+    private Double dataRightRate;
+
+    /**
+     * 应设点覆盖率
+     */
+    @ApiModelProperty(name = "shouldPointCoverage", value = "应设点覆盖率")
+    private Double shouldPointCoverage;
+    /**
+     * 指标完整率
+     */
+    @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率")
+    private Double indexIntegrityRate;
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)")
+    private Integer isUnusual;
+}

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

@@ -0,0 +1,74 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 主网运行指标统计返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/11/1
+ */
+@Data
+public class ROperatingIndexVO 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;
+
+    /**
+     * 监测点数量
+     */
+    @ApiModelProperty(name = "measurementCount", value = "监测点数量")
+    private Integer measurementCount;
+
+    /**
+     * 有效接入监测点数量
+     */
+    @ApiModelProperty(name = " effectiveAccessMeasurementCount", value = "有效接入监测点数量")
+    private Integer effectiveAccessMeasurementCount;
+    /**
+     * 有效接入率【有效接入监测点数量/在运监测点数】
+     */
+    @ApiModelProperty(name = "effectiveAccessRate", value = "有效接入率【有效接入监测点数量/在运监测点数】")
+    private Double effectiveAccessRate;
+    /**
+     * 数据完整率
+     */
+    @ApiModelProperty(name = "dataIntegrityRate", value = "数据完整率")
+    private Double dataIntegrityRate;
+    /**
+     * 指标完整率
+     */
+    @ApiModelProperty(name = "indexIntegrityRate", value = "指标完整率")
+    private Double indexIntegrityRate;
+    /**
+     * 数据是否异常(0:正常 1:异常)
+     */
+    @ApiModelProperty(name = " isUnusual", value = "数据是否异常(0:正常 1:异常)")
+    private Integer isUnusual;
+}
+
+
+
+
+

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

@@ -0,0 +1,58 @@
+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
+ * @date 2022/11/3
+ */
+
+@Data
+@ApiModel("监测指标数据质量问题汇总统计返回前端实体类")
+public class RQualityParameterPollVO 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 = "dataDate", value = "时间")
+    private Date dataDate;
+    /**
+     * 有效接入监测点数量
+     */
+    @ApiModelProperty(name = "effectiveAccessMeasurementCount", value = "有效接入监测点数量")
+    private Integer effectiveAccessMeasurementCount;
+    /**
+     * 存在数据质量问题监测点
+     */
+    @ApiModelProperty(name = "problem", value = "存在数据质量问题监测点")
+    private Integer problem;
+    /**
+     * 存在数据质量问题监测点占比
+     */
+    @ApiModelProperty(name = "problemProportion", value = "存在数据质量问题监测点占比")
+    private Double problemProportion;
+
+    /**
+     * 存在数据质量问题监测点同比
+     */
+    @ApiModelProperty(name = "problemYearOnYear", value = "存在数据质量问题监测点同比")
+    private String problemYearOnYear;
+}

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

@@ -0,0 +1,70 @@
+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;
+
+/**
+ * 监测指标数据质量问题汇总统计-月表(r_quality_parameter_m)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 10:55:22
+ */
+@Data
+@ApiModel("监测指标数据质量问题汇总统计")
+public class RQualityParameterVO 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;
+
+    /**
+     * 监测点数量
+     */
+    @ApiModelProperty(name = "measurementCount",value = "监测点数量")
+    private String measurementCount;
+
+    /**
+     * 监测点-母线-变电站匹配个数
+     */
+    @ApiModelProperty(name = "matchingCount",value = "监测点-母线-变电站匹配个数")
+    private String matchingCount;
+
+    /**
+     * 监测点-母线-变电站匹配个率
+     */
+    @ApiModelProperty(name = "matchingRate",value = "监测点-母线-变电站匹配个率")
+    private String matchingRate;
+
+    /**
+     * 监测点台账完整率
+     */
+    @ApiModelProperty(name = "monitoringIntegrityRate",value = "监测点台账完整率")
+    private String monitoringIntegrityRate;
+
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+}
+

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

@@ -0,0 +1,153 @@
+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;
+
+/**
+ * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 16:07:15
+ */
+@Data
+@ApiModel("台账类数据质量核查返回前端实体类")
+public class RStatAccountCheckDataVO 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;
+
+    /**
+     * 终端台帐-必填字段为空
+     */
+    @ApiModelProperty(name = "devFieldNull", value = "终端台帐-必填字段为空")
+    private Integer devFieldNull;
+
+    /**
+     * 终端台帐-投运日期不规范
+     */
+    @ApiModelProperty(name = "devRunTimeAbnormal", value = "终端台帐-投运日期不规范")
+    private Integer devRunTimeAbnormal;
+
+    /**
+     * 终端台帐-终端类型不正确
+     */
+    @ApiModelProperty(name = "devTypeError", value = "终端台帐-终端类型不正确")
+    private Integer devTypeError;
+
+    /**
+     * 终端台帐-上次检定日期不合理
+     */
+    @ApiModelProperty(name = "devCheckTimeAbnormal", value = "终端台帐-上次检定日期不合理")
+    private Integer devCheckTimeAbnormal;
+
+    /**
+     * 终端台帐-IP地址不规范
+     */
+    @ApiModelProperty(name = "devIpError", value = "终端台帐-IP地址不规范")
+    private Integer devIpError;
+
+    /**
+     * 监测点台帐-必填字段为空
+     */
+    @ApiModelProperty(name = "measurementFieldNull", value = "监测点台帐-必填字段为空")
+    private Integer measurementFieldNull;
+
+    /**
+     * 监测点台帐-限值是否合理
+     */
+    @ApiModelProperty(name = "measurementLimitAbnormal", value = "监测点台帐-限值是否合理")
+    private Integer measurementLimitAbnormal;
+
+    /**
+     * 监测点台帐-监测点名称不规范
+     */
+    @ApiModelProperty(name = "measurementNameAbnormal", value = "监测点台帐-监测点名称不规范")
+    private Integer measurementNameAbnormal;
+
+    /**
+     * 监测点台帐-监测对象名称不规范
+     */
+    @ApiModelProperty(name = "measurementTypeAbnormal", value = "监测点台帐-监测对象名称不规范")
+    private Integer measurementTypeAbnormal;
+
+    /**
+     * 监测点台帐-容量填写不准确
+     */
+    @ApiModelProperty(name = "measurementCapacityError", value = "监测点台帐-容量填写不准确")
+    private Integer measurementCapacityError;
+
+    /**
+     * 监测点台帐-监测点与终端状态不匹配
+     */
+    @ApiModelProperty(name = "measurementDevNotMatch", value = "监测点台帐-监测点与终端状态不匹配")
+    private Integer measurementDevNotMatch;
+
+    /**
+     * 监测点台帐-监测点监测对象类型不准确
+     */
+    @ApiModelProperty(name = "measurementTypeError", value = "监测点台帐-监测点监测对象类型不准确")
+    private Integer measurementTypeError;
+
+    /**
+     * 监测点台帐-牵引站监测点冗余
+     */
+    @ApiModelProperty(name = "tractionStationMeasurementRedundancy", value = "监测点台帐-牵引站监测点冗余")
+    private Integer tractionStationMeasurementRedundancy;
+
+    /**
+     * 监测点台帐-电气化铁路监测点三个容量填写不准确
+     */
+    @ApiModelProperty(name = "railwayCapacityError", value = "监测点台帐-电气化铁路监测点三个容量填写不准确")
+    private Integer railwayCapacityError;
+
+    /**
+     * 监测点台帐-牵引站信息缺失
+     */
+    @ApiModelProperty(name = "tractionStationMeasurementMissing",value = "监测点台帐-牵引站信息缺失")
+    private Integer tractionStationMeasurementMissing;
+
+    /**
+     * 牵引站-必填字段为空
+     */
+    @ApiModelProperty(name = "tractionStationFieldNull", value = "牵引站-必填字段为空")
+    private Integer tractionStationFieldNull;
+
+    /**
+     * 牵引站-牵引变容量格式不准确
+     */
+    @ApiModelProperty(name = "tractionStationCapacityError", value = "牵引站-牵引变容量格式不准确")
+    private Integer tractionStationCapacityError;
+
+    /**
+     * 牵引站-信息冗余
+     */
+    @ApiModelProperty(name = "tractionStationInfoRedundancy",value = "牵引站-信息冗余")
+    private Integer tractionStationInfoRedundancy;
+
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+}
+

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

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

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

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

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

@@ -0,0 +1,70 @@
+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
+ * @date 2022/11/4
+ */
+@Data
+@ApiModel("获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题返回前端实体类")
+public class RStatMeasurementAccountDetailVO 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 = "dataDate",value = "时间")
+    private Date dataDate;
+
+    /**
+     * 核查规则
+     */
+    @ApiModelProperty(name = "checkRules",value = "核查规则")
+    private String checkRules;
+
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(name = "powerId",value = "变电站id")
+    private String powerId;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerName",value = "变电站名称")
+    private String powerName;
+
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(name = "monitorId",value = "监测点id")
+    private String monitorId;
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "monitorName",value = "监测点名称")
+    private String monitorName;
+    /**
+     * 监测点电压等级
+     */
+    @ApiModelProperty(name = "monitorVoltageLevel",value = "监测点电压等级")
+    private String monitorVoltageLevel;
+}

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 区域分类统计表(RStatOrgY)实体类
@@ -84,4 +83,4 @@ public class RStatOrgVO implements Serializable {
     @ApiModelProperty(name = "eventCount", value = "暂态指标发生次数")
     private Integer eventCount;
 
-}
+}

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

@@ -0,0 +1,54 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Title RStatPwAlarmCountWVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-11-02 15:50
+ * @Version V1.0
+ */
+@Data
+public class RStatPwAlarmCountWVO 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;
+
+    /**
+     * 在线监测点数
+     */
+    @ApiModelProperty(name = "onlineMonitorCount", value = "在线监测点数")
+    private Integer onlineMonitorCount;
+
+    /**
+     * 告警监测点数
+     */
+    @ApiModelProperty(name = "alarmMonitorCount", value = "告警检测点数")
+    private Integer alarmMonitorCount;
+
+    @ApiModelProperty(name = "alarmMonitorRate", value = "告警监测点占比")
+    private Double alarmMonitorRate;
+
+    @ApiModelProperty(name = "alarmMonitorRateYoy", value = "告警监测点占比同比")
+    private Double alarmMonitorRateYoy;
+}

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

@@ -0,0 +1,63 @@
+package com.njcn.device.pms.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 监测点指标告警明细
+ * @Title RStatPwAlarmDetailVO
+ * @Package com.njcn.device.pms.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-11-03 11:41
+ * @Version V1.0
+ */
+@Data
+public class RStatPwAlarmDetailVO {
+
+    @ApiModelProperty(name = "orgId", value = "单位id")
+    private String orgId; //单位id
+
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName; //单位name
+
+    @ApiModelProperty(name = "powerId", value = "所属变电站id")
+    private String powerId;
+
+    @ApiModelProperty(name = "powerName", value = "所属变电站名称")
+    private String powerName;
+
+    @ApiModelProperty(name = "PowerDistributionAreaId", value = "所属台区id")
+    private String powerDistributionAreaId; //台区id
+
+    @ApiModelProperty(name = "PowerDistributionAreaName", value = "所属台区名称")
+    private String powerDistributionAreaName; //台区名称
+
+    @ApiModelProperty(name = "powerClientId", value = "用户id")
+    private String powerClientId;
+
+    @ApiModelProperty(name = "powerClientName", value = "用户名称")
+    private String powerClientName;
+
+    @ApiModelProperty(name = "", value = "监测点类别(字典id)")
+    private String monitorSort;
+
+    @ApiModelProperty(name = "voltage_Level", value = "监测点电压等级(字典id)")
+    private String voltageLevel;
+
+    @ApiModelProperty(name = "measurementPointId", value = "监测点ID")
+    private String measurementPointId;
+
+    @ApiModelProperty(name = "measurementPointName", value = "监测点名称")
+    private String measurementPointName;
+
+    @ApiModelProperty(name = "dataDate", value = "告警时间")
+    private Date dataDate;
+
+    @ApiModelProperty(name = "alarmType", value = "告警类型(字典id)")
+    private String alarmType;
+
+    @ApiModelProperty(name = "alarmInfo", value = "告警描述")
+    private String alarmInfo;
+}

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

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

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

@@ -0,0 +1,143 @@
+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;
+
+/**
+ * 监测指标数据质量核查-年表(RStatTargetCheckDataY)实体类
+ *
+ * @author yzh
+ * @since 2022-11-02 19:26:00
+ */
+@Data
+@ApiModel("监测指标数据质量核查返回前端实体类")
+public class RStatTargetCheckDataVO 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;
+    /**
+     * 基波电压指标数值不合理
+     */
+    @ApiModelProperty(name = "fundamentalVoltageAbnormal", value = "基波电压指标数值不合理")
+    private Integer fundamentalVoltageAbnormal;
+    /**
+     * 频率指标数值不合理
+     */
+    @ApiModelProperty(name = "frequencyAbnormal", value = "频率指标数值不合理")
+    private Integer frequencyAbnormal;
+    /**
+     * 电压偏差指标数值不合理
+     */
+    @ApiModelProperty(name = "vDevAbnormal", value = "电压偏差指标数值不合理")
+    private Integer vDevAbnormal;
+    /**
+     * 谐波电压指标数值不合理
+     */
+    @ApiModelProperty(name = "harmonicVoltageAbnormal", value = "谐波电压指标数值不合理")
+    private Integer harmonicVoltageAbnormal;
+    /**
+     * 间谐波电压指标数值不合理
+     */
+    @ApiModelProperty(name = "centreHarmonicVoltage", value = "间谐波电压指标数值不合理")
+    private Integer centreHarmonicVoltage;
+    /**
+     * 三相电压不平衡指标数值不合理
+     */
+    @ApiModelProperty(name = "tpVoltageUnbalance", value = "三相电压不平衡指标数值不合理")
+    private Integer tpVoltageUnbalance;
+    /**
+     * 电压偏差连续超标
+     */
+    @ApiModelProperty(name = "vDevLastOverlimit", value = "电压偏差连续超标")
+    private Integer vDevLastOverlimit;
+    /**
+     * 换流站监测点基波电压无数据或零
+     */
+    @ApiModelProperty(name = "tractionStationMeasurementNone", value = "换流站监测点基波电压无数据或零")
+    private Integer tractionStationMeasurementNone;
+    /**
+     * 电气化铁路监测点基波电压数值不合理或无数值
+     */
+    @ApiModelProperty(name = "railwayFundamentalVoltageAbnormal", value = "电气化铁路监测点基波电压数值不合理或无数值")
+    private Integer railwayFundamentalVoltageAbnormal;
+    /**
+     * 电气化铁路监测点基波电流数值不合理或为0值
+     */
+    @ApiModelProperty(name = "railwayFundamentalCurrentAbnormal", value = "电气化铁路监测点基波电流数值不合理或为0值")
+    private Integer railwayFundamentalCurrentAbnormal;
+    /**
+     * 电气化铁路监测点总有功功率不合理
+     */
+    @ApiModelProperty(name = "railwayTotalActivePowerAbnormal", value = "电气化铁路监测点总有功功率不合理")
+    private Integer railwayTotalActivePowerAbnormal;
+    /**
+     * 电气化铁路监测点谐波电压含有率不合理
+     */
+    @ApiModelProperty(name = "railwayHarmonicVoltageContentAbnormal", value = "电气化铁路监测点谐波电压含有率不合理")
+    private Integer railwayHarmonicVoltageContentAbnormal;
+    /**
+     * 频繁上传暂态事件
+     */
+    @ApiModelProperty(name = "freqUploadEvent", value = "频繁上传暂态事件")
+    private Integer freqUploadEvent;
+    /**
+     * 录波文件未正确上传
+     */
+    @ApiModelProperty(name = "waveUploadError", value = "录波文件未正确上传")
+    private Integer waveUploadError;
+    /**
+     * 暂态事件持续时间不合理
+     */
+    @ApiModelProperty(name = "eventLastTimeAbnormal", value = "暂态事件持续时间不合理")
+    private Integer eventLastTimeAbnormal;
+    /**
+     * 暂态事件类型与特征幅值不一致
+     */
+    @ApiModelProperty(name = "eventTypeAmplitudeAtypism", value = "暂态事件类型与特征幅值不一致")
+    private Integer eventTypeAmplitudeAtypism;
+    /**
+     * 暂态事件特征幅值不合理
+     */
+    @ApiModelProperty(name = "eventTypeAmplitudeAbnormal", value = "暂态事件特征幅值不合理")
+    private Integer eventTypeAmplitudeAbnormal;
+    /**
+     * 暂态事件相别为“未知”或“NONE”
+     */
+    @ApiModelProperty(name = "eventPhaseNone", value = "暂态事件相别为“未知”或“NONE”")
+    private Integer eventPhaseNone;
+    /**
+     * 运行电压偏高（非实际电压暂升事件）
+     */
+    @ApiModelProperty(name = "runVolatgeUp", value = "运行电压偏高（非实际电压暂升事件）")
+    private Integer runVolatgeUp;
+    /**
+     * 运行电压偏低（非实际电压暂降事件）
+     */
+    @ApiModelProperty(name = "runVolatgeLow", value = "运行电压偏低（非实际电压暂降事件）")
+    private Integer runVolatgeLow;
+    /**
+     * 数据类型,字典表（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+}
+

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

@@ -0,0 +1,62 @@
+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;
+
+/**
+ * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-11-08 09:03:35
+ */
+@Data
+@ApiModel("获取主网数据质量-稳态指标类数据质量问题查询返回前端实体类")
+public class RStatTargetDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "dataDate", value = "时间")
+    private Date dataDate;
+    /**
+     * 核查规则
+     */
+    @ApiModelProperty(name = "checkRules", value = "核查规则")
+    private String checkRules;
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerName",value = "变电站名称")
+    private String powerName;
+    /**
+     * 地市公司
+     */
+    @ApiModelProperty(name = "cityCompany",value = "地市公司")
+    private String cityCompany;
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "monitorId", value = "监测点ID")
+    private String monitorId;
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+    /**
+     * 监测点电压等级
+     */
+    @ApiModelProperty(name = "monitorVoltageLevel", value = "监测点电压等级")
+    private String monitorVoltageLevel;
+    /**
+     * 指标类型（稳态、暂态指标数据质量问题）
+     */
+    @ApiModelProperty(name = "targetType", value = "指标类型（稳态、暂态指标数据质量问题）")
+    private String targetType;
+}
+

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

@@ -0,0 +1,70 @@
+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;
+
+/**
+ * 牵引站台账数据质量问题-核查详情(RStatTractionStationAccountDetail)实体类
+ *
+ * @author yzh
+ * @since 2022-11-09 09:42:42
+ */
+@Data
+@ApiModel("牵引站台账数据质量问题-核查详情返回前端实体类")
+public class RStatTractionStationAccountDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    private Date dataDate;
+
+    /**
+     * 核查规则
+     */
+    @ApiModelProperty(name = "checkRules",value = "核查规则")
+    private String checkRules;
+
+    /**
+     * 所属变电站名称
+     */
+    @ApiModelProperty(name = "powerName", value = "所属变电站名称")
+    private String powerName;
+
+    /**
+     * 牵引站ID
+     */
+    @ApiModelProperty(name = "substationId",value = "牵引站ID")
+    private String substationId;
+
+    /**
+     * 牵引站名称
+     */
+    @ApiModelProperty(name = "substationName",value = "牵引站名称")
+    private String substationName;
+
+    /**
+     * 供电电压等级
+     */
+    @ApiModelProperty(name = "powerVoltageLevel",value = "供电电压等级")
+    private String powerVoltageLevel;
+
+    /**
+     * 电铁线路名称
+     */
+    @ApiModelProperty(name = "electricRailwayLineName",value = "电铁线路名称")
+    private String electricRailwayLineName;
+
+    /**
+     * 铁路类型
+     */
+    @ApiModelProperty(name = "typeOfRailway",value = "铁路类型")
+    private String typeOfRailway;
+
+}
+

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

@@ -1,9 +1,7 @@
 package com.njcn.device.pms.pojo.vo;
 
-import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -43,4 +41,4 @@ public class RStatZwAlarmCountWVO implements Serializable {
 
 
 
-}
+}

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

@@ -0,0 +1,121 @@
+package com.njcn.device.pms.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.device.pms.service.DeptLineService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.DeptLineParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author denghuajun
+ * @date 2022/1/12 16:33
+ *  部门监测点相关
+ */
+@Validated
+@Slf4j
+@Api(tags = "部门监测点相关")
+@RestController
+@RequestMapping("/deptLine")
+@RequiredArgsConstructor
+public class DeptLineController extends BaseController {
+
+    private final DeptLineService deptLineService;
+
+    /**
+     * 部门绑定监测点
+     *
+     * @param deptLineParam 部门监测点
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/deptBindLine")
+    @ApiOperation("部门绑定监测点")
+    @ApiImplicitParam(name = "deptLineParam", value = "部门绑定监测点", required = true)
+    public HttpResult deptBindLine(@RequestBody @Validated DeptLineParam deptLineParam) {
+        String methodDescribe = getMethodDescribe("deptBindLine");
+        LogUtil.njcnDebug(log, "{}，部门监测点数据为：{}", methodDescribe, deptLineParam);
+        deptLineService.deptBindLine(deptLineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 部门解除绑定监测点
+     *
+     * @param deptLineParam 部门监测点
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @PostMapping("/deptDeleteBindLine")
+    @ApiOperation("部门解除绑定监测点")
+    @ApiImplicitParam(name = "deptLineParam", value = "部门绑定监测点", required = true)
+    public HttpResult deptDeleteBindLine(@RequestBody @Validated DeptLineParam deptLineParam) {
+        String methodDescribe = getMethodDescribe("deptDeleteBindLine");
+        LogUtil.njcnDebug(log, "{}，部门监测点数据为：{}", methodDescribe, deptLineParam);
+        deptLineService.deptDeleteBindLine(deptLineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 根据部门ids集合查询是否绑定监测点
+     *
+     * @param ids 部门id
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/selectDeptBindLines")
+    @ApiOperation("查询是否绑定监测点")
+    @ApiImplicitParam(name = "ids", value = "部门id", required = true)
+    public HttpResult selectDeptBindLines(@RequestParam("ids") List<String> ids) {
+        String methodDescribe = getMethodDescribe("selectDeptBindLines");
+        deptLineService.selectDeptBindLines(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    /**
+     * 根据部门id解除绑定监测点
+     *
+     * @param id 部门id
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
+    @PostMapping("/removeBind")
+    @ApiOperation("部门解除绑定监测点")
+    @ApiImplicitParam(name = "id", value = "部门id", required = true)
+    public HttpResult<Integer> removeBind(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("removeBind");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptLineService.removeBind(id), methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/getLineByDeptId")
+    @ApiOperation("部门Id获取绑定监测点")
+    @ApiImplicitParam(name = "id", value = "部门id", required = true)
+    public HttpResult<List<String>> getLineByDeptId(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getLineByDeptId");
+        List<String> list = deptLineService.getLineByDeptId(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @PostMapping("/getLineByDeptRelation")
+    @ApiOperation("获取部门和监测点的关系（分稳态暂态）")
+    @ApiImplicitParam(name = "devDataType", value = "数据类型（0：暂态系统；1：稳态系统；）", required = true)
+    public HttpResult<Map<String,List<String>> > getLineByDeptRelation(@RequestParam("devDataType") Integer devDataType) {
+        String methodDescribe = getMethodDescribe("getLineByDeptRelation");
+        Map<String,List<String>> map= deptLineService.getLineByDeptRelation(devDataType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
+    }
+
+
+}

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

@@ -1,55 +0,0 @@
-package com.njcn.device.pms.controller;
-
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
-import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import com.njcn.web.controller.BaseController;
-
-import java.util.List;
-
-/**
- * <p>
- *  配网监测点台账
- * </p>
- *
- * @author hongawen
- * @since 2022-10-14
- */
-@RestController
-@RequestMapping("/pms/distributionMonitor")
-@Slf4j
-@RequiredArgsConstructor
-@Api(tags = "台账-配网监测点")
-public class DistributionMonitorController extends BaseController {
-
-    /**
-     * 新增配网监测点表
-     * @author cdf
-     * @date 2022/10/26
-     */
-    @PostMapping
-    @ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true)
-    public HttpResult<Boolean> addDistributionMonitor(@RequestBody DistributionMonitorParam distributionMonitorParam){
-        String methodDescribe = getMethodDescribe("addDistributionMonitor");
-
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-    }
-
-
-
-
-}
-

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

@@ -0,0 +1,76 @@
+package com.njcn.device.pms.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO;
+import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO;
+import com.njcn.device.pms.service.distribution.PwDataQualityCheckService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 配网数据质量-数据质量核查
+ *
+ * @author yzh
+ * @date 2022/11/2
+ */
+@RestController
+@RequestMapping("/pwDataQualityCheck")
+@Api(tags = "配网数据质量-数据质量核查")
+@RequiredArgsConstructor
+public class PwDataQualityCheckController extends BaseController {
+
+    private final PwDataQualityCheckService pwDataQualityCheckService;
+
+    /**
+     * 获取配网数据质量-台帐类数据质量核查
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.RStatAccountCheckDataVO>>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    @PostMapping("/getPwQualityCheckOfAccountData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-台帐类数据质量核查")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PwRStatAccountCheckDataVO>> getPwQualityCheckOfAccountData(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwQualityCheckOfAccountData");
+        List<PwRStatAccountCheckDataVO> list = pwDataQualityCheckService.getPwQualityCheckOfAccountData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取主网数据质量-监测指标数据质量核查
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.RStatTargetCheckDataVO>>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    @PostMapping("/getPwMonitoringIndexDataQualityVerification")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-监测指标数据质量核查")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatTargetCheckDataVO>> getPwMonitoringIndexDataQualityVerification(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwMonitoringIndexDataQualityVerification");
+        List<RStatTargetCheckDataVO> list = pwDataQualityCheckService.getPwMonitoringIndexDataQualityVerification(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
+
+
+

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

@@ -0,0 +1,73 @@
+package com.njcn.device.pms.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.DataQualityDetailsParam;
+import com.njcn.device.pms.pojo.vo.PwRStatMeasurementAccountDetailVO;
+import com.njcn.device.pms.pojo.vo.PwRStatTargetDetailVO;
+import com.njcn.device.pms.service.distribution.PwDataQualityDetailsService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * TODO 配网数据质量-数据质量核查详情
+ *
+ * @author yzh
+ * @date 2022/11/4
+ */
+@RestController
+@RequestMapping("/pwDataQualityDetails")
+@Api(tags = "配网数据质量-数据质量核查详情")
+@RequiredArgsConstructor
+public class PwDataQualityDetailsController extends BaseController {
+
+    private final PwDataQualityDetailsService pwDataQualityDetailsService;
+
+    /**
+     * 获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.RStatAccountCheckDataVO>>
+     * @author yzh
+     * @date 2022/11/4
+     */
+    @PostMapping("/getPwQualityProblemsOfMonitoringPointAccountData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-台账类数据指标核查详情-监测点台账数据质量问题")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PwRStatMeasurementAccountDetailVO>> getPwQualityProblemsOfMonitoringPointAccountData(@RequestBody DataQualityDetailsParam param) {
+        String methodDescribe = getMethodDescribe("getPwQualityProblemsOfMonitoringPointAccountData");
+        List<PwRStatMeasurementAccountDetailVO> list = pwDataQualityDetailsService.getPwQualityProblemsOfMonitoringPointAccountData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网数据质量-稳态指标类数据质量问题查询
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.RStatMeasurementAccountDetailVO>>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    @PostMapping("/getPwRStatTargetDetail")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-稳态指标类数据质量问题查询")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PwRStatTargetDetailVO>> getPwRStatTargetDetail(@RequestBody DataQualityDetailsParam param) {
+        String methodDescribe = getMethodDescribe("getPwRStatTargetDetail");
+        List<PwRStatTargetDetailVO> list = pwDataQualityDetailsService.getPwRStatTargetDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.njcn.device.pms.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.vo.PwRDnOperatingVO;
+import com.njcn.device.pms.pojo.vo.PwRQualityParameterVO;
+import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO;
+import com.njcn.device.pms.service.distribution.PwDataQualityStatService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 配网数据质量-数据质量统计
+ *
+ * @author yzh
+ * @date 2022/11/4
+ */
+
+@RestController
+@RequestMapping("/pwDataQualityStat")
+@Api(tags = "配网数据质量-数据质量统计")
+@RequiredArgsConstructor
+public class PwDataQualityStatController extends BaseController {
+
+    private final PwDataQualityStatService pwDataQualityStatService;
+
+    /**
+     * 获取配网数据质量-台账数据质量统计
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.RQualityParameterVO>>
+     * @author yzh
+     * @date 2022/11/4
+     */
+    @PostMapping("/getPwLedgerDataQualityStat")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-台账数据质量统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PwRQualityParameterVO>> getPwLedgerDataQualityStat(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwLedgerDataQualityStat");
+        List<PwRQualityParameterVO> list = pwDataQualityStatService.getPwLedgerDataQualityStat(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网数据质量-监测指标数据质量统计
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.ROperatingIndexVO>>
+     * @author yzh
+     * @date 2022/11/4
+     */
+    @PostMapping("/getPwMonitoringIndexDataQualityStat")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-监测指标数据质量统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PwRDnOperatingVO>> getPwMonitoringIndexDataQualityStat(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwMonitoringIndexDataQualityStat");
+        List<PwRDnOperatingVO> list = pwDataQualityStatService.getPwMonitoringIndexDataQualityStat(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网数据质量-监测指标数据质量问题汇总统计
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.event.pojo.vo.RQualityParameterPollVO>>
+     * @author yzh
+     * @date 2022/11/7
+     */
+    @PostMapping("/getPwSummaryStatOfMonitoringIndexDataQualityProblems")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取配网数据质量-监测指标数据质量问题汇总统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RQualityParameterPollVO>> getPwSummaryStatOfMonitoringIndexDataQualityProblems(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwSummaryStatOfMonitoringIndexDataQualityProblems");
+        List<RQualityParameterPollVO> list = pwDataQualityStatService.getPwSummaryStatOfMonitoringIndexDataQualityProblems(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}