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

1.台账审核和变电站查询。2.配网，稳态指标和暂态指标相关代码

Browse Source
This commit is contained in:
wurui
2023-02-22 15:10:58 +08:00
parent c7c992df3b
commit 6ddcc366e8
20 changed files with 331 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,18 +42,15 @@ import java.util.Objects;
public class MonitorAuditController extends BaseController {
private final IMonitorAuditService monitorAuditService;
/**
* 分页获取台账审核
* @author wr
* @date 2023-02-20
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getAllMonitorAuditList")
@ApiOperation("分页获取台账审核")
@ApiImplicitParam(name = "baseParam",required = true)
@ApiImplicitParam(name = "baseParam", required = true)
public HttpResult<Page<MonitorAudit>> getAllMonitorAuditList(@RequestBody MonitorAuditParam baseParam) {
String methodDescribe = getMethodDescribe("getAllMonitorAuditList");
Page<MonitorAudit> monitor= monitorAuditService.getAllMonitorAuditList(baseParam);
Page<MonitorAudit> monitor = monitorAuditService.getAllMonitorAuditList(baseParam);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
@@ -61,14 +58,14 @@ public class MonitorAuditController extends BaseController {
}
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
@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 = monitorAuditService.updateStatus(monitorParam);
if(result){
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsSummaryStatisticsController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsSummaryStatisticsController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -36,9 +36,7 @@ public class PmsSummaryStatisticsController extends BaseController {
private final PmsSummaryStatisticsService pmsSummaryStatisticsService;
/**
* 主网台账统计
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getMainnetPoint")
@ApiOperation("主网台账统计")

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

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,18 +43,15 @@ import java.util.Objects;
public class TransformerController extends BaseController {
private final ITransformerService transformerService;
/**
* 分页获取台账审核
* @author wr
* @date 2023-02-20
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getAllTransformerList")
@ApiOperation("分页获取变压器台账")
@ApiImplicitParam(name = "baseParam",required = true)
@ApiImplicitParam(name = "baseParam", required = true)
public HttpResult<Page<Transformer>> getAllTransformerList(@RequestBody MonitorAuditParam baseParam) {
String methodDescribe = getMethodDescribe("getAllTransformerList");
Page<Transformer> monitor= transformerService.getAllTransformerList(baseParam);
Page<Transformer> monitor = transformerService.getAllTransformerList(baseParam);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
@@ -62,14 +59,14 @@ public class TransformerController extends BaseController {
}
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
@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);
if(result){
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);

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

@@ -9,7 +9,7 @@ import com.njcn.web.pojo.param.BaseParam;
/**
* <p>
* 台账审核 服务类
* 台账审核服务类
* </p>
*
* @author wr
@@ -19,16 +19,19 @@ public interface IMonitorAuditService extends IService<MonitorAudit> {
/**
* 分页获取台账审核
*
* @param baseParam
* @return
*/
Page<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam);
/**
*
* @param monitorParam
* @return
*/
/***
*
* @author wr
* @date 2023-02-22 14:58
* @param monitorParam
* @return boolean
*/
boolean updateStatus(MonitorStatus.Status monitorParam);
}

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

