合并代码提交

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);
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.distribution;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -6,21 +6,21 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
-import com.njcn.device.pms.service.IMonitorService;
+import com.njcn.device.pms.pojo.vo.DoubleUserVO;
-import com.njcn.device.pms.service.IPwMonitorService;
+import com.njcn.device.pms.service.distribution.IPwMonitorService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-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;
 
@@ -59,4 +59,8 @@ public class PwMonitorController extends BaseController {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorList, methodDescribe);
         }
     }
+
+
+
+
 }

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

@@ -0,0 +1,65 @@
+package com.njcn.device.pms.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+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.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.PwRDnOperatingParam;
+import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO;
+import com.njcn.device.pms.service.distribution.RDnOperatingIndexMService;
+import com.njcn.device.pms.service.distribution.RDnOperatingYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title ROperatingIndexController
+ * @Package com.njcn.device.pms.controller.majornetwork
+ * @Author jianghaifei
+ * @Date 2022-11-09 16:18
+ * @Version V1.0
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/pwROperatingIndex")
+@Api(tags = "配网-运行指标统计")
+public class PwRDnOperatingIndexController extends BaseController {
+
+    private final RDnOperatingIndexMService rDnOperatingIndexMService; //月
+
+    private final RDnOperatingYService rDnOperatingYService; //年
+
+    @PostMapping("/getOperatingList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询运行指标统计(配网)")
+    public HttpResult<List<PwRDnOperatingIndexCommonVO>> getOperatingList(@RequestBody PwRDnOperatingParam pwRDnOperatingParam) {
+        String methodDescribe = getMethodDescribe("getOperatingList");
+        Integer type = pwRDnOperatingParam.getType();
+        if (type == null) {
+            throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法");
+        }
+        List<PwRDnOperatingIndexCommonVO> list;
+
+        if (BizParamConstant.STAT_BIZ_YEAR.equals(type.toString())) {
+            //年
+            list = rDnOperatingYService.getOperatingList(pwRDnOperatingParam);
+        } else if (BizParamConstant.STAT_BIZ_MONTH.equals(type.toString())) {
+            //月
+            list = rDnOperatingIndexMService.getOperatingList(pwRDnOperatingParam);
+        } else {
+            throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法");
+        }
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,53 @@
+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.RMpMonitorAlarmCountMParam;
+import com.njcn.device.pms.pojo.vo.PwRMpMonitorAlarmCountMVO;
+import com.njcn.device.pms.service.distribution.PwRMpMonitorAlarmCountMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 监测点告警统计
+ * @Title RMpMonitorAlarmCountMController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-13 08:54
+ * @Version V1.0
+ */
+@RestController
+@Api(tags = "配网-监测点告警统计(月)")
+@RequiredArgsConstructor
+@RequestMapping("/pwRMpMonitorAlarmCountM")
+public class PwRMpMonitorAlarmCountMController extends BaseController {
+
+    private final PwRMpMonitorAlarmCountMService rMpMonitorAlarmCountMService;
+
+    /***
+     * 根据条件查询监测点告警统计(月)(配网)
+     * @author jianghaifei
+     * @date 2022-11-01 15:21
+     * @param rMpMonitorAlarmCountMParam
+     * @return java.util.List<com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO>
+     */
+    @PostMapping("/getPwRMpMonitorAlarmCountMList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询监测点告警统计(月)(配网)")
+    public HttpResult<List<PwRMpMonitorAlarmCountMVO>> getPwRMpMonitorAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
+        String methodDescribe = getMethodDescribe("getPwRMpMonitorAlarmCountMList");
+        List<PwRMpMonitorAlarmCountMVO> list = rMpMonitorAlarmCountMService.getPwRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,46 @@
+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.RStatAreaAlarmCountMParam;
+import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
+import com.njcn.device.pms.service.distribution.PwRStatAreaAlarmCountMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RStatAreaAlarmCountMController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-10-10 15:13
+ * @Version V1.0
+ */
+
+@RestController
+@Api(tags = "配网-区域告警统计(月)")
+@RequiredArgsConstructor
+@RequestMapping("/pwRStatAreaAlarmCountM")
+public class PwRStatAreaAlarmCountMController extends BaseController {
+
+    private final PwRStatAreaAlarmCountMService rStatAreaAlarmCountMService;
+
+    @PostMapping("getPwAllRStatAreaAlarmCountMList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询区域告警统计(月)(配网)")
+    public HttpResult<List<RStatAreaAlarmCountMVO>> getPwAllRStatAreaAlarmCountMList(@RequestBody RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) {
+        String methodDescribe = getMethodDescribe("getPwAllRStatAreaAlarmCountMList");
+        List<RStatAreaAlarmCountMVO> list = rStatAreaAlarmCountMService.getPwAllRStatAreaAlarmCountMList(rStatAreaAlarmCountMParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,64 @@
+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.RStatPwAlarmCountWParam;
+import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam;
+import com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO;
+import com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO;
+import com.njcn.device.pms.service.distribution.RStatPwAlarmCountWService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title RStatPwAlarmCountWController
+ * @Package com.njcn.device.pms.controller
+ * @Author jianghaifei
+ * @Date 2022-11-02 18:53
+ * @Version V1.0
+ */
+@RestController
+@RequestMapping("/rStatPwAlarmCountW")
+@Api(tags = "配网-告警统计(周)")
+@RequiredArgsConstructor
+public class RStatPwAlarmCountWController extends BaseController {
+
+    private final RStatPwAlarmCountWService rStatPwAlarmCountWService;
+
+    /***
+     *
+     * @author jianghaifei
+     * @date 2022-11-02 19:01
+     * @param rStatPwAlarmCountWParam
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO>>
+     */
+    @PostMapping("getAllRStatPwAlarmCountList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询告警统计(周)")
+    public HttpResult<List<RStatPwAlarmCountWVO>> getAllRStatPwAlarmCountList(@RequestBody RStatPwAlarmCountWParam rStatPwAlarmCountWParam) {
+        String methodDescribe = getMethodDescribe("getAllRStatPwAlarmCountList");
+        List<RStatPwAlarmCountWVO> list = rStatPwAlarmCountWService.getAllRStatPwAlarmCountList(rStatPwAlarmCountWParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+    @PostMapping("getAlarmDetailList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("告警明细查看")
+    public HttpResult<List<RStatPwAlarmDetailVO>> getAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
+        String methodDescribe = getMethodDescribe("getAlarmDetailList");
+        List<RStatPwAlarmDetailVO> list = rStatPwAlarmCountWService.getAlarmDetailList(rStatPwAlarmDetailParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.njcn.device.pms.controller.majornetwork;
+
+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.RStatAccountCheckDataVO;
+import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO;
+import com.njcn.device.pms.service.majornetwork.DataQualityCheckService;
+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("/dataQualityCheck")
+@Api(tags = "主网数据质量-数据质量核查")
+@RequiredArgsConstructor
+public class DataQualityCheckController extends BaseController {
+
+    private final DataQualityCheckService dataQualityCheckService;
+
+    /**
+     * 获取主网数据质量-台帐类数据质量核查
+     *
+     * @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("/getQualityCheckOfAccountData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-台帐类数据质量核查")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatAccountCheckDataVO>> getQualityCheckOfAccountData(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getQualityCheckOfAccountData");
+        List<RStatAccountCheckDataVO> list = dataQualityCheckService.getQualityCheckOfAccountData(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("/getMonitoringIndexDataQualityVerification")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-监测指标数据质量核查")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatTargetCheckDataVO>> getMonitoringIndexDataQualityVerification(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getMonitoringIndexDataQualityVerification");
+        List<RStatTargetCheckDataVO> list = dataQualityCheckService.getMonitoringIndexDataQualityVerification(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}
+
+
+

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

@@ -0,0 +1,95 @@
+package com.njcn.device.pms.controller.majornetwork;
+
+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.api.TractionStationClient;
+import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
+import com.njcn.device.pms.pojo.param.DataQualityDetailsParam;
+import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
+import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO;
+import com.njcn.device.pms.pojo.vo.RStatMeasurementAccountDetailVO;
+import com.njcn.device.pms.pojo.vo.RStatTargetDetailVO;
+import com.njcn.device.pms.pojo.vo.RStatTractionStationAccountDetailVO;
+import com.njcn.device.pms.service.majornetwork.DataQualityDetailsService;
+import com.njcn.device.pms.service.majornetwork.ITractionStationService;
+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.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TODO 主网数据质量-数据质量核查详情
+ *
+ * @author yzh
+ * @date 2022/11/4
+ */
+@RestController
+@RequestMapping("/dataQualityDetails")
+@Api(tags = "主网数据质量-数据质量核查详情")
+@RequiredArgsConstructor
+public class DataQualityDetailsController extends BaseController {
+
+    private final DataQualityDetailsService dataQualityDetailsService;
+
+    /**
+     * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题
+     *
+     * @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("/getQualityProblemsOfMonitoringPointAccountData")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatMeasurementAccountDetailVO>> getQualityProblemsOfMonitoringPointAccountData(@RequestBody DataQualityDetailsParam param) {
+        String methodDescribe = getMethodDescribe("getQualityProblemsOfMonitoringPointAccountData");
+        List<RStatMeasurementAccountDetailVO> list = dataQualityDetailsService.getQualityProblemsOfMonitoringPointAccountData(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.RStatAccountCheckDataVO>>
+     * @author yzh
+     * @date 2022/11/4
+     */
+    @PostMapping("/getTractionPlatformAccountDataQualityProblem")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatTractionStationAccountDetailVO>> getTractionPlatformAccountDataQualityProblem(@RequestBody DataQualityDetailsParam param) {
+        String methodDescribe = getMethodDescribe("getTractionPlatformAccountDataQualityProblem");
+        List<RStatTractionStationAccountDetailVO> list = dataQualityDetailsService.getTractionPlatformAccountDataQualityProblem(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("/getRStatTargetDetail")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-稳态指标类数据质量问题查询")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatTargetDetailVO>> getRStatTargetDetail(@RequestBody DataQualityDetailsParam param) {
+        String methodDescribe = getMethodDescribe("getRStatTargetDetail");
+        List<RStatTargetDetailVO> list = dataQualityDetailsService.getRStatTargetDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.njcn.device.pms.controller.majornetwork;
+
+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.ROperatingIndexVO;
+import com.njcn.device.pms.pojo.vo.RQualityParameterPollVO;
+import com.njcn.device.pms.pojo.vo.RQualityParameterVO;
+import com.njcn.device.pms.service.majornetwork.DataQualityStatService;
+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/1
+ */
+
+@RestController
+@RequestMapping("/dataQualityStat")
+@Api(tags = "主网数据质量-数据质量统计")
+@RequiredArgsConstructor
+public class DataQualityStatController extends BaseController {
+
+    private final DataQualityStatService dataQualityStatService;
+
+    /**
+     * 获取主网数据质量-台账数据质量统计
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < ?>>
+     * @author yzh
+     * @date 2022/11/1
+     */
+    @PostMapping("/getLedgerDataQualityStat")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-台账数据质量统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RQualityParameterVO>> getLedgerDataQualityStat(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getLedgerDataQualityStat");
+        List<RQualityParameterVO> list = dataQualityStatService.getLedgerDataQualityStat(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/1
+     */
+    @PostMapping("/getMonitoringIndexDataQualityStat")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-监测指标数据质量统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<ROperatingIndexVO>> getMonitoringIndexDataQualityStat(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getMonitoringIndexDataQualityStat");
+        List<ROperatingIndexVO> list = dataQualityStatService.getMonitoringIndexDataQualityStat(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/1
+     */
+    @PostMapping("/getSummaryStatOfMonitoringIndexDataQualityProblems")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取主网数据质量-监测指标数据质量问题汇总统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RQualityParameterPollVO>> getSummaryStatOfMonitoringIndexDataQualityProblems(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getSummaryStatOfMonitoringIndexDataQualityProblems");
+        List<RQualityParameterPollVO> list = dataQualityStatService.getSummaryStatOfMonitoringIndexDataQualityProblems(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.njcn.device.pms.controller.majornetwork;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
+import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
+import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
+import com.njcn.device.pms.pojo.vo.DoubleUserVO;
+import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+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 {
+
+    private final IDistributionMonitorService iDistributionMonitorService;
+
+    /**
+     * 新增配网监测点表
+     * @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);
+    }
+
+
+    /**
+     * 获取指定组装下的发电用电用户
+     * @author cdf
+     * @date 2022/11/15
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDoubleUserByDept")
+    @ApiOperation("获取指定组装下的发电用电用户")
+    @ApiImplicitParam(name = "orgId", value = "组装机构编号", required = true)
+    public HttpResult<List<DoubleUserVO>> getDoubleUserByDept(@RequestParam("orgId")String orgId) {
+        String methodDescribe = getMethodDescribe("getDoubleUserByDept");
+        List<DoubleUserVO> infos = iDistributionMonitorService.getDoubleUserByDept(orgId);
+        if (CollectionUtil.isEmpty(infos)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, infos, methodDescribe);
+        }
+    }
+
+
+
+
+}
+

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -8,7 +8,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
 import com.njcn.device.pms.pojo.po.GeneratrixWire;
-import com.njcn.device.pms.service.IGeneratrixWireService;
+import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
@@ -55,7 +55,7 @@ public class GeneratrixWireController extends BaseController {
     @PostMapping("/updateGeneratrixWire")
     @ApiOperation("修改线路")
     @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true)
-    public HttpResult<Boolean> updateGeneratrixWire(@RequestBody GeneratrixWireParam.UpdateGeneratrixWireParam generatrixWireParam) {
+    public HttpResult<Boolean> updateGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) {
         String methodDescribe = getMethodDescribe("updateGeneratrixWire");
         boolean result = iGeneratrixWireService.updateGeneratrixWire(generatrixWireParam);
         if(result){

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -9,13 +9,11 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 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.MonitorParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
-import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
-import com.njcn.device.pms.service.IMonitorService;
+import com.njcn.device.pms.service.majornetwork.IMonitorService;
 
 import com.njcn.device.pq.pojo.po.Overlimit;
 import com.njcn.web.controller.BaseController;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -9,9 +9,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
-import com.njcn.device.pms.service.IPmsGeneralDeviceService;
+import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService;
-import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -12,7 +12,7 @@ import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.po.Generatrix;
-import com.njcn.device.pms.service.IPmsGeneratrixService;
+import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.*;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -9,7 +9,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.PowerClientParam;
 import com.njcn.device.pms.pojo.po.PowerClient;
-import com.njcn.device.pms.service.IPowerClientService;
+import com.njcn.device.pms.service.majornetwork.IPowerClientService;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,9 +12,7 @@ import com.njcn.common.utils.LogUtil;
 import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
 import com.njcn.device.pms.pojo.po.PowerDistributionarea;
 import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
-import com.njcn.device.pms.service.IPowerDistributionareaService;
+import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService;
-import com.njcn.system.pojo.param.EventTemplateParam;
-import com.njcn.system.pojo.po.EventTemplate;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -9,7 +9,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
 import com.njcn.device.pms.pojo.po.PowerGenerationUser;
-import com.njcn.device.pms.service.IPowerGenerationUserService;
+import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -6,10 +6,8 @@ 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.RMpMonitorAlarmCountMParam;
-import com.njcn.device.pms.pojo.param.RStatAreaAlarmCountMParam;
 import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO;
-import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
+import com.njcn.device.pms.service.majornetwork.RMpMonitorAlarmCountMService;
-import com.njcn.device.pms.service.RMpMonitorAlarmCountMService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,9 +35,16 @@ public class RMpMonitorAlarmCountMController extends BaseController {
 
     private final RMpMonitorAlarmCountMService rMpMonitorAlarmCountMService;
 
+    /***
+     * 根据条件查询监测点告警统计(月)(主网)
+     * @author jianghaifei
+     * @date 2022-11-01 15:21
+     * @param rMpMonitorAlarmCountMParam
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO>>
+     */
     @PostMapping("/getRMpMonitorAlarmCountMList")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("根据条件查询监测点告警统计(月)")
+    @ApiOperation("查询监测点告警统计(月)(主网)")
     public HttpResult<List<RMpMonitorAlarmCountMVO>> getAllRStatAreaAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
         String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList");
         List<RMpMonitorAlarmCountMVO> list = rMpMonitorAlarmCountMService.getRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam);

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

@@ -0,0 +1,65 @@
+package com.njcn.device.pms.controller.majornetwork;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+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.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.param.ROperatingIndexParam;
+import com.njcn.device.pms.pojo.vo.ROperatingIndexCommonVO;
+import com.njcn.device.pms.service.majornetwork.ROperatingIndexMService;
+import com.njcn.device.pms.service.majornetwork.ROperatingIndexYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Title ROperatingIndexController
+ * @Package com.njcn.device.pms.controller.majornetwork
+ * @Author jianghaifei
+ * @Date 2022-11-09 16:18
+ * @Version V1.0
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/rOperatingIndex")
+@Api(tags = "主网-运行指标统计")
+public class ROperatingIndexController extends BaseController {
+
+    private final ROperatingIndexMService rOperatingIndexMService; //月
+
+    private final ROperatingIndexYService rOperatingIndexYService; //年
+
+    @PostMapping("/getOperatingList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询运行指标统计(主网)")
+    public HttpResult<List<ROperatingIndexCommonVO>> getOperatingList(@RequestBody ROperatingIndexParam rOperatingIndexParam) {
+        String methodDescribe = getMethodDescribe("getOperatingList");
+        Integer type = rOperatingIndexParam.getType();
+        if (type == null) {
+            throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法");
+        }
+        List<ROperatingIndexCommonVO> list;
+
+        if (BizParamConstant.STAT_BIZ_YEAR.equals(type.toString())) {
+            //年
+            list = rOperatingIndexYService.getOperatingList(rOperatingIndexParam);
+        } else if (BizParamConstant.STAT_BIZ_MONTH.equals(type.toString())) {
+            //月
+            list = rOperatingIndexMService.getOperatingList(rOperatingIndexParam);
+        } else {
+            throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER, "参数日期维度【type】非法");
+        }
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -6,10 +6,8 @@ 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.RStatAreaAlarmCountMParam;
-import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
 import com.njcn.device.pms.pojo.vo.RStatAreaAlarmCountMVO;
-import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
+import com.njcn.device.pms.service.majornetwork.RStatAreaAlarmCountMService;
-import com.njcn.device.pms.service.RStatAreaAlarmCountMService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,10 +37,11 @@ public class RStatAreaAlarmCountMController extends BaseController {
 
     @PostMapping("getAllRStatAreaAlarmCountMList")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @ApiOperation("根据条件查询所有区域告警统计(月)")
+    @ApiOperation("查询区域告警统计(月)(主网)")
     public HttpResult<List<RStatAreaAlarmCountMVO>> getAllRStatAreaAlarmCountMList(@RequestBody RStatAreaAlarmCountMParam rStatAreaAlarmCountMParam) {
         String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList");
         List<RStatAreaAlarmCountMVO> list = rStatAreaAlarmCountMService.getAllRStatAreaAlarmCountMList(rStatAreaAlarmCountMParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
+
 }

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -8,7 +8,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
 import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO;
-import com.njcn.device.pms.service.RStatBusbarHarmonicService;
+import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -43,7 +43,7 @@ public class RStatBusbarHarmonicController extends BaseController {
      * @return 变电站母线电压指标年报
      */
     @PostMapping("/getRStatBusbarHarmonic")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("获取变电站母线电压指标年报")
     @ApiImplicitParam(name = "param", value = "条件参数", required = true)
     public HttpResult<List<RStatBusbarHarmonicYVO>> getRStatBusbarHarmonic(@RequestBody UniversalFrontEndParam param) {

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -8,7 +8,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.RStatZwAlarmCountWParam;
 import com.njcn.device.pms.pojo.vo.ProblemMonitorDetailVO;
 import com.njcn.device.pms.pojo.vo.RStatZwAlarmCountWVO;
-import com.njcn.device.pms.service.RStatZwAlarmCountWService;
+import com.njcn.device.pms.service.majornetwork.RStatZwAlarmCountWService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -7,7 +7,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.UniversalFrontEndParam;
 import com.njcn.device.pms.pojo.vo.RmpEventDetailVO;
-import com.njcn.device.pms.service.RmpEventDetailService;
+import com.njcn.device.pms.service.majornetwork.RmpEventDetailService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -42,7 +42,7 @@ public class RmpEventDetailController extends BaseController {
      * @return 暂态事件明细
      */
     @PostMapping("/getDetailsOfTransientEvents")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("获取区域暂态指标统计")
     @ApiImplicitParam(name = "param", value = "前端参数", required = true)
     public HttpResult<List<RmpEventDetailVO>> getRmpEventDetail(@RequestBody UniversalFrontEndParam param) {

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -11,7 +11,7 @@ import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
 import com.njcn.device.pms.pojo.param.StatationStatParam;
 import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
 import com.njcn.device.pms.pojo.po.StatationStat;
-import com.njcn.device.pms.service.IStatationStatService;
+import com.njcn.device.pms.service.majornetwork.IStatationStatService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,10 +10,10 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.device.pms.pojo.param.PmsTerminalParam;
-import com.njcn.device.pms.pojo.po.Terminal;
+import com.njcn.device.pms.pojo.po.PmsTerminal;
 import com.njcn.device.pms.pojo.vo.PmsTerminalVO;
-import com.njcn.device.pms.service.ITerminalService;
+import com.njcn.device.pms.service.majornetwork.ITerminalService;
-import com.njcn.device.pq.pojo.param.TerminalParam;
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -48,11 +48,11 @@ public class TerminalController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("getTerminalList")
     @ApiOperation("查询监测终端台账所有信息")
-    @ApiImplicitParam(name = "queryParam",value = "查询监测终端台账信息",required = true)
+    @ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true)
-    public HttpResult<Page<PmsTerminalVO>> getTerminalList(@RequestBody @Validated PmsTerminalParam.QueryParam queryParam){
+    public HttpResult<Page<PmsTerminal>> getTerminalList(@RequestBody @Validated BaseParam baseParam){
         String methodDescribe = getMethodDescribe("getTerminalList");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam);
-        Page<PmsTerminalVO> res = iTerminalService.getTerminalList(queryParam);
+        Page<PmsTerminal> res = iTerminalService.getTerminalList(baseParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
     }
 
@@ -60,11 +60,11 @@ public class TerminalController extends BaseController {
     @GetMapping("/getTerminalById")
     @ApiOperation("根据ID查询监测终端台账数据")
     @ApiImplicitParam(name = "id",value = "id",required = true)
-    public HttpResult<Terminal> getTerminalById(@RequestParam("id") String id){
+    public HttpResult<PmsTerminal> getTerminalById(@RequestParam("id") String id){
         String methodDescribe = getMethodDescribe("getTerminalById");
-        Terminal terminal = iTerminalService.getTerminalById(id);
+        PmsTerminal pmsTerminal = iTerminalService.getTerminalById(id);
-        if (Objects.nonNull(terminal)){
+        if (Objects.nonNull(pmsTerminal)){
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, terminal, methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pmsTerminal, methodDescribe);
         }
         else {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,15 +1,17 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
-
 
+import cn.hutool.core.collection.CollUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
+import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
 import com.njcn.device.pms.pojo.param.TractionStationParam;
 import com.njcn.device.pms.pojo.po.TractionStation;
-import com.njcn.device.pms.service.ITractionStationService;
+import com.njcn.device.pms.service.majornetwork.ITractionStationService;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -59,7 +61,7 @@ public class TractionStationController extends BaseController {
     public HttpResult<TractionStation> getTractionStationById(@RequestParam("tractionStationId") String tractionStationId) {
         String methodDescribe = getMethodDescribe("getTractionStationById");
         TractionStation res = iTractionStationService.getTractionStationById(tractionStationId);
-        if(Objects.nonNull(res)){
+        if (Objects.nonNull(res)) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
@@ -68,14 +70,15 @@ public class TractionStationController extends BaseController {
 
     /**
      * 新增牵引站信息
+     *
      * @author hany
      * @date 2022/10/28
      */
     @PostMapping("/addTractionStation")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType= OperateType.ADD)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
     @ApiOperation("新增牵引站信息")
     @ApiImplicitParam(name = "tractionStationParam", value = "新增实体", required = true)
-    public HttpResult<Object> add(@RequestBody @Validated TractionStationParam tractionStationParam){
+    public HttpResult<Object> add(@RequestBody @Validated TractionStationParam tractionStationParam) {
         String methodDescribe = getMethodDescribe("add");
         boolean result = iTractionStationService.add(tractionStationParam);
         if (result) {
@@ -87,14 +90,15 @@ public class TractionStationController extends BaseController {
 
     /**
      * 修改牵引站信息
+     *
      * @author hany
      * @date 2022/10/28
      */
     @PostMapping("/updateTractionStation")
-    @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
     @ApiOperation("修改牵引站信息")
     @ApiImplicitParam(name = "updateParam", value = "更新实体", required = true)
-    public HttpResult<Object> update(@RequestBody @Validated TractionStationParam updateParam){
+    public HttpResult<Object> update(@RequestBody @Validated TractionStationParam updateParam) {
         String methodDescribe = getMethodDescribe("update");
         boolean result = iTractionStationService.update(updateParam);
         if (result) {
@@ -106,6 +110,7 @@ public class TractionStationController extends BaseController {
 
     /**
      * 删除牵引站信息
+     *
      * @param ids id
      * @author hany
      * @date 2022/10/28
@@ -114,15 +119,37 @@ public class TractionStationController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
     @ApiOperation("删除牵引站信息")
     @ApiImplicitParam(name = "ids", value = "ID索引", required = true)
-    public HttpResult<Object> delete(@RequestBody List<String> ids){
+    public HttpResult<Object> delete(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("delete");
         boolean result = iTractionStationService.delete(ids);
-        if(result){
+        if (result) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }else {
+        } else {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
         }
     }
 
+    /**
+     * 获取牵引站详细信息
+     *
+     * @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")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("获取牵引站详细信息")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PmsTractionStationDTO>> getPmsTractionStationInfo(@RequestBody PmsTractionStationParam param) {
+        String methodDescribe = getMethodDescribe("getPmsTractionStationInfo");
+        List<PmsTractionStationDTO> result = iTractionStationService.getPmsTractionStationInfo(param);
+        if (CollUtil.isEmpty(result)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        }
+    }
+
 }
 

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.controller;
+package com.njcn.device.pms.controller.majornetwork;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -0,0 +1,69 @@
+package com.njcn.device.pms.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.po.DeptLine;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author denghuajun
+ * @since 2022-01-12 18:04
+ */
+public interface DeptLineMapper extends BaseMapper<DeptLine> {
+    /**
+     * 换绑监测点
+     * @param id 部门id
+     * @param lineId 监测点id
+     * @return
+     */
+    int deptChangeBindLine(@Param("id")String id,@Param("lineId")String lineId);
+
+
+    /**
+     * 查询所有绑定的监测点
+     */
+    List<String> getAllBindLine();
+
+    /**
+     * 查询其他绑定的监测点
+     * @param deptId
+     * @return
+     */
+    List<String> getOtherBindLine(@Param("deptId")String deptId);
+
+    /**
+     * 查询自己绑定的监测点
+     * @param deptId
+     * @return
+     */
+    List<String> getMyselfBindLine(@Param("deptId")String deptId);
+
+    @Select ("SELECT\n" +
+            "\tpq_dept_line.Id,\n" +
+            "\tpq_dept_line.Line_Id\n" +
+            "FROM\n" +
+            "\tpq_dept_line\n" +
+            "WHERE\n" +
+            "\tEXISTS (\n" +
+            "\t\tSELECT\n" +
+            "\t\t\t1\n" +
+            "\t\tFROM\n" +
+            "\t\t\tpq_device,\n" +
+            "\t\t\tpq_line\n" +
+            "\t\tWHERE\n" +
+            "\t\t\tSUBSTRING_INDEX(\n" +
+            "\t\t\t\tSUBSTRING_INDEX(pq_line.Pids, ',', 5),\n" +
+            "\t\t\t\t',',\n" +
+            "\t\t\t\t- 1\n" +
+            "\t\t\t) = pq_device.Id\n" +
+            "\t\tAND pq_line.Id = pq_dept_line.Line_Id and (pq_device.Dev_Data_Type= 2 or pq_device.Dev_Data_Type = #{devDataType})\n" +
+            "\t)")
+    List<DeptLine> getLineByDeptRelation(@Param("devDataType")Integer devDataType);
+}

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

@@ -1,16 +0,0 @@
-package com.njcn.device.pms.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.po.TractionStation;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author hongawen
- * @since 2022-10-14
- */
-public interface TractionStationMapper extends BaseMapper<TractionStation> {
-
-}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwDataQualityCheckMapper.java

@@ -0,0 +1,59 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/11/8
+ */
+
+@Mapper
+public interface PwDataQualityCheckMapper {
+
+    /**
+     * 获取配网数据质量-台帐类数据质量核查（年）
+     *
+     * @param deptIds           单位id
+     * @param param             条件参数
+     * @param distributionPoint 配网字典id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatAccountCheckDataVO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<PwRStatAccountCheckDataVO> getYearInfo(@Param("deptIds") List<String> deptIds,
+                                                @Param("param") StatisticsBizBaseParam param,
+                                                @Param("distributionPoint") String distributionPoint);
+
+    /**
+     * 获取配网数据质量-台帐类数据质量核查（季）
+     *
+     * @param deptIds           单位id
+     * @param param             条件参数
+     * @param distributionPoint 配网字典id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatAccountCheckDataVO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<PwRStatAccountCheckDataVO> getSeasonInfo(@Param("deptIds") List<String> deptIds,
+                                                @Param("param") StatisticsBizBaseParam param,
+                                                @Param("distributionPoint") String distributionPoint);
+
+    /**
+     * 获取配网数据质量-台帐类数据质量核查（月）
+     *
+     * @param deptIds           单位id
+     * @param param             条件参数
+     * @param distributionPoint 配网字典id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatAccountCheckDataVO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<PwRStatAccountCheckDataVO> getMonthInfo(@Param("deptIds") List<String> deptIds,
+                                                @Param("param") StatisticsBizBaseParam param,
+                                                @Param("distributionPoint") String distributionPoint);
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwMonitorMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.distribution;
 
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRMpMonitorAlarmCountMMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;
+
+/**
+* @author jianghf
+* @description 针对表【r_mp_monitor_alarm_count_m】的数据库操作Mapper
+* @createDate 2022-10-12 20:08:33
+* @Entity com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM
+*/
+public interface PwRMpMonitorAlarmCountMMapper extends BaseMapper<RMpMonitorAlarmCountM> {
+
+
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwROperatingIndexMapper.java

@@ -0,0 +1,55 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.vo.PwRDnOperatingVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 获取配网数据质量-监测指标数据质量统计
+ *
+ * @author yzh
+ * @date 2022/11/7
+ */
+
+@Mapper
+public interface PwROperatingIndexMapper {
+
+    /**
+     * 获取配网数据质量-监测指标数据质量统计（年）
+     *
+     * @param param    条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.RDnOperatingPO>
+     * @author yzh
+     * @date 2022/11/7
+     */
+    List<PwRDnOperatingVO> getYearInfo(@Param(("param")) StatisticsBizBaseParam param,
+                                       @Param(("deptIdList")) List<String> deptIdList);
+
+    /**
+     * 获取配网数据质量-监测指标数据质量统计（季）
+     *
+     * @param param    条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.RDnOperatingPO>
+     * @author yzh
+     * @date 2022/11/7
+     */
+    List<PwRDnOperatingVO> getSeasonInfo(@Param(("param")) StatisticsBizBaseParam param,
+                                       @Param(("deptIdList")) List<String> deptIdList);
+
+    /**
+     * 获取配网数据质量-监测指标数据质量统计（月）
+     *
+     * @param param    条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.RDnOperatingPO>
+     * @author yzh
+     * @date 2022/11/7
+     */
+    List<PwRDnOperatingVO> getMonthInfo(@Param(("param")) StatisticsBizBaseParam param,
+                                        @Param(("deptIdList")) List<String> deptIdList);
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatAreaAlarmCountMMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_area_alarm_count_m】的数据库操作Mapper
+* @createDate 2022-10-10 14:36:46
+* @Entity com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM
+*/
+public interface PwRStatAreaAlarmCountMMapper extends BaseMapper<RStatAreaAlarmCountM> {
+
+
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/PwRStatTargetCheckDataMapper.java

@@ -0,0 +1,59 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/11/8
+ */
+
+@Mapper
+public interface PwRStatTargetCheckDataMapper {
+
+    /**
+     * 获取配网数据质量-监测指标数据质量核查（年）
+     *
+     * @param deptIds           单位id
+     * @param param             条件参数
+     * @param distributionPoint 配网字典id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatTargetCheckDataVO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<RStatTargetCheckDataVO> getYearInfo(@Param("deptIds") List<String> deptIds,
+                                            @Param("param") StatisticsBizBaseParam param,
+                                            @Param("distributionPoint") String distributionPoint);
+
+    /**
+     * 获取配网数据质量-监测指标数据质量核查（季）
+     *
+     * @param deptIds           单位id
+     * @param param             条件参数
+     * @param distributionPoint 配网字典id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatTargetCheckDataVO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<RStatTargetCheckDataVO> getSeasonInfo(@Param("deptIds") List<String> deptIds,
+                                               @Param("param") StatisticsBizBaseParam param,
+                                               @Param("distributionPoint") String distributionPoint);
+
+    /**
+     * 获取配网数据质量-监测指标数据质量核查（月）
+     *
+     * @param deptIds           单位id
+     * @param param             条件参数
+     * @param distributionPoint 配网字典id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatTargetCheckDataVO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<RStatTargetCheckDataVO> getMonthInfo(@Param("deptIds") List<String> deptIds,
+                                              @Param("param") StatisticsBizBaseParam param,
+                                              @Param("distributionPoint") String distributionPoint);
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingIndexMMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RDnOperatingIndexM;
+import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_dn_operating_index_m(配网运行指标统计-月表,配网监测指标数据质量统计-月表 )】的数据库操作Mapper
+* @createDate 2022-11-10 10:21:46
+* @Entity com.njcn.device.pms.pojo.po.RDnOperatingIndexM
+*/
+public interface RDnOperatingIndexMMapper extends BaseMapper<RDnOperatingIndexM> {
+
+    List<PwRDnOperatingIndexCommonVO> getOperatingList(Map<String, Object> condMap);
+}
+
+
+
+

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.po.RDnOperatingY;
+import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper
+* @createDate 2022-11-10 10:21:46
+* @Entity com.njcn.device.pms.pojo.po.RDnOperatingY
+*/
+public interface RDnOperatingYMapper extends BaseMapper<RDnOperatingY> {
+
+    List<PwRDnOperatingIndexCommonVO> getOperatingList(Map<String, Object> condMap);
+}
+
+
+
+

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RMpPwAlarmDetailDMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.distribution;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RStatPwAlarmCountWMapper.java

@@ -0,0 +1,23 @@
+package com.njcn.device.pms.mapper.distribution;
+
+import com.njcn.device.pms.pojo.po.RStatPwAlarmCountW;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author jianghf
+* @description 针对表【r_stat_pw_alarm_count_w】的数据库操作Mapper
+* @createDate 2022-11-02 15:42:29
+* @Entity com.njcn.device.pms.pojo.po.RStatPwAlarmCountW
+*/
+public interface RStatPwAlarmCountWMapper extends BaseMapper<RStatPwAlarmCountW> {
+
+    List<RStatPwAlarmCountWVO> getRStatPwAlarmCountVOList(Map<String, Object> condMap);
+}
+
+
+
+

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwDataQualityCheckMapper.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.PwDataQualityCheckMapper">
+
+    <sql id="query_field">
+        org_no AS orgNo,
+        data_date AS dataDate,
+        dev_field_null AS devFieldNull,
+        dev_run_time_abnormal AS devRunTimeAbnormal,
+        dev_type_error AS devTypeError,
+        dev_check_time_abnormal AS devCheckTimeAbnormal,
+        dev_ip_error AS devIpError,
+        measurement_field_null AS measurementFieldNull,
+        measurement_name_abnormal AS measurementNameAbnormal,
+        measurement_type_abnormal AS measurementTypeAbnormal,
+        measurement_capacity_error AS measurementCapacityError,
+        measurement_dev_not_match AS measurementDevNotMatch,
+        measurement_type_error AS measurementTypeError,
+        traction_station_measurement_redundancy AS tractionStationMeasurementRedundancy,
+        railway_capacity_error AS railwayCapacityError,
+        traction_station_measurement_missing AS tractionStationMeasurementMissing,
+        data_type AS dataType
+    </sql>
+    <sql id="query_where">
+        org_no IN
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="distributionPoint != null and distributionPoint != '' ">
+            AND data_type = #{distributionPoint}
+        </if>
+        <if test="param.startTime != null and param.startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d')
+        </if>
+        <if test="param.endTime != null and param.endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d')
+        </if>
+    </sql>
+
+    <!--获取配网数据质量-台帐类数据质量核查（年）-->
+    <select id="getYearInfo" resultType="com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_account_check_data_y
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网数据质量-台帐类数据质量核查（季）-->
+    <select id="getSeasonInfo" resultType="com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_account_check_data_q
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网数据质量-台帐类数据质量核查（月）-->
+    <select id="getMonthInfo" resultType="com.njcn.device.pms.pojo.vo.PwRStatAccountCheckDataVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_account_check_data_m
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+</mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwMonitorMapper.xml

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.PwMonitorMapper">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.PwMonitorMapper">
 
-    <!--获取配网监测点信息-->
+    <!--获取配网监测点信息详情-->
     <select id="getPwMonitorDataList" resultType="com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO">
         SELECT DISTINCT
         monitor.Org_Id AS orgId,
         monitor.Org_Name AS orgName,
-        monitor.id as monitorId,
+        monitor.`Powerr_Id` AS powerId,
-        monitor.`Name` as monitorName,
+        monitor.`Powerr_Name` AS powerName,
+        monitor.id AS monitorId,
+        monitor.`Name` AS monitorName,
+        monitor.Line_Id,
+        monitor.Line_Name,
         pdm.Monitor_Sort AS monitorSort,
         pdm.Voltage_Level AS voltageLevel,
         pdm.If_Power_User AS if_powerUser,
@@ -19,17 +23,67 @@
         pdm.Create_Time AS createTime,
         pdm.Update_By AS updateBy,
         pdm.Update_Time AS updateTime
-        FROM (
+        FROM
-        (SELECT pm.id, pm.`Name`, pm.`Status`, pm.Org_Id, pm.Org_Name FROM pms_monitor AS pm)
+        ((
-        UNION ALL
+        SELECT
-        (SELECT ppd.id, ppd.`Name`, ppd.`Status`, ppd.Org_Id, ppd.Org_Name
+        pm.id,
-        FROM pms_power_distributionarea AS ppd)
+        pm.`Name`,
-        UNION ALL
+        pm.`Status`,
-        (SELECT ppc.id, ppc.`Name`, ppc.`Status`, ppc.Org_Id, ppc.Org_Name FROM pms_power_client AS ppc)
+        pm.Org_Id,
-        UNION ALL
+        pm.Org_Name,
-        (SELECT ppgu.id, ppgu.`Name`, ppgu.`Status`, ppgu.Org_Id, ppgu.Org_Name
+        pm.Powerr_Id,
-        FROM pms_power_generation_user AS ppgu)
+        pm.Powerr_Name,
-        ) AS monitor
+        pm.Line_Id,
+        pm.Line_Name
+        FROM
+        pms_monitor AS pm
+        ) UNION ALL
+        (
+        SELECT
+        ppd.id,
+        ppd.`Name`,
+        ppd.`Status`,
+        ppd.Org_Id,
+        ppd.Org_Name,
+        ppd.Power_Station_Id,
+        ppd.Powerr_Name,
+        ppd.Line_Id,
+        ppd.Line_Name
+        FROM
+        pms_power_distributionarea AS ppd
+        ) UNION ALL
+        (
+        SELECT
+        ppc.id,
+        ppc.`Name`,
+        ppc.`Status`,
+        ppc.Org_Id,
+        ppc.Org_Name,
+        ppc.Power_Station_Id,
+        ps.Power_Name,
+        ppc.Line_Id,
+        0
+        FROM
+        pms_power_client AS ppc
+        INNER JOIN pms_statation_stat ps ON ps.Power_Id = ppc.Power_Station_Id
+        AND ppc.Org_Id = ps.Org_Id
+        ) UNION ALL
+        (
+        SELECT
+        ppgu.id,
+        ppgu.`Name`,
+        ppgu.`Status`,
+        ppgu.Org_Id,
+        ppgu.Org_Name,
+        ppgu.Power_Station_Id,
+        pss.Power_Name,
+        ppgu.Line_Id,
+        0
+        FROM
+        pms_power_generation_user AS ppgu
+        INNER JOIN pms_statation_stat AS pss ON pss.Power_Id = ppgu.Power_Station_Id
+        AND ppgu.Org_Id = pss.Org_Id
+        )) AS monitor
         INNER JOIN pms_distribution_monitor AS pdm ON monitor.id = pdm.Monitor_Id
         WHERE
         monitor.`Status` = 1
@@ -44,6 +98,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="pwPmsMonitorParam.powerId!=null and pwPmsMonitorParam.powerId.size()!=0">
+            AND monitor.Powerr_Id IN
+            <foreach collection="pwPmsMonitorParam.powerId" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="pwPmsMonitorParam.monitorSort!=null and pwPmsMonitorParam.monitorSort.size()!=0">
             AND pdm.Monitor_Sort IN
             <foreach collection="pwPmsMonitorParam.monitorSort" item="item" open="(" close=")" separator=",">

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRMpMonitorAlarmCountMMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.PwRMpMonitorAlarmCountMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="dataType" column="data_type" jdbcType="INTEGER"/>
+            <result property="measurementPointId" column="measurement_point_id" jdbcType="VARCHAR"/>
+            <result property="vdevAlarmInfo" column="vdev_alarm_info" jdbcType="INTEGER"/>
+            <result property="vdevSeverity" column="vdev_severity" jdbcType="INTEGER"/>
+            <result property="freqAlarmInfo" column="freq_alarm_info" jdbcType="INTEGER"/>
+            <result property="freqSeverity" column="freq_severity" jdbcType="INTEGER"/>
+            <result property="unbalanceAlarmInfo" column="unbalance_alarm_info" jdbcType="INTEGER"/>
+            <result property="unbalanceSeverity" column="unbalance_severity" jdbcType="INTEGER"/>
+            <result property="vAlarmInfo" column="v_alarm_info" jdbcType="INTEGER"/>
+            <result property="vSeverity" column="v_severity" jdbcType="INTEGER"/>
+            <result property="flickerAlarmInfo" column="flicker_alarm_info" jdbcType="INTEGER"/>
+            <result property="flickerSeverity" column="flicker_severity" jdbcType="INTEGER"/>
+            <result property="sagAlarmInfo" column="sag_alarm_info" jdbcType="INTEGER"/>
+            <result property="sagSeverity" column="sag_severity" jdbcType="INTEGER"/>
+            <result property="interruptAlarmInfo" column="interrupt_alarm_info" jdbcType="INTEGER"/>
+            <result property="interruptSeverity" column="interrupt_severity" jdbcType="INTEGER"/>
+            <result property="harmonicTypeGrade" column="harmonic_type_grade" jdbcType="INTEGER"/>
+            <result property="eventTypeGrade" column="event_type_grade" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,data_type,
+        measurement_point_id,vdev_alarm_info,vdev_severity,
+        freq_alarm_info,freq_severity,unbalance_alarm_info,
+        unbalance_severity,v_alarm_info,v_severity,
+        flicker_alarm_info,flicker_severity,sag_alarm_info,
+        sag_severity,interrupt_alarm_info,interrupt_severity,
+        harmonic_type_grade,event_type_grade
+    </sql>
+</mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml

@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.PwROperatingIndexMapper">
+
+    <sql id="query_where">
+        z.org_no IN
+        <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="param.startTime != null and param.startTime != ''">
+            AND DATE_FORMAT(z.data_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d')
+        </if>
+        <if test="param.endTime != null and param.endTime != ''">
+            AND DATE_FORMAT(z.data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d')
+        </if>
+    </sql>
+
+
+    <!--获取配网数据质量-监测指标数据质量统计（年）-->
+    <select id="getYearInfo" resultType="com.njcn.device.pms.pojo.vo.PwRDnOperatingVO">
+        SELECT
+        z.org_no AS orgNo,
+        z.data_date AS dataDate,
+        z.measurement_run_points AS measurementCount,
+        z.effective_access_measurement_count AS effectiveAccessMeasurementCount,
+        IFNULL((
+        SELECT
+        a.effective_access_measurement_count
+        FROM
+        r_dn_operating_y AS a
+        WHERE
+        a.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+        ),
+        3.14159
+        ) AS effectiveAccessMeasurementCountYearOnYear,
+        IFNULL((
+        SELECT
+        b.effective_access_measurement_count
+        FROM
+        r_dn_operating_y AS b
+        WHERE
+        b.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+        ),
+        3.14159
+        ) AS effectiveAccessMeasurementCountRingRatio,
+        TRUNCATE ( z.effective_access_measurement_count / z.measurement_run_points, 2 ) AS effectiveAccessRate,
+        IFNULL((
+        SELECT TRUNCATE
+        ( c.effective_access_measurement_count / c.measurement_run_points, 2 )
+        FROM
+        r_dn_operating_y AS c
+        WHERE
+        c.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+        ),
+        3.14159
+        ) AS effectiveAccessRateYearOnYear,
+        IFNULL((
+        SELECT TRUNCATE
+        ( d.effective_access_measurement_count / d.measurement_run_points, 2 )
+        FROM
+        r_dn_operating_y AS d
+        WHERE
+        d.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+        ),
+        3.14159
+        ) AS effectiveAccessRateRingRatio,
+        z.data_integrity_rate AS dataIntegrityRate,
+        IFNULL((
+        SELECT
+        e.data_integrity_rate
+        FROM
+        r_dn_operating_y AS e
+        WHERE
+        e.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+        ),
+        3.14159
+        ) AS dataIntegrityRateYearOnYear,
+        IFNULL((
+        SELECT
+        f.data_integrity_rate
+        FROM
+        r_dn_operating_y AS f
+        WHERE
+        f.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 YEAR )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 YEAR )))
+        ),
+        3.14159
+        ) AS dataIntegrityRateRingRatio,
+        z.index_integrity_rate AS indexIntegrityRate,
+        z.is_unusual AS isUnusual
+        FROM
+        r_dn_operating_y AS z
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网数据质量-监测指标数据质量统计（季）-->
+    <select id="getSeasonInfo" resultType="com.njcn.device.pms.pojo.vo.PwRDnOperatingVO">
+        SELECT
+        z.org_no AS orgNo,
+        z.data_date AS dataDate,
+        z.measurement_run_points AS measurementCount,
+        z.effective_access_measurement_count AS effectiveAccessMeasurementCount,
+        IFNULL((
+        SELECT
+        a.effective_access_measurement_count
+        FROM
+        r_dn_operating_y AS a
+        WHERE
+        a.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessMeasurementCountYearOnYear,
+        IFNULL((
+        SELECT
+        b.effective_access_measurement_count
+        FROM
+        r_dn_operating_y AS b
+        WHERE
+        b.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessMeasurementCountRingRatio,
+        TRUNCATE ( z.effective_access_measurement_count / z.measurement_run_points, 2 ) AS effectiveAccessRate,
+        IFNULL((
+        SELECT TRUNCATE
+        ( c.effective_access_measurement_count / c.measurement_run_points, 2 )
+        FROM
+        r_dn_operating_y AS c
+        WHERE
+        c.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessRateYearOnYear,
+        IFNULL((
+        SELECT TRUNCATE
+        ( d.effective_access_measurement_count / d.measurement_run_points, 2 )
+        FROM
+        r_dn_operating_y AS d
+        WHERE
+        d.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessRateRingRatio,
+        z.data_integrity_rate AS dataIntegrityRate,
+        IFNULL((
+        SELECT
+        e.data_integrity_rate
+        FROM
+        r_dn_operating_y AS e
+        WHERE
+        e.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+        ),
+        3.14159
+        ) AS dataIntegrityRateYearOnYear,
+        IFNULL((
+        SELECT
+        f.data_integrity_rate
+        FROM
+        r_dn_operating_y AS f
+        WHERE
+        f.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 3 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 3 MONTH )))
+        ),
+        3.14159
+        ) AS dataIntegrityRateRingRatio,
+        z.index_integrity_rate AS indexIntegrityRate,
+        z.is_unusual AS isUnusual
+        FROM
+        r_dn_operating_y AS z
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网数据质量-监测指标数据质量统计（月）-->
+    <select id="getMonthInfo" resultType="com.njcn.device.pms.pojo.vo.PwRDnOperatingVO">
+        SELECT
+        z.org_no AS orgNo,
+        z.data_date AS dataDate,
+        z.measurement_run_points AS measurementCount,
+        z.effective_access_measurement_count AS effectiveAccessMeasurementCount,
+        IFNULL((
+        SELECT
+        a.effective_access_measurement_count
+        FROM
+        r_dn_operating_y AS a
+        WHERE
+        a.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessMeasurementCountYearOnYear,
+        IFNULL((
+        SELECT
+        b.effective_access_measurement_count
+        FROM
+        r_dn_operating_y AS b
+        WHERE
+        b.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessMeasurementCountRingRatio,
+        TRUNCATE ( z.effective_access_measurement_count / z.measurement_run_points, 2 ) AS effectiveAccessRate,
+        IFNULL((
+        SELECT TRUNCATE
+        ( c.effective_access_measurement_count / c.measurement_run_points, 2 )
+        FROM
+        r_dn_operating_y AS c
+        WHERE
+        c.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessRateYearOnYear,
+        IFNULL((
+        SELECT TRUNCATE
+        ( d.effective_access_measurement_count / d.measurement_run_points, 2 )
+        FROM
+        r_dn_operating_y AS d
+        WHERE
+        d.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+        ),
+        3.14159
+        ) AS effectiveAccessRateRingRatio,
+        z.data_integrity_rate AS dataIntegrityRate,
+        IFNULL((
+        SELECT
+        e.data_integrity_rate
+        FROM
+        r_dn_operating_y AS e
+        WHERE
+        e.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+        ),
+        3.14159
+        ) AS dataIntegrityRateYearOnYear,
+        IFNULL((
+        SELECT
+        f.data_integrity_rate
+        FROM
+        r_dn_operating_y AS f
+        WHERE
+        f.org_no = z.org_no
+        AND (
+        z.data_date &gt;= date(
+        DATE_ADD( #{param.startTime}, INTERVAL - 1 MONTH )))
+        AND (
+        z.data_date &lt;= date(
+        DATE_ADD( #{param.endTime}, INTERVAL - 1 MONTH )))
+        ),
+        3.14159
+        ) AS dataIntegrityRateRingRatio,
+        z.index_integrity_rate AS indexIntegrityRate,
+        z.is_unusual AS isUnusual
+        FROM
+        r_dn_operating_y AS z
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+</mapper>
+
+
+
+
+
+
+
+
+
+
+
+
+
+

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatAreaAlarmCountMMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.PwRStatAreaAlarmCountMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="dataType" column="data_type" jdbcType="INTEGER"/>
+            <result property="vdevAlarmInfo" column="vdev_alarm_info" jdbcType="INTEGER"/>
+            <result property="vdevAlarmRatio" column="vdev_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="freqAlarmInfo" column="freq_alarm_info" jdbcType="INTEGER"/>
+            <result property="freqAlarmRatio" column="freq_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="unbalanceAlarmInfo" column="unbalance_alarm_info" jdbcType="INTEGER"/>
+            <result property="unbalanceAlarmRatio" column="unbalance_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="vAlarmInfo" column="v_alarm_info" jdbcType="INTEGER"/>
+            <result property="vAlarmRatio" column="v_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="flickerAlarmInfo" column="flicker_alarm_info" jdbcType="INTEGER"/>
+            <result property="flickerAlarmRatio" column="flicker_alarm_ratio" jdbcType="INTEGER"/>
+            <result property="sagAlarmInfo" column="sag_alarm_info" jdbcType="INTEGER"/>
+            <result property="sagAlarmAvgCount" column="sag_alarm_avg_count" jdbcType="INTEGER"/>
+            <result property="interruptAlarmInfo" column="interrupt_alarm_info" jdbcType="INTEGER"/>
+            <result property="interruptAlarmAvgCount" column="interrupt_alarm_avg_count" jdbcType="INTEGER"/>
+            <result property="harmonicTypeGrade" column="harmonic_type_grade" jdbcType="INTEGER"/>
+            <result property="eventTypeGrade" column="event_type_grade" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,data_type,
+        vdev_alarm_info,vdev_alarm_ratio,freq_alarm_info,
+        freq_alarm_ratio,unbalance_alarm_info,unbalance_alarm_ratio,
+        v_alarm_info,v_alarm_ratio,flicker_alarm_info,
+        flicker_alarm_ratio,sag_alarm_info,sag_alarm_avg_count,
+        interrupt_alarm_info,interrupt_alarm_avg_count,harmonic_type_grade,
+        event_type_grade
+    </sql>
+</mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwRStatTargetCheckDataMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.PwRStatTargetCheckDataMapper">
+
+    <sql id="query_field">
+        org_no AS orgNo,
+	    data_date AS dataDate,
+	    fundamental_voltage_abnormal AS fundamentalVoltageAbnormal,
+	    frequency_abnormal AS frequencyAbnormal,
+	    v_dev_abnormal AS vDevAbnormal,
+	    harmonic_voltage_abnormal AS harmonicVoltageAbnormal,
+	    centre_harmonic_voltage AS centreHarmonicVoltage,
+	    tp_voltage_unbalance AS tpVoltageUnbalance,
+	    v_dev_last_overlimit AS vDevLastOverlimit,
+	    traction_station_measurement_none AS tractionStationMeasurementNone,
+	    railway_fundamental_voltage_abnormal AS railwayFundamentalVoltageAbnormal,
+	    railway_fundamental_current_abnormal AS railwayFundamentalCurrentAbnormal,
+	    railway_total_active_power_abnormal AS railwayTotalActivePowerAbnormal,
+	    railway_harmonic_voltage_content_abnormal AS railwayHarmonicVoltageContentAbnormal,
+	    freq_upload_event AS freqUploadEvent,
+	    wave_upload_error AS waveUploadError,
+	    event_last_time_abnormal AS eventLastTimeAbnormal,
+	    event_type_amplitude_atypism AS eventTypeAmplitudeAtypism,
+	    event_type_amplitude_abnormal AS eventTypeAmplitudeAbnormal,
+	    event_phase_none AS eventPhaseNone,
+	    run_volatge_up AS runVolatgeUp,
+	    run_volatge_low AS runVolatgeLow,
+	    data_type AS dataType
+    </sql>
+    <sql id="query_where">
+        org_no IN
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="distributionPoint != null and distributionPoint != '' ">
+            AND data_type = #{distributionPoint}
+        </if>
+        <if test="param.startTime != null and param.startTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d')
+        </if>
+        <if test="param.endTime != null and param.endTime != ''">
+            AND DATE_FORMAT(data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d')
+        </if>
+    </sql>
+
+
+    <!-- 获取配网数据质量-监测指标数据质量核查（年）-->
+    <select id="getYearInfo" resultType="com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_target_check_data_y
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网数据质量-监测指标数据质量核查（季）-->
+    <select id="getSeasonInfo" resultType="com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_target_check_data_q
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网数据质量-监测指标数据质量核查（月）-->
+    <select id="getMonthInfo" resultType="com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_target_check_data_m
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+</mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingIndexMMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.RDnOperatingIndexMMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RDnOperatingIndexM">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="TIMESTAMP"/>
+            <id property="measurementPointType" column="measurement_point_type" jdbcType="VARCHAR"/>
+            <result property="measurementRunPoints" column="measurement_run_points" jdbcType="INTEGER"/>
+            <result property="transitMeasurementPoints" column="transit_measurement_points" jdbcType="INTEGER"/>
+            <result property="effectiveAccessMeasurementCount" column="effective_access_measurement_count" jdbcType="INTEGER"/>
+            <result property="effectiveAccessRate" column="effective_access_rate" jdbcType="VARCHAR"/>
+            <result property="shouldCount" column="should_count" jdbcType="INTEGER"/>
+            <result property="shouldPointCoverage" column="should_point_coverage" jdbcType="INTEGER"/>
+            <result property="dataIntegrityRate" column="data_integrity_rate" jdbcType="FLOAT"/>
+            <result property="dataRightRate" column="data_right_rate" jdbcType="FLOAT"/>
+            <result property="indexIntegrityRate" column="index_integrity_rate" jdbcType="FLOAT"/>
+            <result property="isUnusual" column="is_unusual" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,measurement_point_type,
+        measurement_run_points,transit_measurement_points,effective_access_measurement_count,
+        effective_access_rate,should_count,should_point_coverage,
+        data_integrity_rate,data_right_rate,index_integrity_rate,
+        is_unusual
+    </sql>
+    <select id="getOperatingList" resultType="com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO" parameterType="map">
+        select
+            rdim1.org_no,
+            rdim1.data_date,
+
+            rdim1.measurement_run_points as measurementPointsOne,
+            rdim1.should_count as shouldCountOne,
+
+            rdim2.measurement_run_points as measurementPointsTwo,
+            rdim2.should_count as shouldCountTwo,
+
+            rdim3.measurement_run_points as measurementPointsThree,
+            rdim3.should_count as shouldCountThree,
+            -- 应设点覆盖率
+            truncate((rdim1.should_point_coverage + rdim2.should_point_coverage + rdim3.should_point_coverage) / 3, 2) as shouldPointCoverage,
+
+            -- 有效接入率
+            truncate(
+                (rdim1.effective_access_measurement_count + rdim2.effective_access_measurement_count + rdim3.effective_access_measurement_count)
+                   / (rdim1.measurement_run_points + rdim2.measurement_run_points + rdim3.measurement_run_points) * 100, 2
+                ) as effectiveAccessRate,
+
+            -- 数据完整率
+            truncate((rdim1.data_integrity_rate + rdim2.data_integrity_rate + rdim3.data_integrity_rate) / 3, 2) as dataIntegrityRate,
+            -- 数据准确率
+            truncate((rdim1.data_right_rate + rdim2.data_right_rate + rdim3.data_right_rate) / 3, 2) as dataRightRate
+
+        from r_dn_operating_index_m  rdim1
+
+        left join r_dn_operating_index_m  rdim2
+          on rdim1.org_no = rdim2.org_no
+        left join r_dn_operating_index_m rdim3
+          on rdim1.org_no = rdim3.org_no
+        where  1 = 1
+        <if test="startTime != null and startTime != ''">
+            and DATE_FORMAT(rdim1.data_date, '%Y-%m-%d') >= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and DATE_FORMAT(rdim1.data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+          and rdim1.org_no in
+        <foreach collection="orgIdList" item="orgId" separator="," open="(" close=")">
+            #{orgId}
+        </foreach>
+        and DATE_FORMAT(rdim1.data_date, '%Y-%m-%d') = DATE_FORMAT(rdim2.data_date, '%Y-%m-%d')
+        and DATE_FORMAT(rdim2.data_date, '%Y-%m-%d') = DATE_FORMAT(rdim3.data_date, '%Y-%m-%d')
+        and rdim1.measurement_point_type = #{monitorSortOne}
+        and rdim2.measurement_point_type = #{monitorSortTwo}
+        and rdim3.measurement_point_type = #{monitorSortThree}
+
+    </select>
+</mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.RDnOperatingYMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RDnOperatingY">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <id property="measurementPointType" column="measurement_point_type" jdbcType="VARCHAR"/>
+            <result property="measurementRunPoints" column="measurement_run_points" jdbcType="INTEGER"/>
+            <result property="transitMeasurementPoints" column="transit_measurement_points" jdbcType="INTEGER"/>
+            <result property="effectiveAccessMeasurementCount" column="effective_access_measurement_count" jdbcType="INTEGER"/>
+            <result property="effectiveAccessRate" column="effective_access_rate" jdbcType="VARCHAR"/>
+            <result property="shouldCount" column="should_count" jdbcType="INTEGER"/>
+            <result property="shouldPointCoverage" column="should_point_coverage" jdbcType="INTEGER"/>
+            <result property="dataIntegrityRate" column="data_integrity_rate" jdbcType="FLOAT"/>
+            <result property="dataRightRate" column="data_right_rate" jdbcType="FLOAT"/>
+            <result property="indexIntegrityRate" column="index_integrity_rate" jdbcType="FLOAT"/>
+            <result property="isUnusual" column="is_unusual" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,measurement_point_type,
+        measurement_run_points,transit_measurement_points,effective_access_measurement_count,
+        effective_access_rate,should_count,should_point_coverage,
+        data_integrity_rate,data_right_rate,index_integrity_rate,
+        is_unusual
+    </sql>
+    <select id="getOperatingList" resultType="com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO" parameterType="map">
+
+        select
+        rdim1.org_no,
+        rdim1.data_date,
+
+        rdim1.measurement_run_points as measurementPointsOne,
+        rdim1.should_count as shouldCountOne,
+
+        rdim2.measurement_run_points as measurementPointsTwo,
+        rdim2.should_count as shouldCountTwo,
+
+        rdim3.measurement_run_points as measurementPointsThree,
+        rdim3.should_count as shouldCountThree,
+        -- 应设点覆盖率
+        truncate((rdim1.should_point_coverage + rdim2.should_point_coverage + rdim3.should_point_coverage) / 3, 2) as shouldPointCoverage,
+
+        -- 有效接入率
+        truncate(
+        (rdim1.effective_access_measurement_count + rdim2.effective_access_measurement_count + rdim3.effective_access_measurement_count)
+        / (rdim1.measurement_run_points + rdim2.measurement_run_points + rdim3.measurement_run_points) * 100, 2
+        ) as effectiveAccessRate,
+
+        -- 数据完整率
+        truncate((rdim1.data_integrity_rate + rdim2.data_integrity_rate + rdim3.data_integrity_rate) / 3, 2) as dataIntegrityRate,
+        -- 数据准确率
+        truncate((rdim1.data_right_rate + rdim2.data_right_rate + rdim3.data_right_rate) / 3, 2) as dataRightRate
+
+        from r_dn_operating_y  rdim1
+
+        left join r_dn_operating_y  rdim2
+        on rdim1.org_no = rdim2.org_no
+        left join r_dn_operating_y rdim3
+        on rdim1.org_no = rdim3.org_no
+        where  1 = 1
+        <if test="startTime != null and startTime != ''">
+            and DATE_FORMAT(rdim1.data_date, '%Y-%m-%d') >= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and DATE_FORMAT(rdim1.data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        and rdim1.org_no in
+        <foreach collection="orgIdList" item="orgId" separator="," open="(" close=")">
+            #{orgId}
+        </foreach>
+        and DATE_FORMAT(rdim1.data_date, '%Y-%m-%d') = DATE_FORMAT(rdim2.data_date, '%Y-%m-%d')
+        and DATE_FORMAT(rdim2.data_date, '%Y-%m-%d') = DATE_FORMAT(rdim3.data_date, '%Y-%m-%d')
+        and rdim1.measurement_point_type = #{monitorSortOne}
+        and rdim2.measurement_point_type = #{monitorSortTwo}
+        and rdim3.measurement_point_type = #{monitorSortThree}
+
+    </select>
+</mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RMpPwAlarmDetailDMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.RMpPwAlarmDetailDMapper">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.RMpPwAlarmDetailDMapper">
 
     <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD">
             <id property="dataDate" column="data_date" jdbcType="DATE"/>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RStatPwAlarmCountWMapper.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.pms.mapper.distribution.RStatPwAlarmCountWMapper">
+
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RStatPwAlarmCountW">
+            <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+            <id property="dataDate" column="data_date" jdbcType="DATE"/>
+            <result property="onlineMonitorCount" column="online_monitor_count" jdbcType="INTEGER"/>
+            <result property="alarmMonitorCount" column="alarm_monitor_count" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <!--orgNo在外面单独处理-->
+    <resultMap id="BaseResultMapVO" type="com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO">
+        <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
+        <id property="dataDate" column="data_date" jdbcType="DATE"/>
+        <result property="onlineMonitorCount" column="online_monitor_count" jdbcType="INTEGER"/>
+        <result property="alarmMonitorCount" column="alarm_monitor_count" jdbcType="INTEGER"/>
+        <result property="alarmMonitorRate" column="alarm_monitor_rate" jdbcType="DOUBLE"/>
+        <result property="alarmMonitorRateYoy" column="alarm_monitor_rate_yoy" jdbcType="DOUBLE"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        org_no,data_date,online_monitor_count,
+        alarm_monitor_count
+    </sql>
+
+    <!--查询各单位告警监测点总数、占比、占比同比信息-->
+    <select id="getRStatPwAlarmCountVOList" resultType="com.njcn.device.pms.pojo.vo.RStatPwAlarmCountWVO" parameterType="map">
+        select
+               org_no,data_date,online_monitor_count,alarm_monitor_count,
+                TRUNCATE(alarm_monitor_count / online_monitor_count * 100, 2) as alarm_monitor_rate,
+               (
+                   select TRUNCATE(alarm_monitor_count / online_monitor_count * 100, 2)
+                   from r_stat_pw_alarm_count_w rspw2
+                   where rspw1.org_no = rspw2.org_no
+                   <if test="startTime != null and startTime != ''">
+                       and data_date >= DATE(DATE_SUB(#{startTime}, INTERVAL 1 YEAR))
+                   </if>
+                   <if test="endTime != null and endTime != ''">
+                       and data_date &lt;= DATE(DATE_SUB(#{endTime}, INTERVAL 1 YEAR))
+                   </if>
+               ) as alarm_monitor_rate_yoy
+        from r_stat_pw_alarm_count_w rspw1
+        where 1 = 1
+        and org_no in
+        <foreach collection="orgIdList" item="orgId" separator="," open="(" close=")">
+            #{orgId}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            and data_date >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and data_date &lt;= #{endTime}
+        </if>
+    </select>
+</mapper>

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

@@ -1,9 +1,10 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.po.DistributionMonitor;
+import com.njcn.device.pms.pojo.vo.DoubleUserVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -25,5 +26,12 @@ public interface DistributionMonitorMapper extends BaseMapper<DistributionMonito
      */
     List<PmsMonitorBaseDTO> getIdByOrgId(@Param("orgIds")List<String> orgIds, @Param("pmsDeviceInfoParam") PmsDeviceInfoParam pmsDeviceInfoParam);
 
+    /**
+     * 获取指定部门下的用电发电用户
+     * @author cdf
+     * @date 2022/11/15
+     */
+    List<DoubleUserVO> getDoubleUserByDept(@Param("orgId")String orgId);
+
 
 }

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.GeneratrixWire;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.HarmonicGeneralManagement;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.common.pojo.dto.SimpleDTO;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.PowerClient;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.PowerGenerationUser;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.PowerQualityMatter;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.RMpTargetWarnD;

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

@@ -0,0 +1,18 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.device.pms.pojo.po.ROperatingIndexM;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author jianghf
+* @description 针对表【r_operating_index_m(主网运行指标统计-月表,主网监测指标数据质量统计-月表 )】的数据库操作Mapper
+* @createDate 2022-11-09 19:56:01
+* @Entity com.njcn.device.pms.pojo.po.ROperatingIndexM
+*/
+public interface ROperatingIndexMMapper extends BaseMapper<ROperatingIndexM> {
+
+}
+
+
+
+

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

@@ -0,0 +1,54 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.vo.ROperatingIndexVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 主网数据质量-监测指标数据质量统计
+ *
+ * @author yzh
+ * @date 2022/11/2
+ */
+@Mapper
+public interface ROperatingIndexMapper {
+
+    /**
+     * 获取主网数据质量-监测指标数据质量统计（年）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.ROperatingIndexPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<ROperatingIndexVO> getYearInfo(@Param("param") StatisticsBizBaseParam param,
+                                        @Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * 获取主网数据质量-监测指标数据质量统计（季）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.ROperatingIndexPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<ROperatingIndexVO> getSeasonInfo(@Param("param") StatisticsBizBaseParam param,
+                                          @Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * 获取主网数据质量-监测指标数据质量统计（月）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.ROperatingIndexPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<ROperatingIndexVO> getMonthInfo(@Param("param") StatisticsBizBaseParam param,
+                                         @Param("deptIdList") List<String> deptIdList);
+}

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

@@ -0,0 +1,18 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.device.pms.pojo.po.ROperatingIndexY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author jianghf
+* @description 针对表【r_operating_index_y(主网运行指标统计-年表,主网监测指标数据质量统计-年表 )】的数据库操作Mapper
+* @createDate 2022-11-09 19:56:01
+* @Entity com.njcn.device.pms.pojo.po.ROperatingIndexY
+*/
+public interface ROperatingIndexYMapper extends BaseMapper<ROperatingIndexY> {
+
+}
+
+
+
+

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

@@ -0,0 +1,33 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.po.RQualityParameterPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 主网数据质量-台账数据质量统计
+ *
+ * @author yzh
+ * @date 2022/11/1
+ */
+@Mapper
+public interface RQualityParameterMapper {
+
+    /**
+     * 获取主网数据质量-台账数据质量统计
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @param dataType   主网测点
+     * @return java.util.List<com.njcn.event.pojo.po.RQualityParameterPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RQualityParameterPO> getLedgerDataQualityStat(@Param("param") StatisticsBizBaseParam param,
+                                                       @Param("deptIdList") List<String> deptIdList,
+                                                       @Param("dataType") String dataType);
+
+}

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

@@ -0,0 +1,54 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 主网数据质量-台帐类数据质量核查
+ *
+ * @author yzh
+ * @date 2022/11/2
+ */
+
+@Mapper
+public interface RStatAccountCheckDataMapper {
+    /**
+     * 获取主网数据质量-台帐类数据质量核查（年）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.RStatAccountCheckDataPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RStatAccountCheckDataVO> getYearInfo(@Param("param") StatisticsBizBaseParam param,
+                                              @Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * 获取主网数据质量-台帐类数据质量核查（季）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.po.RStatAccountCheckDataPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RStatAccountCheckDataVO> getSeasonInfo(@Param("param") StatisticsBizBaseParam param,
+                                                @Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * 获取主网数据质量-台帐类数据质量核查（月）
+     *
+     * @param param      单位id
+     * @param deptIdList 条件参数
+     * @return java.util.List<com.njcn.event.pojo.po.RStatAccountCheckDataPO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RStatAccountCheckDataVO> getMonthInfo(@Param("param") StatisticsBizBaseParam param,
+                                               @Param("deptIdList") List<String> deptIdList);
+}

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.njcn.device.pms.pojo.po.RStatEventOrgPO;
 import com.njcn.device.pms.pojo.vo.RStatEventOrgVO;

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

@@ -0,0 +1,30 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.device.pms.pojo.param.DataQualityDetailsParam;
+import com.njcn.device.pms.pojo.po.RStatMeasurementAccountDetailPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/11/7
+ */
+
+@Mapper
+public interface RStatMeasurementAccountDetailMapper {
+
+    /**
+     * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题
+     *
+     *
+     * @param monitorIdList
+     * @param param 前端参数
+     * @return java.util.List<com.njcn.event.pojo.po.RStatMeasurementAccountDetailPO>
+     * @author yzh
+     * @date 2022/11/7
+     */
+    List<RStatMeasurementAccountDetailPO> getQualityProblemsOfMonitoringPointAccountData(@Param("monitorIdList") List<String> monitorIdList,
+                                                                                         @Param("param") DataQualityDetailsParam param);
+}

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.vo.RStatOrgVO;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.njcn.device.pms.pojo.po.PmsMonitorPO;
 import com.njcn.device.pms.pojo.vo.RStatSubstationVO;

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

@@ -0,0 +1,54 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 主网数据质量-监测指标数据质量核查
+ *
+ * @author yzh
+ * @date 2022/11/2
+ */
+@Mapper
+public interface RStatTargetCheckDataMapper {
+
+    /**
+     * 获取主网数据质量-台帐类数据质量核查（年）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatAccountCheckDataVO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RStatTargetCheckDataVO> getYearInfo(@Param("param") StatisticsBizBaseParam param,
+                                             @Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * 获取主网数据质量-台帐类数据质量核查（季）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatAccountCheckDataVO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RStatTargetCheckDataVO> getSeasonInfo(@Param("param") StatisticsBizBaseParam param,
+                                                @Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * 获取主网数据质量-台帐类数据质量核查（月）
+     *
+     * @param param      条件参数
+     * @param deptIdList 单位id
+     * @return java.util.List<com.njcn.event.pojo.vo.RStatAccountCheckDataVO>
+     * @author yzh
+     * @date 2022/11/2
+     */
+    List<RStatTargetCheckDataVO> getMonthInfo(@Param("param") StatisticsBizBaseParam param,
+                                               @Param("deptIdList") List<String> deptIdList);
+}

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

@@ -0,0 +1,31 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.device.pms.pojo.param.DataQualityDetailsParam;
+import com.njcn.device.pms.pojo.po.RStatTargetDetailPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 获取主网数据质量-稳态指标类数据质量问题查询
+ *
+ * @author yzh
+ * @date 2022/11/9
+ */
+
+@Mapper
+public interface RStatTargetDetailMapper {
+
+    /**
+     * 获取主网数据质量-稳态指标类数据质量问题查询
+     *
+     * @param param      前端条件
+     * @param monitorIds 监测点id
+     * @return java.util.List<com.njcn.device.pms.pojo.po.RStatTargetDetailPO>
+     * @author yzh
+     * @date 2022/11/9
+     */
+    List<RStatTargetDetailPO> getRStatTargetDetail(@Param("param") DataQualityDetailsParam param,
+                                                   @Param("monitorIds") List<String> monitorIds);
+}

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

@@ -0,0 +1,31 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.njcn.device.pms.pojo.param.DataQualityDetailsParam;
+import com.njcn.device.pms.pojo.po.RStatTractionStationAccountDetailPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题
+ *
+ * @author yzh
+ * @date 2022/11/9
+ */
+
+@Mapper
+public interface RStatTractionStationAccountDetailMapper {
+
+    /**
+     * 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题
+     *
+     * @param param         条件参数
+     * @param substationIds 牵引站id
+     * @return java.util.List<com.njcn.device.pms.pojo.po.RStatTractionStationAccountDetailPO>
+     * @author yzh
+     * @date 2022/11/9
+     */
+    List<RStatTractionStationAccountDetailPO> getTractionPlatformAccountDataQualityProblem(@Param("param") DataQualityDetailsParam param,
+                                                                                           @Param("substationIds") List<String> substationIds);
+}

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.vo.RmpEventDetailVO;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.StatisticsRunMonitor;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.TerminalEliminateData;

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

@@ -1,9 +1,9 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pms.pojo.po.Terminal;
+import com.njcn.device.pms.pojo.po.PmsTerminal;
 import com.njcn.device.pms.pojo.vo.PmsTerminalVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @author hongawen
  * @since 2022-10-14
  */
-public interface TerminalMapper extends BaseMapper<Terminal> {
+public interface TerminalMapper extends BaseMapper<PmsTerminal> {
 
     Page<PmsTerminalVO> page(@Param("page")Page<PmsTerminalVO> page, @Param("ew") QueryWrapper<PmsTerminalVO> queryWrapper);
 }

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

@@ -0,0 +1,30 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO;
+import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
+import com.njcn.device.pms.pojo.po.TractionStation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2022-10-14
+ */
+public interface TractionStationMapper extends BaseMapper<TractionStation> {
+
+    /**
+     * 获取牵引站详细信息
+     *
+     * @param param 条件参数
+     * @return java.util.List<com.njcn.device.pms.pojo.dto.PmsTractionStationDTO>
+     * @author yzh
+     * @date 2022/11/8
+     */
+    List<PmsTractionStationDTO> getPmsTractionStationInfo(@Param("param") PmsTractionStationParam param);
+}

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.TransientStasticData;

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

@@ -1,4 +1,4 @@
-package com.njcn.device.pms.mapper;
+package com.njcn.device.pms.mapper.majornetwork;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.po.TreatTransientDetailData;

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.DistributionMonitorMapper">
+<mapper namespace="com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper">
 
 
-    <select id="getIdByOrgId" resultType="PmsMonitorBaseDTO">
+    <select id="getIdByOrgId" resultType="com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO">
         SELECT
             t.Operation_Id operationId,t.Power_Station_Id powerrId,t.Line_Id lineId,t.id monitorId
         FROM
@@ -31,4 +31,25 @@
             ) t
                 INNER JOIN pms_distribution_monitor b ON t.id = b.Monitor_Id
     </select>
+
+
+    <select id="getDoubleUserByDept" resultType="DoubleUserVO">
+        (
+           select yong.name,yong.id,0 as type from pms_power_client yong
+           inner join pms_distribution_monitor dis on yong.id = dis.Monitor_Id and dis.If_Power_User = 0
+           where yong.org_id = #{orgId}
+           and dis.status = 1
+        )
+        UNION ALL
+        (
+            select fa.name,fa.id,1 as type from pms_power_generation_user fa
+            inner join pms_distribution_monitor dis on fa.id = dis.Monitor_Id and dis.If_Power_User = 1
+            where fa.org_id = #{orgId}
+            and dis.status = 1
+        )
+
+
+
+
+    </select>
 </mapper>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.HarmonicGeneralManagementDataMapper">
+<mapper namespace="com.njcn.device.pms.mapper.majornetwork.HarmonicGeneralManagementDataMapper">
 
 </mapper>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.device.pms.mapper.HarmonicGeneralManagementMapper">
+<mapper namespace="com.njcn.device.pms.mapper.majornetwork.HarmonicGeneralManagementMapper">
 
 </mapper>