From 0949b1ee348ea9d1fe7fa3e00f9bcf559243b13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 17 Jan 2023 13:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E7=BB=88?= =?UTF-8?q?=E7=AB=AF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/api/PmsGeneratrixClient.java | 2 +- .../pms/enums/PmsDeviceResponseEnum.java | 2 +- .../pms/pojo/param/GeneratrixWireParam.java | 22 +++-- .../device/pms/pojo/param/MonitorParam.java | 16 ++-- .../device/pms/pojo/po/GeneratrixWire.java | 16 +++- .../com/njcn/device/pms/pojo/po/Monitor.java | 2 +- ... => PmsDistributionMonitorController.java} | 2 +- .../PmsGeneratrixWireController.java | 80 +++++++++++++++- ...troller.java => PmsMonitorController.java} | 2 +- ...ler.java => PmsPowerClientController.java} | 2 +- ...> PmsPowerDistributionareaController.java} | 2 +- ... => PmsPowerGenerationUserController.java} | 2 +- ...a => PmsPowerQualityMatterController.java} | 2 +- .../majornetwork/GeneratrixWireMapper.java | 16 ---- .../majornetwork/PmsGeneratrixMapper.java | 10 +- .../majornetwork/PmsGeneratrixWireMapper.java | 51 ++++++++++ .../PowerDistributionareaMapper.java | 11 +-- ...Mapper.xml => PmsGeneratrixWireMapper.xml} | 30 +++--- .../mapping/PowerDistributionareaMapper.xml | 14 +-- .../mapping/RStatAccountCheckDataMapper.xml | 3 +- .../RStatMeasurementAccountDetailMapper.xml | 29 +++--- ...StatTractionStationAccountDetailMapper.xml | 29 +++--- .../impl/IPwMonitorServiceImpl.java | 5 +- .../majornetwork/IGeneratrixWireService.java | 30 ++++++ .../majornetwork/impl/GeneratrixWireImpl.java | 95 ++++++++++++++----- .../majornetwork/impl/MonitorServiceImpl.java | 11 +-- .../impl/OverviewServiceImpl.java | 4 +- .../impl/PmsGeneratrixServiceImpl.java | 2 - .../impl/RMpDevEvaluateDetailServiceImpl.java | 4 +- .../impl/RMpDevSolveDetailServiceImpl.java | 8 +- .../RMpMonitorAlarmCountMServiceImpl.java | 4 +- .../impl/RStatAreaAlarmCountMServiceImpl.java | 5 +- .../impl/RStatZwAlarmCountWServiceImpl.java | 5 +- 33 files changed, 361 insertions(+), 157 deletions(-) rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/{DistributionMonitorController.java => PmsDistributionMonitorController.java} (98%) rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/{MonitorController.java => PmsMonitorController.java} (99%) rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/{PowerClientController.java => PmsPowerClientController.java} (98%) rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/{PowerDistributionareaController.java => PmsPowerDistributionareaController.java} (98%) rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/{PowerGenerationUserController.java => PmsPowerGenerationUserController.java} (98%) rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/{PowerQualityMatterController.java => PmsPowerQualityMatterController.java} (84%) delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixWireMapper.java rename pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/{PmsGeneratrixMapper.xml => PmsGeneratrixWireMapper.xml} (86%) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java index 491670efc..c7996c968 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java @@ -17,7 +17,7 @@ import java.util.List; * @date 2022/10/18 */ @FeignClient(value = ServerInfo.DEVICE, - path = "/pmsGeneratrix", + path = "/pmsGeneratrixWire", fallbackFactory = PmsGeneratrixClientFallbackFactory.class) public interface PmsGeneratrixClient { diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java index 8124166f6..65ba9348a 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java @@ -17,7 +17,7 @@ public enum PmsDeviceResponseEnum { DEVICE_COMMON_ERROR("A00349","终端模块异常"), ORG_ITEM_EMPTY("A00360","未查询到指定组织机构"), Operation_ITEM_EMPTY("A00361","未查询到指定运维单位"), - VOLTAGE_EMPTY("A00362","未查询到指定母线"), + VOLTAGE_EMPTY("A00362","未查询到指定线路"), LINE_EMPTY("A00363","未查询到指定线路"), NO_USER_TYPE("A00364","未查询字典用户类型"), NO_STATION("A00365","未查询指定电站信息"), diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java index 189648a00..d64d94f0e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java @@ -15,16 +15,26 @@ import javax.validation.constraints.NotBlank; public class GeneratrixWireParam { @ApiModelProperty(value = "线路id",required = true) - @NotBlank(message = "线路id不可为空") - private String wireId; + private String id; @ApiModelProperty(value = "线路名称",required = true) @NotBlank(message = "线路名称不可为空") - private String wireName; + private String name; - @ApiModelProperty(value = "母线id",required = true) - @NotBlank(message = "母线id不可为空") - private String generatrixId; + @ApiModelProperty(value = "电站编号",required = true) + @NotBlank(message = "电站编号不可为空") + private String stationId; + + @ApiModelProperty(value = "电站名称",required = true) + @NotBlank(message = "电站名称不可为空") + private String stationName; + + @ApiModelProperty(value = "母线名称",required = true) + private String generatrixName; + + @ApiModelProperty(value = "电压等级(字典)",required = true) + @NotBlank(message = "电压等级不可为空") + private String scale; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java index 496a9731e..ec27bfe65 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java @@ -72,18 +72,18 @@ public class MonitorParam { private String powerrName; /** - * 母线编号(外键) + * 线路编号 */ - @ApiModelProperty(value = "母线编号(外键)") - @NotBlank(message = "母线编号不能为空") - private String generatrixId; + @ApiModelProperty(value = "线路编号(外键)") + @NotBlank(message = "线路编号不能为空") + private String lineId; /** - * 母线名称 + * 线路名称 */ - @ApiModelProperty(value = "母线名称") - @NotBlank(message = "母线名称不能为空") - private String generatrixName; + @ApiModelProperty(value = "线路名称") + @NotBlank(message = "线路名称不能为空") + private String lineName; /** * 电压等级(字典) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java index 04ab6627e..979826dda 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java @@ -19,12 +19,22 @@ public class GeneratrixWire extends BaseEntity { private static final long serialVersionUID = 1L; @TableId - private String wireId; + private String id; - private String wireName; + private String name; - private String generatrixId; + private String scale; + private String stationId; + + /** + * 电站名称 + */ + private String stationName; + + /** + * 母线名称 + */ private String generatrixName; private Integer status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index d29ca2c9a..9a297b5be 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -63,7 +63,7 @@ public class Monitor extends BaseEntity { /** * 母线名称 */ - private String generatrixName; + private String generatrixWireName; /** * 母线ID(外键) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsDistributionMonitorController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsDistributionMonitorController.java index 5d28e6744..e877c0d42 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsDistributionMonitorController.java @@ -39,7 +39,7 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Api(tags = "台账-配网监测点") -public class DistributionMonitorController extends BaseController { +public class PmsDistributionMonitorController extends BaseController { private final IDistributionMonitorService iDistributionMonitorService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixWireController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixWireController.java index a5eeac7c0..b2fdf696f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixWireController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixWireController.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.controller.majornetwork; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; @@ -7,8 +8,13 @@ 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.GeneratrixAndPowerStationDTO; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +import com.njcn.device.pms.pojo.param.ConditionParam; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.param.PmsBaseParam; +import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.web.controller.BaseController; @@ -18,8 +24,10 @@ 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 javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import java.util.List; import java.util.Objects; @@ -31,7 +39,7 @@ import java.util.Objects; * @date 2022/10/26 */ @RestController -@RequestMapping("/pms/GeneratrixWireWire") +@RequestMapping("/pms/generatrixWire") @Slf4j @Api(tags = "台账-线路") @RequiredArgsConstructor @@ -43,7 +51,7 @@ public class PmsGeneratrixWireController extends BaseController { @PostMapping("/addGeneratrixWire") @ApiOperation("新增线路") @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true) - public HttpResult addGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) { + public HttpResult addGeneratrixWire(@RequestBody @Validated GeneratrixWireParam generatrixWireParam) { String methodDescribe = getMethodDescribe("addGeneratrixWire"); boolean result = iGeneratrixWireService.addGeneratrixWire(generatrixWireParam); if(result){ @@ -57,7 +65,7 @@ public class PmsGeneratrixWireController extends BaseController { @PostMapping("/updateGeneratrixWire") @ApiOperation("修改线路") @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true) - public HttpResult updateGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) { + public HttpResult updateGeneratrixWire(@RequestBody @Validated GeneratrixWireParam generatrixWireParam) { String methodDescribe = getMethodDescribe("updateGeneratrixWire"); boolean result = iGeneratrixWireService.updateGeneratrixWire(generatrixWireParam); if(result){ @@ -85,7 +93,7 @@ public class PmsGeneratrixWireController extends BaseController { @GetMapping("/getGeneratrixWireById") @ApiOperation("根据线路id获取线路") @ApiImplicitParam(name = "generatrixWireId", value = "线路id", required = true) - public HttpResult getGeneratrixWireById(@RequestParam("generatrixWireId") String generatrixWireId) { + public HttpResult getGeneratrixWireById(@RequestParam("generatrixWireId") @NotBlank(message = "线路id为空") String generatrixWireId) { String methodDescribe = getMethodDescribe("getGeneratrixWireById"); GeneratrixWire result = iGeneratrixWireService.getGeneratrixWireById(generatrixWireId); if(Objects.nonNull(result)){ @@ -113,4 +121,68 @@ public class PmsGeneratrixWireController extends BaseController { Page result = iGeneratrixWireService.getGeneratrixWirePageList(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + + /** + * 获取指定母线信息 + * + * @param param 获取指定的监测点信息条件 + * @return 指定母线信息 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGeneratrixInfo") + @ApiOperation("获取指定母线信息") + @ApiImplicitParam(name = "param", value = "获取指定母线信息条件", required = true) + public HttpResult> getGeneratrixInfo(@RequestBody @Validated PmsGeneratrixParam param) { + String methodDescribe = getMethodDescribe("getGeneratrixInfo"); + List monitorInfo = iGeneratrixWireService.getGeneratrixInfo(param); + if (CollectionUtil.isEmpty(monitorInfo)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe); + } + } + + /** + * 获取母线与电站关联信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/3 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGeneratrixAndPowerStationInfo") + @ApiOperation("获取母线与电站关联信息") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getGeneratrixAndPowerStationInfo(@RequestBody @Validated PmsGeneratrixParam param) { + String methodDescribe = getMethodDescribe("getGeneratrixAndPowerStationInfo"); + List monitorInfo = iGeneratrixWireService.getGeneratrixAndPowerStationInfo(param); + if (CollectionUtil.isEmpty(monitorInfo)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe); + } + } + + /** + * @Description: 普测计划页面调用根据条件查询母线信息 + * @Param: [param] + * @return: com.njcn.common.pojo.response.HttpResult> + * @Author: clam + * @Date: 2022/12/5 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGeneratrixByCondition") + @ApiOperation("普测计划页面调用根据条件查询母线信息") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getGeneratrixByCondition(@RequestBody @Validated ConditionParam param) { + String methodDescribe = getMethodDescribe("getGeneratrixByCondition"); + List monitorInfo = iGeneratrixWireService.getGeneratrixByCondition(param); + if (CollectionUtil.isEmpty(monitorInfo)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe); + } + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsMonitorController.java similarity index 99% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsMonitorController.java index e98f1173f..635386fd8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsMonitorController.java @@ -45,7 +45,7 @@ import java.util.Objects; @Slf4j @Api(tags = "台账-主网监测点信息") @RequiredArgsConstructor -public class MonitorController extends BaseController { +public class PmsMonitorController extends BaseController { private final IMonitorService monitorService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerClientController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerClientController.java index 865579e31..11f9f4f1b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerClientController.java @@ -37,7 +37,7 @@ import java.util.Objects; @RequestMapping("/pms/powerClient") @RequiredArgsConstructor @Api(tags = "台账-用电用户") -public class PowerClientController extends BaseController { +public class PmsPowerClientController extends BaseController { private final IPowerClientService iPowerClientService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerDistributionareaController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerDistributionareaController.java index 6969c05a3..953659ad0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerDistributionareaController.java @@ -42,7 +42,7 @@ import java.util.Objects; @Api(tags = "台账-台区信息") @RequiredArgsConstructor @Validated -public class PowerDistributionareaController extends BaseController { +public class PmsPowerDistributionareaController extends BaseController { private final IPowerDistributionareaService iPowerDistributionareaService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerGenerationUserController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerGenerationUserController.java index 8b1a4364c..976c36633 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerGenerationUserController.java @@ -38,7 +38,7 @@ import java.util.Objects; @RequestMapping("/pms/powerGenerationUser") @Api(tags = "台账-发电用户") @RequiredArgsConstructor -public class PowerGenerationUserController extends BaseController { +public class PmsPowerGenerationUserController extends BaseController { private final IPowerGenerationUserService iPowerGenerationUserService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerQualityMatterController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerQualityMatterController.java similarity index 84% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerQualityMatterController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerQualityMatterController.java index f488b1df6..47e698d5d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerQualityMatterController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerQualityMatterController.java @@ -16,7 +16,7 @@ import com.njcn.web.controller.BaseController; */ @RestController @RequestMapping("/pms/powerQualityMatter") -public class PowerQualityMatterController extends BaseController { +public class PmsPowerQualityMatterController extends BaseController { } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java deleted file mode 100644 index 5caef3d92..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/GeneratrixWireMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.device.pms.mapper.majornetwork; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pms.pojo.po.GeneratrixWire; -import org.apache.ibatis.annotations.Mapper; - -/** - * pms-device - * - * @author cdf - * @date 2022/10/26 - */ -@Mapper -public interface GeneratrixWireMapper extends BaseMapper { - -} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java index dce527127..0c5f92cd0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java @@ -36,12 +36,12 @@ public interface PmsGeneratrixMapper extends BaseMapper { * @date 2022/11/3 */ List getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param); - /** + /** * @Description: 普测计划页面调用根据条件查询母线信息 - * @Param: [data, param] - * @return: java.util.List + * @Param: [data, param] + * @return: java.util.List * @Author: clam - * @Date: 2022/12/5 - */ + * @Date: 2022/12/5 + */ List getGeneratrixByCondition(@Param("orgList")List data, @Param("param")ConditionParam param); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixWireMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixWireMapper.java new file mode 100644 index 000000000..fb5f537b9 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixWireMapper.java @@ -0,0 +1,51 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +import com.njcn.device.pms.pojo.param.ConditionParam; +import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; +import com.njcn.device.pms.pojo.po.GeneratrixWire; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * pms-device + * + * @author cdf + * @date 2022/10/26 + */ +@Mapper +public interface PmsGeneratrixWireMapper extends BaseMapper { + + + /** + * 获取母线信息 + * + * @param pmsGeneratrixParam 入参 + * @return 母线信息 + */ + List getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam); + + /** + * 获取母线与电站关联信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/3 + */ + List getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param); + /** + * @Description: 普测计划页面调用根据条件查询母线信息 + * @Param: [data, param] + * @return: java.util.List + * @Author: clam + * @Date: 2022/12/5 + */ + List getGeneratrixByCondition(@Param("orgList")List data, @Param("param") ConditionParam param); + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java index 1112cf651..74a252075 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerDistributionareaMapper.java @@ -4,10 +4,9 @@ package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pms.pojo.po.Generatrix; +import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; -import com.njcn.system.pojo.vo.EventTemplateVO; import org.apache.ibatis.annotations.Param; /** @@ -20,14 +19,6 @@ import org.apache.ibatis.annotations.Param; */ public interface PowerDistributionareaMapper extends BaseMapper { - Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper); - /** - * 获取台区电压等级（使用台区所属母线电压等级） - * @param distribution 台区编号 - * @author cdf - * @date 2022/11/28 - */ - Generatrix getGeneratrixByDistributionId(@Param("distribution") String distribution); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml similarity index 86% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixMapper.xml rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml index 901fcda34..2f5826997 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml @@ -1,6 +1,6 @@ - + @@ -50,8 +50,8 @@ pss.Voltage_Level AS voltageLevel FROM - pms_generatrix AS pg - LEFT JOIN pms_statation_stat AS pss ON pg.Statation_Id = pss.Power_Id + pms_generatrix_wire AS pg + LEFT JOIN pms_statation_stat AS pss ON pg.station = pss.Power_Id WHERE pg.`Status` = 1 AND pss.`Status` = 1 @@ -78,13 +78,13 @@ pss.Power_Name AS powerName, pss.Voltage_Level AS powerVoltageLevel FROM - pms_generatrix AS pg - LEFT JOIN pms_statation_stat AS pss ON pg.Statation_Id = pss.Power_Id + pms_generatrix_wire AS pg + LEFT JOIN pms_statation_stat AS pss ON pg.station = pss.Power_Id WHERE pg.`Status` = 1 AND pss.`Status` = 1 - AND pg.Generatrix_Id IN + AND pg.id IN #{item} @@ -108,11 +108,15 @@ - AND pg.Generatrix_Name LIKE CONCAT('%',#{param.generatrixName},'%') + AND pg.name LIKE CONCAT('%',#{param.generatrixName},'%') - AND pss.Power_Name LIKE CONCAT('%',#{param.powerStationName},'%') + AND pss.stationName LIKE CONCAT('%',#{param.powerStationName},'%') - \ No newline at end of file + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml index b20296cdc..4ae8d031d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerDistributionareaMapper.xml @@ -2,17 +2,7 @@ - - + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml index de706433e..38c2ab543 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml @@ -50,7 +50,8 @@ \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml index 61590a79e..e2d0c271b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTractionStationAccountDetailMapper.xml @@ -11,16 +11,23 @@ substation_id AS substationId FROM r_stat_traction_station_account_detail - WHERE - substation_id IN - - #{item} - - - AND DATE_FORMAT(data_date, '%Y-%m-%d') >= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d') - - - AND DATE_FORMAT(data_date, '%Y-%m-%d') <= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d') - + + substation_id IN + + #{item} + + + AND check_rules IN + + #{item} + + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') >= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d') + + + AND DATE_FORMAT(data_date, '%Y-%m-%d') <= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d') + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java index dbbda5f4a..19933de80 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java @@ -88,11 +88,10 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { @Override public List getPwPhotovoltaicMonitorList(PwPmsMonitorParam pwPmsMonitorParam) { //定义待返回终端信息 - List deptInfos = deptFeignClient.getDirectSonSelf(pwPmsMonitorParam.getOrgId()).getData(); + List deptInfos = deptFeignClient.getDepSonDetailByDeptId(pwPmsMonitorParam.getOrgId()).getData(); // 过滤出传入id的子单位id List deptIdList = deptInfos.stream() - .filter(r-> !r.getId().equals(pwPmsMonitorParam.getOrgId())) - .map(Dept::getCode) + .map(DeptDTO::getCode) .distinct() .collect(Collectors.toList()); //获取monitor详细数据 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java index e5d3bf918..d89fcf7d5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java @@ -2,8 +2,13 @@ package com.njcn.device.pms.service.majornetwork; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +import com.njcn.device.pms.pojo.param.ConditionParam; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.param.PmsBaseParam; +import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.web.pojo.param.BaseParam; @@ -72,5 +77,30 @@ public interface IGeneratrixWireService extends IService { Page getGeneratrixWirePageList(BaseParam baseParam); + /** + * 获取母线信息 + * + * @param param 入参 + * @return 母线信息 + */ + List getGeneratrixInfo(PmsGeneratrixParam param); + + /** + * 获取母线与电站关联信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/3 + */ + List getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param); + /** + * @Description: 普测计划页面调用根据条件查询母线信息 + * @Param: [param] + * @return: java.util.List + * @Author: clam + * @Date: 2022/12/5 + */ + List getGeneratrixByCondition(ConditionParam param); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java index 908a79ea2..6885e1c5e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java @@ -1,21 +1,28 @@ package com.njcn.device.pms.service.majornetwork.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.db.bo.BaseEntity; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.majornetwork.GeneratrixWireMapper; +import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixWireMapper; import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +import com.njcn.device.pms.pojo.param.ConditionParam; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.param.PmsBaseParam; +import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.Generatrix; import com.njcn.device.pms.pojo.po.GeneratrixWire; +import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; +import com.njcn.user.api.DeptFeignClient; import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; @@ -32,20 +39,16 @@ import java.util.Objects; */ @Service @RequiredArgsConstructor -public class GeneratrixWireImpl extends ServiceImpl implements IGeneratrixWireService { +public class GeneratrixWireImpl extends ServiceImpl implements IGeneratrixWireService { - private final PmsGeneratrixMapper pmsGeneratrixMapper; + private final DeptFeignClient deptFeignClient; @Override public boolean addGeneratrixWire(GeneratrixWireParam generatrixWireParam) { checkName(generatrixWireParam,false); - Generatrix generatrix = pmsGeneratrixMapper.selectById(generatrixWireParam.getGeneratrixId()); - if(Objects.isNull(generatrix)){ - throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY); - } + GeneratrixWire generatrixWire = new GeneratrixWire(); BeanUtils.copyProperties(generatrixWireParam, generatrixWire); - generatrixWire.setGeneratrixName(generatrix.getGeneratrixName()); generatrixWire.setStatus(DataStateEnum.ENABLE.getCode()); return this.save(generatrixWire); } @@ -53,13 +56,12 @@ public class GeneratrixWireImpl extends ServiceImpl getGeneratrixWireList(PmsBaseParam pmsBaseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(StrUtil.isNotBlank(pmsBaseParam.getGeneratrixId())){ - lambdaQueryWrapper.eq(GeneratrixWire::getGeneratrixId,pmsBaseParam.getGeneratrixId()); + lambdaQueryWrapper.eq(GeneratrixWire::getId,pmsBaseParam.getGeneratrixId()); } lambdaQueryWrapper.eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode()) .orderByAsc(GeneratrixWire::getCreateTime); @@ -89,8 +91,9 @@ public class GeneratrixWireImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getGeneratrixName,baseParam.getSearchValue()) .or(StrUtil.isNotBlank(baseParam.getSearchValue())) - .like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getWireName,baseParam.getSearchValue()) - .orderByAsc(GeneratrixWire::getCreateTime); + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getName,baseParam.getSearchValue()) + .eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode()) + .orderByDesc(GeneratrixWire::getCreateTime); return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); } @@ -100,21 +103,23 @@ public class GeneratrixWireImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(GeneratrixWire::getGeneratrixName,generatrixWireParam.getWireName()) - .eq(GeneratrixWire::getGeneratrixId,generatrixWireParam.getGeneratrixId()) + lambdaQueryWrapper.eq(GeneratrixWire::getName,generatrixWireParam.getName()) + .eq(GeneratrixWire::getStationId,generatrixWireParam.getStationId()) .eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode()); if(updateFlag){ //更新 - lambdaQueryWrapper.ne(GeneratrixWire::getWireId,generatrixWireParam.getWireId()); + lambdaQueryWrapper.ne(GeneratrixWire::getId,generatrixWireParam.getId()); }else { //新增校验 - LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); - lambdaQuery.eq(GeneratrixWire::getWireId,generatrixWireParam.getWireId()); - int count = this.count(lambdaQuery); - if(count>0){ - throw new BusinessException(PmsDeviceResponseEnum.WIRE_SAME); + if(StrUtil.isNotBlank(generatrixWireParam.getId())) { + LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); + lambdaQuery.eq(GeneratrixWire::getId, generatrixWireParam.getId()); + int count = this.count(lambdaQuery); + if (count > 0) { + throw new BusinessException(PmsDeviceResponseEnum.WIRE_SAME); + } } } int count = this.count(lambdaQueryWrapper); @@ -122,4 +127,48 @@ public class GeneratrixWireImpl extends ServiceImpl getGeneratrixInfo(PmsGeneratrixParam param) { + if (CollUtil.isEmpty(param.getGeneratrixIds())) { + return null; + } + return this.baseMapper.getGeneratrixInfo(param); + } + + /** + * 获取母线与电站关联信息 + * + * @param param 条件参数 + * @return java.util.List + * @author yzh + * @date 2022/11/3 + */ + @Override + public List getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) { + return this.baseMapper.getGeneratrixAndPowerStationInfo(param); + } + + /** + * @param param + * @Description: 普测计划页面调用根据条件查询母线信息 + * @Param: [param] + * @return: java.util.List + * @Author: clam + * @Date: 2022/12/5 + */ + @Override + public List getGeneratrixByCondition(ConditionParam param) { + + List data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( ); + + return this.baseMapper.getGeneratrixByCondition(data,param); + } + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index f3acda9ed..3c63d99e3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -17,7 +17,6 @@ import com.njcn.device.pms.pojo.param.MonitorParam; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; -import com.njcn.device.pms.pojo.po.Generatrix; import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.po.SpecialMonitor; @@ -48,7 +47,7 @@ import java.util.stream.Collectors; * 服务实现类 *

* - * @author hongawen + * @author cdf * @since 2022-10-14 */ @Slf4j @@ -64,7 +63,7 @@ public class MonitorServiceImpl extends ServiceImpl impl private final DeptFeignClient deptFeignClient; - private final PmsGeneratrixMapper generatrixMapper; + private final PmsGeneratrixWireMapper generatrixWireMapper; private final SpecialMonitorMapper specialMonitorMapper; @@ -311,8 +310,8 @@ public class MonitorServiceImpl extends ServiceImpl impl throw new BusinessException(PmsDeviceResponseEnum.Operation_ITEM_EMPTY); } - //校验母线 - Generatrix generatrix = generatrixMapper.selectById(monitorParam.getGeneratrixId()); + //校验线路 + GeneratrixWire generatrix = generatrixWireMapper.selectById(monitorParam.getLineId()); if(Objects.isNull(generatrix)){ throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY); } @@ -320,7 +319,7 @@ public class MonitorServiceImpl extends ServiceImpl impl monitor.setOperationName(dept.getName()); monitor.setOperationName(deptOp.getName()); - monitor.setGeneratrixName(generatrix.getGeneratrixName()); + monitor.setGeneratrixWireName(generatrix.getName()); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java index c625928a1..076be1327 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java @@ -74,8 +74,8 @@ public class OverviewServiceImpl implements OverviewService { overviewVO.setSumNum("0"); overviewVO.setYtbSumNum("0"); overviewVO.setYhbSumNum("0"); - overviewVO.setSameNum("10"); - overviewVO.setRingNum("-50"); + overviewVO.setSameNum("0"); + overviewVO.setRingNum("0"); overviewVOS.add(overviewVO); } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java index e5041f831..95a274617 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java @@ -15,7 +15,6 @@ import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; import com.njcn.device.pms.pojo.param.*; import com.njcn.device.pms.pojo.po.Generatrix; -import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; @@ -29,7 +28,6 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** * @author yzh diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java index a024e9f10..eb5d967be 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java @@ -70,9 +70,9 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); /*获取下级子部门信息*/ - List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); +// List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java index 881aa799a..650e50a85 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevSolveDetailServiceImpl.java @@ -59,9 +59,9 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); /*获取下一级子部门信息*/ - List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); +// List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } @@ -304,9 +304,9 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); /*获取下级子部门信息*/ - List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); +// List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java index 2a3c4a867..4128f25d3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java @@ -68,7 +68,9 @@ implements RMpMonitorAlarmCountMService { String monitorName = rMpMonitorAlarmCountMParam.getMeasurementPointName(); //监测点名称 //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); +// List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + /*获取下级子部门信息*/ + List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java index 2b6383700..891c30349 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java @@ -56,7 +56,10 @@ implements RStatAreaAlarmCountMService{ String startTime = rStatAreaAlarmCountMParam.getStartTime(); //开始时间 yyyy-MM-dd String endTime = rStatAreaAlarmCountMParam.getEndTime(); //截止时间 yyyy-MM-dd //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); +// List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + /*获取下级子部门信息*/ + List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); + if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java index 1076f2e4f..5c293c9a0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java @@ -73,7 +73,10 @@ implements RStatZwAlarmCountWService { String startTime = rStatZwAlarmCountWParam.getStartTime(); //开始时间 yyyy-MM-dd String endTime = rStatZwAlarmCountWParam.getEndTime(); //截止时间 yyyy-MM-dd //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); +// List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); + /*获取下级子部门信息*/ + List deptDTOList = deptFeignClient.getDepSonDetailByDeptId (id).getData ( ); + if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); }