@@ -20,6 +20,7 @@ public interface ITransformerService extends IService<Transformer> {
/**
* 分页获取变压器台账
*
* @param baseParam
* @return
*/
@@ -27,6 +28,7 @@ public interface ITransformerService extends IService<Transformer> {
/**
* 修改变压器台账数据状态
*
* @param monitorParam
* @return
*/

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

@@ -15,6 +15,7 @@ public interface PmsSummaryStatisticsService {
/**
* 主网台账统计 (区域和监测点，分别同时存在数据结构)
*
* @param param
* @return
*/
@@ -23,12 +24,15 @@ public interface PmsSummaryStatisticsService {
/**
* 主网台账统计(区域和监测点同时存在数据结构)
*
* @param param
* @return
*/
List<PmsSummaryStatisticsVO> getMainnetPoint(PmsSummaryStatisticsParam param);
/**
* 配网台账统计
*
* @param param
* @return
*/

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

@@ -30,21 +30,21 @@ public class MonitorAuditServiceImpl extends ServiceImpl<MonitorAuditMapper, Mon
public Page<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam) {
LambdaQueryWrapper<MonitorAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.like(StrUtil.isNotBlank(baseParam.getSubmitName()),MonitorAudit::getAuditName,baseParam.getSubmitName())
.eq(StrUtil.isNotBlank(baseParam.getDataType()),MonitorAudit::getDataType,baseParam.getDataType())
.eq(baseParam.getStatus()!=0,MonitorAudit::getStatus,baseParam.getStatus())
.ne(baseParam.getStatus()==0,MonitorAudit::getStatus,baseParam.getStatus())
.like(StrUtil.isNotBlank(baseParam.getSubmitName()), MonitorAudit::getAuditName, baseParam.getSubmitName())
.eq(StrUtil.isNotBlank(baseParam.getDataType()), MonitorAudit::getDataType, baseParam.getDataType())
.eq(baseParam.getStatus() != 0, MonitorAudit::getStatus, baseParam.getStatus())
.ne(baseParam.getStatus() == 0, MonitorAudit::getStatus, baseParam.getStatus())
.ge(StringUtils.isNotBlank(baseParam.getSearchBeginTime()), MonitorAudit::getCreateTime, baseParam.getSearchBeginTime())
.le(StringUtils.isNotBlank(baseParam.getSearchEndTime()), MonitorAudit::getCreateTime, baseParam.getSearchEndTime())
;
return this.page(new Page<>(baseParam.getPageNum(),baseParam.getPageSize()),lambdaQueryWrapper);
return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()), lambdaQueryWrapper);
}
@Override
public boolean updateStatus(MonitorStatus.Status monitorParam) {
LambdaUpdateWrapper<MonitorAudit> update=new LambdaUpdateWrapper<>();
update.set(MonitorAudit::getStatus,monitorParam.getStatus())
.in(MonitorAudit::getId,monitorParam.getId());
LambdaUpdateWrapper<MonitorAudit> update = new LambdaUpdateWrapper<>();
update.set(MonitorAudit::getStatus, monitorParam.getStatus())
.in(MonitorAudit::getId, monitorParam.getId());
return this.update(update);
}
}

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

