Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.台账：台账审核和变压器台账

Browse Source 
2.配网：稳态指标和暂态指标部分接口
3.指标分类，修改变电站名称异常bug
This commit is contained in:
wurui
2023-02-24 15:37:17 +08:00
parent 065454db0c
commit 17b075f548
23 changed files with 281 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorAuditParam.java
View File

@@ -15,7 +15,7 @@ public class MonitorAuditParam {
@ApiModelProperty("名称")
private String submitName;
@ApiModelProperty("状态")
@ApiModelProperty("状态：0-删除；1-待审核；2-已审核；")
private Integer status;
@ApiModelProperty("数据类型,字典表（01：主网测点 02：配网测点）")
@@ -27,14 +27,11 @@ public class MonitorAuditParam {
@ApiModelProperty("结束时间")
private String searchEndTime;
@ApiModelProperty("状态")
private Integer searchState;
@ApiModelProperty("页码")
private Integer pageNum=1;
private Integer pageNum;
@ApiModelProperty("页面尺寸")
private Integer pageSize=10;
private Integer pageSize;
@Data
public static class AuditParam {

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorStatus.java
View File

@@ -54,7 +54,7 @@ public class MonitorStatus {
@NotEmpty(message = "id集合不能为空")
private List<String> id;
@ApiModelProperty(value = "数据类型")
@ApiModelProperty(value = "数据类型：0-删除；1-待审核；2-已审核；")
@NotNull(message = "数据类型不能为空")
private Integer status;
}

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
View File

@@ -44,6 +44,10 @@ public class PmsMonitorParam {
@ApiModelProperty(name = "monitorTag", value = "监测点标签")
private String monitorTag;
@ApiModelProperty(name = "monitorTags", value = "监测点标签集合")
private List<String> monitorTags;
@ApiModelProperty(name = "isSpecialMonitor", value = "是否专项分析监测点 0-否 1-是")
private Integer isSpecialMonitor;
}

19
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java
View File

@@ -29,9 +29,18 @@ public class TransformerParam {
@ApiModelProperty(value = "变压器类型")
private String type;
/**
* 数据状态：0-删除；1-正常；
*/
@ApiModelProperty(value = "数据状态：0-删除；1-正常；")
private Boolean status;
@ApiModelProperty(value = "装机容量")
private String iCapacity;
@ApiModelProperty(value = "额定容量")
private String rCapacity;
@ApiModelProperty(value = "额定电压")
private String voltage;
@ApiModelProperty(value = "额定功率")
private String ratedPower;
@ApiModelProperty(value = "阻抗电压")
private String impedanceVoltage;
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/MonitorAudit.java
View File

@@ -72,7 +72,7 @@ public class MonitorAudit extends BaseEntity {
* 数据状态：0-删除；1-待审核；2-已审核；
*/
@ApiModelProperty(value = "数据状态：0-删除；1-待审核；2-已审核；")
private Boolean status;
private Integer status;
/**
* 创建用户

38
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java
View File

@@ -44,31 +44,27 @@ public class Transformer extends BaseEntity {
@ApiModelProperty(value = "变压器类型")
private String type;
@ApiModelProperty(value = "装机容量")
private String iCapacity;
@ApiModelProperty(value = "额定容量")
private String rCapacity;
@ApiModelProperty(value = "额定电压")
private String voltage;
@ApiModelProperty(value = "额定功率")
private String ratedPower;
@ApiModelProperty(value = "阻抗电压")
private String impedanceVoltage;
/**
* 数据状态：0-删除；1-正常；
*/
@ApiModelProperty(value = "数据状态：0-删除；1-正常；")
private Boolean status;
/**
* 创建用户
*/
private String createBy;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新用户
*/
private String updateBy;
/**
* 更新时间
*/
private LocalDateTime updateTime;
private Integer status;
}

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/MonitorAuditController.java
View File

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
import java.util.List;
import java.util.Objects;
/**
@@ -47,9 +48,9 @@ public class MonitorAuditController extends BaseController {
@PostMapping("/getAllMonitorAuditList")
@ApiOperation("分页获取台账审核")
@ApiImplicitParam(name = "baseParam", required = true)
public HttpResult<Page<MonitorAudit>> getAllMonitorAuditList(@RequestBody MonitorAuditParam baseParam) {
public HttpResult<List<MonitorAudit>> getAllMonitorAuditList(@RequestBody MonitorAuditParam baseParam) {
String methodDescribe = getMethodDescribe("getAllMonitorAuditList");
Page<MonitorAudit> monitor = monitorAuditService.getAllMonitorAuditList(baseParam);
List<MonitorAudit> monitor = monitorAuditService.getAllMonitorAuditList(baseParam);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {

46
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TransformerController.java
View File

@@ -9,7 +9,7 @@ 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.MonitorAuditParam;
import com.njcn.device.pms.pojo.param.MonitorStatus;
import com.njcn.device.pms.pojo.param.TransformerParam;
import com.njcn.device.pms.pojo.po.Transformer;
import com.njcn.device.pms.service.majornetwork.ITransformerService;
import io.swagger.annotations.Api;
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
import java.util.List;
import java.util.Objects;
/**
@@ -57,18 +58,47 @@ public class TransformerController extends BaseController {
}
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
@PostMapping("/updateStatus")
@ApiOperation("修改变压器台账数据状态")
@ApiImplicitParam(name = "monitorParam", value = "修改台账审核数据状态", required = true)
public HttpResult<Boolean> updateStatus(@RequestBody @Validated MonitorStatus.Status monitorParam) {
String methodDescribe = getMethodDescribe("updateStatus");
boolean result = transformerService.updateStatus(monitorParam);
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
@PostMapping("/addTransformer")
@ApiOperation("添加变压器台账信息")
@ApiImplicitParam(name = "param", value = "添加变压器台账信息", required = true)
public HttpResult<Boolean> addTransformer(@RequestBody @Validated TransformerParam param) {
String methodDescribe = getMethodDescribe("addTransformer");
boolean result = transformerService.addTransformer(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
@PostMapping("/updateTransformer")
@ApiOperation("修改变压器台账信息")
@ApiImplicitParam(name = "param", value = "修改变压器台账数据", required = true)
public HttpResult<Boolean> updateTransformer(@RequestBody @Validated TransformerParam param) {
String methodDescribe = getMethodDescribe("updateTransformer");
boolean result = transformerService.updateTransformer(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
@PostMapping("/delTransformer")
@ApiOperation("删除变压器台账信息")
@ApiImplicitParam(name = "ids", value = "删除变电站台账id", required = true)
public HttpResult<Boolean> delTransformer(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delTransformer");
boolean result = transformerService.delTransformer(ids);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorAuditService.java
View File

@@ -1,11 +1,12 @@
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.param.MonitorAuditParam;
import com.njcn.device.pms.pojo.param.MonitorStatus;
import com.njcn.device.pms.pojo.po.MonitorAudit;
import java.util.List;
/**
* <p>
* 台账审核服务类
@@ -22,7 +23,7 @@ public interface IMonitorAuditService extends IService<MonitorAudit> {
* @param baseParam
* @return
*/
Page<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam);
List<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam);
/***
* 添加台账审核

11
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java
View File

@@ -7,6 +7,8 @@ import com.njcn.device.pms.pojo.param.MonitorStatus;
import com.njcn.device.pms.pojo.param.TransformerParam;
import com.njcn.device.pms.pojo.po.Transformer;
import java.util.List;
/**
* <p>
* 变压器台账 服务类
@@ -43,6 +45,15 @@ public interface ITransformerService extends IService<Transformer> {
*/
boolean updateTransformer(TransformerParam param);
/***
* 删除变压器信息
* @author wr
* @date 2023-02-23 17:21
* @param ids
* @return boolean
*/
boolean delTransformer(List<String> ids);
/**
* 修改变压器台账数据状态
*

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorAuditServiceImpl.java
View File

@@ -14,6 +14,8 @@ import com.njcn.device.pms.service.majornetwork.IMonitorAuditService;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 台账审核 服务实现类
@@ -26,7 +28,7 @@ import org.springframework.stereotype.Service;
public class MonitorAuditServiceImpl extends ServiceImpl<MonitorAuditMapper, MonitorAudit> implements IMonitorAuditService {
@Override
public Page<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam) {
public List<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam) {
LambdaQueryWrapper<MonitorAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.like(StrUtil.isNotBlank(baseParam.getSubmitName()), MonitorAudit::getAuditName, baseParam.getSubmitName())
@@ -37,7 +39,7 @@ public class MonitorAuditServiceImpl extends ServiceImpl<MonitorAuditMapper, Mon
.le(StringUtils.isNotBlank(baseParam.getSearchEndTime()), MonitorAudit::getCreateTime, baseParam.getSearchEndTime())
.orderByAsc(MonitorAudit::getStatus);
;
return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()), lambdaQueryWrapper);
return this.list(lambdaQueryWrapper);
}
@Override

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -109,6 +109,9 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
.like(StringUtils.isNotBlank(pmsMonitorParam.getPowerrName()), Monitor::getPowerrName, pmsMonitorParam.getPowerrName())
.eq(Objects.nonNull(pmsMonitorParam.getIsSpecialMonitor()), Monitor::getIsSpecialMonitor, pmsMonitorParam.getIsSpecialMonitor())
.eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorType()), Monitor::getMonitorType, pmsMonitorParam.getMonitorType())
.in(CollUtil.isNotEmpty(pmsMonitorParam.getMonitorTags()), Monitor::getMonitorTag, pmsMonitorParam.getMonitorTags())
.eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorState()), Monitor::getMonitorState, pmsMonitorParam.getMonitorState())
.eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorTag()), Monitor::getMonitorTag, pmsMonitorParam.getMonitorTag());

21
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransformerServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -15,6 +17,8 @@ import com.njcn.device.pms.pojo.po.Transformer;
import com.njcn.device.pms.service.majornetwork.ITransformerService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 变压器台账 服务实现类
@@ -32,14 +36,20 @@ public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Trans
lambdaQueryWrapper
.like(StrUtil.isNotBlank(baseParam.getSubmitName()), Transformer::getName, baseParam.getSubmitName())
.eq(baseParam.getStatus() != null, Transformer::getType, baseParam.getStatus())
.eq(Transformer::getStatus, DataStateEnum.ENABLE.getCode())
;
.eq(Transformer::getStatus, DataStateEnum.ENABLE.getCode());
return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()),lambdaQueryWrapper);
}
@Override
public boolean addTransformer(TransformerParam param) {
int count = this.count(new LambdaQueryWrapper<Transformer>()
.eq(Transformer::getName, param.getName())
.eq(Transformer::getStatus, DataStateEnum.ENABLE.getCode())
);
Assert.isTrue(count == 0 , "变压器名称重复，请重新编写变压器名称");
Transformer transformer = BeanUtil.copyProperties(param, Transformer.class);
transformer.setStatus(1);
return this.save(transformer);
}
@@ -49,6 +59,12 @@ public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Trans
return this.updateById(transformer);
}
@Override
public boolean delTransformer(List<String> ids) {
Assert.isTrue(CollectionUtil.isNotEmpty(ids) , "删除变压器id为空");
return this.removeByIds(ids);
}
@Override
public boolean updateStatus(MonitorStatus.Status monitorParam) {
LambdaUpdateWrapper<Transformer> update = new LambdaUpdateWrapper<>();
@@ -56,4 +72,5 @@ public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Trans
.in(Transformer::getId, monitorParam.getId());
return this.update(update);
}
}

4
pqs-event/event-boot/src/main/java/com/njcn/event/controller/distribution/PwEventCategoryDetailsController.java
View File

@@ -112,8 +112,8 @@ public class PwEventCategoryDetailsController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("获取变电站暂态指标分类统计表")
@ApiImplicitParam(name = "param", value = "条件参数", required = true)
public HttpResult<List<RStatSubstationVO>> getRStatSubstation(@RequestBody UniversalFrontEndParam param) {
String methodDescribe = getMethodDescribe("getRStatSubstation");
public HttpResult<List<RStatSubstationVO>> getPwRStatSubstation(@RequestBody UniversalFrontEndParam param) {
String methodDescribe = getMethodDescribe("getPwRStatSubstation");
List<RStatSubstationVO> list = pwEventCategoryDetailsService.getRStatSubstation(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}

5
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java
View File

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* 【基准水平】参数
* @Title RMpBenchmarkLevelParam
@@ -22,6 +24,9 @@ public class RMpBenchmarkLevelParam extends StatisticsBizBaseParam {
@ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标")
private String benchmarkIndicator;
@ApiModelProperty(name = "monitorTags", value = "监测点标签")
private List<String> monitorTags;
@ApiModelProperty("页码")
private Integer pageNum;
@ApiModelProperty("页面尺寸")

20
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelM.java
View File

@@ -75,4 +75,24 @@ public class RMpBenchmarkLevelM implements Serializable {
* 暂降次数水平标准差
*/
private Double eventSd;
/**
* 暂升次数水平均值
*/
private Double riseAvg;
/**
* 暂升次数水平标准差
*/
private Double riseSd;
/**
* 短时中断水平均值
*/
private Double interruptAvg;
/**
* 短时中断水平标准差
*/
private Double interruptSd;
}

19
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelQ.java
View File

@@ -76,4 +76,23 @@ public class RMpBenchmarkLevelQ implements Serializable {
* 暂降次数水平标准差
*/
private Double eventSd;
/**
* 暂升次数水平均值
*/
private Double riseAvg;
/**
* 暂升次数水平标准差
*/
private Double riseSd;
/**
* 短时中断水平均值
*/
private Double interruptAvg;
/**
* 短时中断水平标准差
*/
private Double interruptSd;
}

22
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpBenchmarkLevelY.java
View File

@@ -1,6 +1,7 @@
package com.njcn.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -76,4 +77,25 @@ public class RMpBenchmarkLevelY implements Serializable {
*/
private Double eventSd;
/**
* 暂升次数水平均值
*/
private Double riseAvg;
/**
* 暂升次数水平标准差
*/
private Double riseSd;
/**
* 短时中断水平均值
*/
private Double interruptAvg;
/**
* 短时中断水平标准差
*/
private Double interruptSd;
}

17
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpBenchmarkLevelVO.java
View File

@@ -24,6 +24,10 @@ public class RMpBenchmarkLevelVO implements Serializable {
@ApiModelProperty(name = "orgName", value = "单位名称")
private String orgName;
@ApiModelProperty(name = "monitorType", value = "监测点标签")
private String monitorTag;
@ApiModelProperty(name = "benchmarkIndicator", value = "基准水平评价指标id")
private String benchmarkIndicator;
@@ -74,4 +78,17 @@ public class RMpBenchmarkLevelVO implements Serializable {
@ApiModelProperty(name = "eventSd", value = "暂降次数水平标准差")
private Double eventSd;
@ApiModelProperty(name = "riseAvg", value = "暂升次数水平均值")
private Double riseAvg;
@ApiModelProperty(name = "riseSd", value = "暂升次数水平标准差")
private Double riseSd;
@ApiModelProperty(name = "interruptAvg", value = "短时中断水平均值")
private Double interruptAvg;
@ApiModelProperty(name = "interruptSd", value = "短时中断水平标准差")
private Double interruptSd;
}

15
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java
View File

@@ -9,9 +9,11 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.api.MonitorClient;
import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
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.harmonic.mapper.majornetwork.RMpBenchmarkLevelMMapper;
import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM;
@@ -93,9 +95,11 @@ implements RMpBenchmarkLevelMService {
//查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合
// LambdaQueryWrapper<Monitor> monitorWrapper = new LambdaQueryWrapper<>();
// monitorWrapper.in(Monitor::getId, lastMonitorIdList);
PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam();
PmsMonitorParam pmsMonitorInfoParam = new PmsMonitorParam();
pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList);
Map<String, PmsMonitorInfoDTO> monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor));
//监测点标签集合
pmsMonitorInfoParam.setMonitorTags(rMpBenchmarkLevelParam.getMonitorTags());
Map<String, PmsMonitorDTO> monitorMap = monitorClient.getMonitorInfoListByCond(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor));
//查询【基准水平-月】数据
/*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
and data_date <= endTime and voltage_level
@@ -118,10 +122,11 @@ implements RMpBenchmarkLevelMService {
rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id
rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标
//监测点信息
rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
rMpBenchmarkLevelVO.setMonitorTag(monitorMap.get(item.getMeasurementPointId()).getMonitorTag());
rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getName()); //监测点名称
//电压等级
rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel());
rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()));
rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel());
rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()));
return rMpBenchmarkLevelVO;
}).collect(Collectors.toList());
return resultList;

15
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java
View File

@@ -9,9 +9,11 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.api.MonitorClient;
import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
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.harmonic.mapper.majornetwork.RMpBenchmarkLevelQMapper;
import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ;
@@ -93,9 +95,11 @@ implements RMpBenchmarkLevelQService {
//查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合
// LambdaQueryWrapper<Monitor> monitorWrapper = new LambdaQueryWrapper<>();
// monitorWrapper.in(Monitor::getId, lastMonitorIdList);
PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam();
PmsMonitorParam pmsMonitorInfoParam = new PmsMonitorParam();
pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList);
Map<String, PmsMonitorInfoDTO> monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor));
//监测点标签集合
pmsMonitorInfoParam.setMonitorTags(rMpBenchmarkLevelParam.getMonitorTags());
Map<String, PmsMonitorDTO> monitorMap = monitorClient.getMonitorInfoListByCond(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor));
//查询【基准水平-月】数据
/*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
and data_date <= endTime and voltage_level
@@ -118,10 +122,11 @@ implements RMpBenchmarkLevelQService {
rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id
rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标
//监测点信息
rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
rMpBenchmarkLevelVO.setMonitorTag(monitorMap.get(item.getMeasurementPointId()).getMonitorTag());
rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getName()); //监测点名称
//电压等级
rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel());
rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()));
rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel());
rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()));
return rMpBenchmarkLevelVO;
}).collect(Collectors.toList());
return resultList;

15
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java
View File

@@ -9,9 +9,11 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.api.MonitorClient;
import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
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.harmonic.mapper.majornetwork.RMpBenchmarkLevelYMapper;
import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam;
import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY;
@@ -93,9 +95,11 @@ implements RMpBenchmarkLevelYService {
//查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合
// LambdaQueryWrapper<Monitor> monitorWrapper = new LambdaQueryWrapper<>();
// monitorWrapper.in(Monitor::getId, lastMonitorIdList); e
PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam();
PmsMonitorParam pmsMonitorInfoParam = new PmsMonitorParam();
pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList);
Map<String, PmsMonitorInfoDTO> monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor));
//监测点标签集合
pmsMonitorInfoParam.setMonitorTags(rMpBenchmarkLevelParam.getMonitorTags());
Map<String, PmsMonitorDTO> monitorMap = monitorClient.getMonitorInfoListByCond(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor));
//查询【基准水平-月】数据
/*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime
and data_date <= endTime and voltage_level
@@ -118,10 +122,11 @@ implements RMpBenchmarkLevelYService {
rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id
rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标
//监测点信息
rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称
rMpBenchmarkLevelVO.setMonitorTag(monitorMap.get(item.getMeasurementPointId()).getMonitorTag());
rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getName()); //监测点名称
//电压等级
rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel());
rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()));
rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel());
rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()));
return rMpBenchmarkLevelVO;
}).collect(Collectors.toList());
return resultList;

42
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationMServiceImpl.java
View File

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -51,7 +52,7 @@ public class RStatSubstationMServiceImpl extends ServiceImpl<RStatSubstationMMap
RSubstationIconVO rSubstationIconVO = new RSubstationIconVO();
StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
//根据部门获取变电站信息
baseParam.setIds(this.powerrIdList(param.getId()));
baseParam.setIds(this.powerIdList(param.getId()));
String string = param.getType().toString();
switch (string) {
//查询变电站稳态指标超标分布（按超标天数）-年数据
@@ -77,8 +78,16 @@ public class RStatSubstationMServiceImpl extends ServiceImpl<RStatSubstationMMap
//生成变电站id集合
List<RSubstationIcon2VO> rSubstationIconVO = new ArrayList<>();
StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
//根据id进行筛选
baseParam.setIds(this.powerrIdList(param.getId()));
//获取变电站id
List<String> powerIds = this.powerIdList(param.getId());
PmsStatationStatInfoParam pmsParam = new PmsStatationStatInfoParam();
pmsParam.setPowerIds(powerIds);
//变电站名称,获取台账的变电站名称
List<PmsStatationStatInfoDTO> stationInfoDTOS = statationStatClient.getStatationStatInfo(pmsParam).getData();
//获取变电站信息
if(CollUtil.isNotEmpty(stationInfoDTOS)){
List<String> ids = stationInfoDTOS.stream().map(PmsStatationStatInfoDTO::getPowerId).distinct().collect(Collectors.toList());
baseParam.setIds(ids);
String string = param.getType().toString();
switch (string) {
//查询变电站稳态指标平均超标天数-年数据
@@ -96,21 +105,13 @@ public class RStatSubstationMServiceImpl extends ServiceImpl<RStatSubstationMMap
default:
break;
}
//获取变电站名称属性替换
if (CollUtil.isNotEmpty(rSubstationIconVO)) {
List<String> ids = rSubstationIconVO.stream().map(RSubstationIcon2VO::getSubstationId).collect(Collectors.toList());
if (CollUtil.isNotEmpty(ids)) {
PmsStatationStatInfoParam pmsParam = new PmsStatationStatInfoParam();
pmsParam.setPowerIds(ids);
List<PmsStatationStatInfoDTO> data1 = statationStatClient.getStatationStatInfo(pmsParam).getData();
if (CollUtil.isNotEmpty(data1)) {
for (PmsStatationStatInfoDTO dto : data1) {
for (RSubstationIcon2VO vo : rSubstationIconVO) {
if (dto.getPowerId().equals(vo.getSubstationId())) {
vo.setSubstationName(dto.getPowerName());
}
}
Map<String, String> stationInfoMap = stationInfoDTOS.stream().collect(
Collectors.toMap(PmsStatationStatInfoDTO::getPowerId, PmsStatationStatInfoDTO::getPowerName, (Key1, Key2) -> Key2));
for (RSubstationIcon2VO dto : rSubstationIconVO) {
if(stationInfoMap.containsKey(dto.getSubstationId())){
dto.setSubstationName(stationInfoMap.get(dto.getSubstationId()));
}
}
}
@@ -118,7 +119,14 @@ public class RStatSubstationMServiceImpl extends ServiceImpl<RStatSubstationMMap
return rSubstationIconVO;
}
private List<String> powerrIdList(String id) {
/***
* 获取台账部门下的变电站
* @author wr
* @date 2023-02-24 13:48
* @param id
* @return List<String>
*/
private List<String> powerIdList(String id) {
//获取部门下面监测点信息
PmsDeviceInfoParam pms = new PmsDeviceInfoParam();
pms.setDeptIndex(id);