From 5df53ce872b2bf8f7a2596a34923f54e6fdc5445 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 19 Dec 2022 10:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/enums/PmsDeviceResponseEnum.java | 1 + .../pojo/param/DistributionMonitorParam.java | 4 +- .../pms/pojo/po/DistributionMonitor.java | 28 + .../com/njcn/device/pms/pojo/po/Monitor.java | 18 + .../pms/pojo/vo/SpecialAnalysisMonitorVO.java | 93 ++- .../SpecialAnalysisController.java | 7 +- .../TransientStasticDataController.java | 40 +- .../majornetwork/SpecialAnalysisMapper.java | 2 +- .../mapping/RStatTargetDetailMapper.xml | 29 +- .../mapping/SpecialAnalysisMapper.xml | 24 +- .../majornetwork/SpecialAnalysisService.java | 4 +- .../impl/DistributionMonitorServiceImpl.java | 11 + .../impl/RStatDevSignalDServiceImpl.java | 3 +- .../impl/SpecialAnalysisServiceImpl.java | 62 +- .../pojo/po/RMpPartHarmonicDetailM.java | 562 ++++++++++++++---- .../pojo/po/RMpSurplusHarmonicDetailM.java | 282 +++++++-- .../DistributedPvVolOverController.java | 8 +- .../service/impl/CustomReportServiceImpl.java | 2 +- .../impl/RStatHarmonicOrgMServiceImpl.java | 1 - .../impl/RStatHarmonicOrgQServiceImpl.java | 5 - .../impl/RStatHarmonicOrgYServiceImpl.java | 5 - .../DistributedPvVolOverService.java | 4 +- .../DistributedPvOverviewServiceImpl.java | 81 +-- .../impl/DistributedPvVolOverServiceImpl.java | 21 +- 24 files changed, 1014 insertions(+), 283 deletions(-) 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 dab1146d9..d4eb824aa 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 @@ -32,6 +32,7 @@ public enum PmsDeviceResponseEnum { GENWIRE_SAME("A00373","母线编号重复"), POWER_CODE_SAME("A00374","台区名称或编号重复"), POWER_CLIENT_DIS_EMPTY("A00375","发电用电用户参数不可为空"), + DIS_ADD_REPEAT("A00376","当前配网中存在该监测点"), POWER_CLIENT_NOT_FIND("A00380","查无此用电用户"), diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java index ef881ec12..9ec244800 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java @@ -25,8 +25,8 @@ public class DistributionMonitorParam { /** * 监测点ID */ - @ApiModelProperty(value = "监测点类别(字典)") - @NotBlank(message = "监测点类别不能为空") + @ApiModelProperty(value = "监测点编号") + @NotBlank(message = "监测点编号不能为空") private String monitorId; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java index 76b3f1ea4..9f2176c7d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java @@ -60,6 +60,34 @@ public class DistributionMonitor extends BaseEntity { */ private Integer status; + /** + * 关联的监测终端编号(外键) + */ + private String terminalId; + /** + * 监测终端接线方式(字典) + */ + private String terminalWiringMethod; + + /** + * pt变比 + */ + private Float pt1; + + /** + * pt变比 + */ + private Float pt2; + + /** + * ct变比 + */ + private Float ct1; + + /** + * ct变比 + */ + private Float ct2; } 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 b1f45b09c..6c843c3fb 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 @@ -187,6 +187,24 @@ public class Monitor extends BaseEntity { */ private Integer isSpecialMonitor; + /** + * pt变比 + */ + private Float pt1; + /** + * pt变比 + */ + private Float pt2; + + /** + * ct变比 + */ + private Float ct1; + + /** + * ct变比 + */ + private Float ct2; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java index eec279fb4..260d7d911 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/SpecialAnalysisMonitorVO.java @@ -20,7 +20,7 @@ public class SpecialAnalysisMonitorVO implements Serializable { * 监测点信息 */ @ApiModelProperty(name = "specialAnalysisVOList", value = "监测点信息") - List specialAnalysisVOList; + Map> specialAnalysisVOList; /** * 电压等级分布（监测点） @@ -53,6 +53,18 @@ public class SpecialAnalysisMonitorVO implements Serializable { @ApiModelProperty(name = "name", value = "监测点名称") private String name; + /** + * 监测点名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 监测点名称 + */ + @ApiModelProperty(name = "orgId", value = "单位Code") + private String orgId; + /** * 电站ID(外键) */ @@ -92,8 +104,8 @@ public class SpecialAnalysisMonitorVO implements Serializable { /** * 监测点标签 */ - @ApiModelProperty(name = "monitorTag", value = "监测点标签") - private String monitorTag; +// @ApiModelProperty(name = "monitorTag", value = "监测点标签") +// private String monitorTag; /** * 关联的监测终端编号(外键) @@ -219,4 +231,79 @@ public class SpecialAnalysisMonitorVO implements Serializable { private String ringCapacity4; } + + /** + * 专项分析电气化铁路展示详情 + */ + @Data + public static class SpecialAnalysisRailwayVO { + private static final long serialVersionUID = 1L; + + /** + * 监测点ID + */ + @ApiModelProperty(name = "id", value = "监测点ID") + private String id; + + /** + * 监测点名称 + */ + @ApiModelProperty(name = "name", value = "监测点名称") + private String name; + + /** + * 监测点名称 + */ + @ApiModelProperty(name = "orgName", value = "单位名称") + private String orgName; + + /** + * 监测点名称 + */ + @ApiModelProperty(name = "orgId", value = "单位Code") + private String orgId; + + /** + * 电站ID(外键) + */ + @ApiModelProperty(name = "powerrId", value = "电站ID(外键)") + private String powerrId; + + /** + * 变电站名称 + */ + @ApiModelProperty(name = "powerrName", value = "变电站名称") + private String powerrName; + + /** + * 经度 + */ + @ApiModelProperty(name = "longitude", value = "经度") + private Double longitude; + + /** + * 维度 + */ + @ApiModelProperty(name = "latitude", value = "维度") + private Double latitude; + + /** + * 电压等级(字典) + */ + @ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)") + private String voltageLevel; + + /** + * 监测点容量 + */ + @ApiModelProperty(name = "capacity", value = "监测点容量") + private Double capacity; + + + /** + * 关联的监测终端编号(外键) + */ + @ApiModelProperty(name = "RailwayLineName", value = "铁路名称") + private String railwayLineName; + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SpecialAnalysisController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SpecialAnalysisController.java index 80a13d5f8..871e1b258 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SpecialAnalysisController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/SpecialAnalysisController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; /** *

@@ -72,16 +73,14 @@ public class SpecialAnalysisController extends BaseController { /** * 获取专项分析-地图展示数据 * - * @param param 前端传入参数 * @return 专项分析-地图展示数据 */ @PostMapping("/getDisplayRailway") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("地图展示数据-地图监测点(电气化铁路)") - @ApiImplicitParam(name = "param", value = "条件参数", required = true) - public HttpResult> getDisplayRailway(@RequestBody SpecialAnalysisParam param) { + public HttpResult>> getDisplayRailway() { String methodDescribe = getMethodDescribe("getDisplayRailway"); - List sm= specialAnalysisService.getDisplayRailway(param); + Map> sm= specialAnalysisService.getDisplayRailway(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sm, methodDescribe); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java index 6afd1a670..c4bc3f45e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TransientStasticDataController.java @@ -1,22 +1,54 @@ package com.njcn.device.pms.controller.majornetwork; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.dto.wave.WaveDataDTO; +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.service.majornetwork.TransientPmsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; /** - *

- * 前端控制器 - *

- * + * 暂态事件列表（PMS暂用） * @author hongawen * @since 2022-10-14 */ +@Validated +@Slf4j @RestController @RequestMapping("/pms/transientStasticData") +@Api(tags = "暂态事件列表（PMS暂用）") +@AllArgsConstructor public class TransientStasticDataController extends BaseController { + private final TransientPmsService transientPmsService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getTransientAnalyseWavePms") + @ApiOperation("暂态事件波形分析") + @ApiImplicitParams({ + @ApiImplicitParam(name = "timeId", value = "暂态时刻", required = true), + @ApiImplicitParam(name = "lineId", value = "暂态监测点Id", required = true), + @ApiImplicitParam(name = "lineType", value = "暂态监测点类型（1主网 2配网）", required = true) + }) + public HttpResult getTransientAnalyseWavePms(@RequestParam("timeId") String timeId, @RequestParam("lineId") String lineId, @RequestParam("lineType") Integer lineType){ + String methodDescribe = getMethodDescribe("getTransientAnalyseWavePms"); + WaveDataDTO wave = transientPmsService.getTransientAnalyseWavePms(timeId, lineId,lineType); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, wave, methodDescribe); + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java index 518b5afea..d95c85ad3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java @@ -37,7 +37,7 @@ public interface SpecialAnalysisMapper { * @param deptIdList 部门集合（Code） * @return */ - List selectRailwayList(@Param("deptIdList") List deptIdList); + List selectRailwayList(@Param("deptIdList") List deptIdList); /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml index 0adc749b9..144a7ecab 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetDetailMapper.xml @@ -11,16 +11,23 @@ target_type AS targetType FROM r_stat_target_detail - WHERE - measurement_point_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') - + + + AND check_rules IN + + #{item} + + + and measurement_point_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') + + \ 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/SpecialAnalysisMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml index d7a125bb6..6efa5d9fc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml @@ -182,11 +182,12 @@