@@ -32,11 +32,11 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
private final DeptFeignClient deptFeignClient;
private final MonitorMapper monitorMapper;
private final IPwMonitorService iPwMonitorService;
private final IPwMonitorService iPwMonitorService;
@Override
public List<PmsSummaryStatisticsVO.SummaryVO> getSeparate(PmsSummaryStatisticsParam param) {
List<PmsSummaryStatisticsVO.SummaryVO> vos=new ArrayList<>();
List<PmsSummaryStatisticsVO.SummaryVO> vos = new ArrayList<>();
//获取当前部门下的子部门
List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getOrgId()).getData();
@@ -45,11 +45,11 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
//获得部门下面的数据集合
List<Monitor> monitors = monitorMapper.selectList(new LambdaQueryWrapper<Monitor>()
.in(CollectionUtil.isNotEmpty(deptIds),Monitor::getOrgId, deptIds)
.in(CollectionUtil.isNotEmpty(param.getMonitorTags()),Monitor::getMonitorTag, param.getMonitorTags())
.in(CollectionUtil.isNotEmpty(deptIds), Monitor::getOrgId, deptIds)
.in(CollectionUtil.isNotEmpty(param.getMonitorTags()), Monitor::getMonitorTag, param.getMonitorTags())
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
);
if(param.getType().equals(0)){
if (param.getType().equals(0)) {
//根据部门进行分组统计当前部门下有多少监测点
Map<String, List<Monitor>> monitorsMonitorCount = monitors.stream().collect(Collectors.groupingBy(Monitor::getOrgId));
//根据部门统计终端数量(数据去重)
@@ -57,14 +57,14 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> o.getOrgId() + ";" + o.getTerminalId()))), ArrayList::new));
Map<String, Long> monitorsTerminalCount = monitorsCount.stream().collect(Collectors.groupingBy(Monitor::getOrgId, Collectors.counting()));
deptMap.forEach((key,value)->{
PmsSummaryStatisticsVO.SummaryVO vo=new PmsSummaryStatisticsVO.SummaryVO();
if(monitorsMonitorCount.containsKey(key)){
deptMap.forEach((key, value) -> {
PmsSummaryStatisticsVO.SummaryVO vo = new PmsSummaryStatisticsVO.SummaryVO();
if (monitorsMonitorCount.containsKey(key)) {
vo.setName(value);
vo.setMonitorCount(monitorsMonitorCount.get(key).size());
vo.setTerminalCount(Math.toIntExact(monitorsTerminalCount.get(key)));
}else{
} else {
vo.setName(value);
//监测点数量
vo.setMonitorCount(0);
@@ -73,7 +73,7 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
}
vos.add(vo);
});
}else{
} else {
//根据干扰源类型进行分组统计当前部门下有多少监测点
Map<String, List<Monitor>> monitorsMonitorCount = monitors.stream().collect(Collectors.groupingBy(Monitor::getMonitorTag));
//根据部门统计终端数量
@@ -84,15 +84,15 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
Map<String, Long> monitorsNum = monitorsCount.stream().collect(Collectors.groupingBy(Monitor::getMonitorTag, Collectors.counting()));
PmsSummaryStatisticsVO.SummaryVO vo;
for (String monitorTag : param.getMonitorTags()) {
vo=new PmsSummaryStatisticsVO.SummaryVO();
if(monitorsNum.containsKey(monitorTag)){
vo = new PmsSummaryStatisticsVO.SummaryVO();
if (monitorsNum.containsKey(monitorTag)) {
vo.setName(monitorTag);
//监测点数量
vo.setMonitorCount(monitorsMonitorCount.get(monitorTag).size());
//设备数量
vo.setTerminalCount(Math.toIntExact(monitorsNum.get(monitorTag)));
}else{
} else {
vo.setName(monitorTag);
//监测点数量
vo.setMonitorCount(0);
@@ -107,7 +107,7 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
@Override
public List<PmsSummaryStatisticsVO> getMainnetPoint(PmsSummaryStatisticsParam param) {
List<PmsSummaryStatisticsVO> vos=new ArrayList<>();
List<PmsSummaryStatisticsVO> vos = new ArrayList<>();
//获取当前部门下的子部门
List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getOrgId()).getData();
@@ -130,14 +130,14 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
new TreeSet<>(Comparator.comparing(o -> o.getOrgId() + ";" + o.getTerminalId()))), ArrayList::new));
Map<String, Long> monitorsTerminalCount = monitorsCount.stream().collect(Collectors.groupingBy(Monitor::getOrgId, Collectors.counting()));
deptMap.forEach((key,value)->{
PmsSummaryStatisticsVO vo=new PmsSummaryStatisticsVO();
if(monitorsMonitorCount.containsKey(key)){
deptMap.forEach((key, value) -> {
PmsSummaryStatisticsVO vo = new PmsSummaryStatisticsVO();
if (monitorsMonitorCount.containsKey(key)) {
vo.setName(value);
vo.setMonitorCount(monitorsMonitorCount.get(key).size());
vo.setTerminalCount(Math.toIntExact(monitorsTerminalCount.get(key)));
//子集
List<PmsSummaryStatisticsVO.SummaryVO> voNodes=new ArrayList<>();
List<PmsSummaryStatisticsVO.SummaryVO> voNodes = new ArrayList<>();
PmsSummaryStatisticsVO.SummaryVO voNode;
//根据干扰源类型分组统计(监测点数量)
Map<String, Long> monitorsNum = monitorsMonitorCount.get(key).stream().collect(Collectors.groupingBy(Monitor::getMonitorTag, Collectors.counting()));
@@ -147,17 +147,17 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
new TreeSet<>(Comparator.comparing(o -> o.getOrgId() + ";" + o.getTerminalId()))), ArrayList::new));
//根据部门统计有多少干扰源(设备数量)
Map<String, Long> monitorsNum2 = monitorsCounts.stream().collect(Collectors.groupingBy(Monitor::getMonitorTag, Collectors.counting()));
Map<String, Long> monitorsNum2 = monitorsCounts.stream().collect(Collectors.groupingBy(Monitor::getMonitorTag, Collectors.counting()));
for (String monitorTag : param.getMonitorTags()) {
voNode=new PmsSummaryStatisticsVO.SummaryVO();
if(monitorsNum.containsKey(monitorTag)){
voNode = new PmsSummaryStatisticsVO.SummaryVO();
if (monitorsNum.containsKey(monitorTag)) {
voNode.setName(monitorTag);
//监测点数量
voNode.setMonitorCount(Math.toIntExact(monitorsNum.get(monitorTag)));
//设备数量
voNode.setTerminalCount(Math.toIntExact(monitorsNum2.get(monitorTag)));
}else{
} else {
voNode.setName(monitorTag);
//监测点数量
voNode.setMonitorCount(0);
@@ -167,14 +167,14 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
voNodes.add(voNode);
}
vo.setStatisticsVOList(voNodes);
}else{
} else {
vo.setName(value);
vo.setMonitorCount(0);
vo.setTerminalCount(0);
List<PmsSummaryStatisticsVO.SummaryVO> voNodes=new ArrayList<>();
List<PmsSummaryStatisticsVO.SummaryVO> voNodes = new ArrayList<>();
PmsSummaryStatisticsVO.SummaryVO voNode;
for (String monitorTag : param.getMonitorTags()) {
voNode=new PmsSummaryStatisticsVO.SummaryVO();
voNode = new PmsSummaryStatisticsVO.SummaryVO();
voNode.setName(monitorTag);
//监测点数量
voNode.setMonitorCount(0);
@@ -192,13 +192,13 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
@Override
public List<PmsSummaryStatisticsVO.SummaryVO> getDistributionPoint(PmsSummaryStatisticsParam.PwSummaryStatisticsParam param) {
List<PmsSummaryStatisticsVO.SummaryVO> vos=new ArrayList<>();
List<PmsSummaryStatisticsVO.SummaryVO> vos = new ArrayList<>();
PwPmsMonitorParam pwParam=new PwPmsMonitorParam();
PwPmsMonitorParam pwParam = new PwPmsMonitorParam();
pwParam.setOrgId(param.getOrgId());
List<PwPmsMonitorDTO> pwSubsetMonitorList = iPwMonitorService.getPwSubsetMonitorList(pwParam);
//获取配网监测点,统计配网有多少监测点
Map<String, List<PwPmsMonitorDTO>> pwMonitor= pwSubsetMonitorList.stream().collect(Collectors.groupingBy(PwPmsMonitorDTO::getOrgId));
Map<String, List<PwPmsMonitorDTO>> pwMonitor = pwSubsetMonitorList.stream().collect(Collectors.groupingBy(PwPmsMonitorDTO::getOrgId));
//获取当前部门下的子部门
List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getOrgId()).getData();
@@ -213,14 +213,14 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
.collect(Collectors.groupingBy(PwPmsMonitorDTO::getOrgId, Collectors.counting()));
deptMap.forEach((key,value)->{
PmsSummaryStatisticsVO.SummaryVO vo=new PmsSummaryStatisticsVO.SummaryVO();
if(pwMonitor.containsKey(key)){
deptMap.forEach((key, value) -> {
PmsSummaryStatisticsVO.SummaryVO vo = new PmsSummaryStatisticsVO.SummaryVO();
if (pwMonitor.containsKey(key)) {
vo.setName(value);
vo.setMonitorCount(pwMonitor.get(key).size());
vo.setTerminalCount(Math.toIntExact(monitorsTerminalCount.get(key)));
}else{
} else {
vo.setName(value);
//监测点数量
vo.setMonitorCount(0);

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

@@ -32,18 +32,18 @@ public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Trans
public Page<Transformer> getAllTransformerList(MonitorAuditParam baseParam) {
LambdaQueryWrapper<Transformer> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.like(StrUtil.isNotBlank(baseParam.getSubmitName()),Transformer::getName,baseParam.getSubmitName())
.eq(baseParam.getStatus()!=null,Transformer::getType,baseParam.getStatus())
.like(StrUtil.isNotBlank(baseParam.getSubmitName()), Transformer::getName, baseParam.getSubmitName())
.eq(baseParam.getStatus() != null, Transformer::getType, baseParam.getStatus())
.eq(Transformer::getStatus, DataStateEnum.ENABLE.getCode())
;
return this.page(new Page<>(baseParam.getPageNum(),baseParam.getPageSize()),lambdaQueryWrapper);
return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()), lambdaQueryWrapper);
}
@Override
public boolean updateStatus(MonitorStatus.Status monitorParam) {
LambdaUpdateWrapper<Transformer> update=new LambdaUpdateWrapper<>();
update.set(Transformer::getStatus,monitorParam.getStatus())
.in(Transformer::getId,monitorParam.getId());
LambdaUpdateWrapper<Transformer> update = new LambdaUpdateWrapper<>();
update.set(Transformer::getStatus, monitorParam.getStatus())
.in(Transformer::getId, monitorParam.getId());
return this.update(update);
}
}