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

代码调整

Browse Source
This commit is contained in:
雨木c
2023-09-27 18:44:43 +08:00
parent 3b34fd8cbb
commit ae3ff91328
4 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -118,8 +118,9 @@ public class CommTerminalServiceImpl implements CommTerminalService {
List<Monitor> monitorList = monitorMapper.selectList(new LambdaQueryWrapper<Monitor>().eq(Monitor::getStatus, 1).eq(Monitor::getMonitorState, dictData.getId())); List<Monitor> monitorList = monitorMapper.selectList(new LambdaQueryWrapper<Monitor>().eq(Monitor::getStatus, 1).eq(Monitor::getMonitorState, dictData.getId()));
Map<String, List<Monitor>> map = monitorList.stream().collect(Collectors.groupingBy(Monitor::getOrgId)); Map<String, List<Monitor>> map = monitorList.stream().collect(Collectors.groupingBy(Monitor::getOrgId));
List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); //TODO 配网数据量巨大，暂时注释
Map<String, List<PmsMonitorBaseDTO>> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); //List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0);
//Map<String, List<PmsMonitorBaseDTO>> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId));
temDept.forEach(item -> { temDept.forEach(item -> {
DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO(); DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO();
@@ -144,7 +145,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
lineList.add(lineDevGetDTO); lineList.add(lineDevGetDTO);
}); });
} }
if (mapPms.containsKey(i)) { /* if (mapPms.containsKey(i)) {
mapPms.get(i).forEach(it -> { mapPms.get(i).forEach(it -> {
LineDevGetDTO lineDevGetDTOPms = new LineDevGetDTO(); LineDevGetDTO lineDevGetDTOPms = new LineDevGetDTO();
lineDevGetDTOPms.setPointId(it.getMonitorId()); lineDevGetDTOPms.setPointId(it.getMonitorId());
@@ -155,10 +156,10 @@ public class CommTerminalServiceImpl implements CommTerminalService {
lineDevGetDTOPms.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue()); lineDevGetDTOPms.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue());
lineListPw.add(lineDevGetDTOPms); lineListPw.add(lineDevGetDTOPms);
}); });
} }*/
}); });
deptGetChildrenMoreDTO.setLineBaseList(lineList); deptGetChildrenMoreDTO.setLineBaseList(lineList);
deptGetChildrenMoreDTO.setPwMonitorIds(lineListPw); //deptGetChildrenMoreDTO.setPwMonitorIds(lineListPw);
} }
result.add(deptGetChildrenMoreDTO); result.add(deptGetChildrenMoreDTO);
}); });
@@ -173,8 +174,8 @@ public class CommTerminalServiceImpl implements CommTerminalService {
List<StatationStat> statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper<StatationStat>().eq(StatationStat::getStatus, 1)); List<StatationStat> statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper<StatationStat>().eq(StatationStat::getStatus, 1));
Map<String, List<StatationStat>> map = statationStatList.stream().collect(Collectors.groupingBy(StatationStat::getOrgId)); Map<String, List<StatationStat>> map = statationStatList.stream().collect(Collectors.groupingBy(StatationStat::getOrgId));
List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); //List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0);
Map<String, List<PmsMonitorBaseDTO>> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); //Map<String, List<PmsMonitorBaseDTO>> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId));
temDept.forEach(item -> { temDept.forEach(item -> {
@@ -190,9 +191,9 @@ public class CommTerminalServiceImpl implements CommTerminalService {
if (map.containsKey(i)) { if (map.containsKey(i)) {
lineList.addAll(map.get(i).stream().map(StatationStat::getPowerId).distinct().collect(Collectors.toList())); lineList.addAll(map.get(i).stream().map(StatationStat::getPowerId).distinct().collect(Collectors.toList()));
} }
if (mapPms.containsKey(i)) { /*if (mapPms.containsKey(i)) {
lineListPw.addAll(mapPms.get(i).stream().map(PmsMonitorBaseDTO::getPowerrId).distinct().collect(Collectors.toList())); lineListPw.addAll(mapPms.get(i).stream().map(PmsMonitorBaseDTO::getPowerrId).distinct().collect(Collectors.toList()));
} }*/
}); });
deptGetSubStationDTO.setStationIds(lineList.stream().distinct().collect(Collectors.toList())); deptGetSubStationDTO.setStationIds(lineList.stream().distinct().collect(Collectors.toList()));
deptGetSubStationDTO.setPwStationIds(lineListPw.stream().distinct().collect(Collectors.toList())); deptGetSubStationDTO.setPwStationIds(lineListPw.stream().distinct().collect(Collectors.toList()));
@@ -211,9 +212,9 @@ public class CommTerminalServiceImpl implements CommTerminalService {
List<GeneratrixWire> generatrixWireList = pmsGeneratrixWireMapper.getGeneratrixWireList(); List<GeneratrixWire> generatrixWireList = pmsGeneratrixWireMapper.getGeneratrixWireList();
Map<String, List<GeneratrixWire>> map = generatrixWireList.stream().collect(Collectors.groupingBy(GeneratrixWire::getOrgId)); Map<String, List<GeneratrixWire>> map = generatrixWireList.stream().collect(Collectors.groupingBy(GeneratrixWire::getOrgId));
List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); /*List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0);
Map<String, List<PmsMonitorBaseDTO>> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); Map<String, List<PmsMonitorBaseDTO>> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId));
*/
temDept.forEach(item -> { temDept.forEach(item -> {
DeptGetBusBarDTO deptGetBusBarDTO = new DeptGetBusBarDTO(); DeptGetBusBarDTO deptGetBusBarDTO = new DeptGetBusBarDTO();
@@ -228,9 +229,9 @@ public class CommTerminalServiceImpl implements CommTerminalService {
if (map.containsKey(i)) { if (map.containsKey(i)) {
lineList.addAll(map.get(i).stream().map(GeneratrixWire::getId).collect(Collectors.toList())); lineList.addAll(map.get(i).stream().map(GeneratrixWire::getId).collect(Collectors.toList()));
} }
if (mapPms.containsKey(i)) { /* if (mapPms.containsKey(i)) {
lineListPw.addAll(mapPms.get(i).stream().map(PmsMonitorBaseDTO::getLineId).collect(Collectors.toList())); lineListPw.addAll(mapPms.get(i).stream().map(PmsMonitorBaseDTO::getLineId).collect(Collectors.toList()));
} }*/
}); });
deptGetBusBarDTO.setBusBarIds(lineList); deptGetBusBarDTO.setBusBarIds(lineList);
deptGetBusBarDTO.setPwBusBarIds(lineListPw); deptGetBusBarDTO.setPwBusBarIds(lineListPw);
@@ -252,17 +253,17 @@ public class CommTerminalServiceImpl implements CommTerminalService {
List<PmsTerminal> pmsTerminals = terminalMapper.selectList(lambdaQueryWrapper); List<PmsTerminal> pmsTerminals = terminalMapper.selectList(lambdaQueryWrapper);
Map<String, List<PmsTerminal>> map = pmsTerminals.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId)); Map<String, List<PmsTerminal>> map = pmsTerminals.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId));
List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); /* List<PmsMonitorBaseDTO> pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0);
List<String> pwTerminalIds = pmsMonitorBaseDTOList.stream().map(PmsMonitorBaseDTO::getTerminalId).distinct().collect(Collectors.toList()); List<String> pwTerminalIds = pmsMonitorBaseDTOList.stream().map(PmsMonitorBaseDTO::getTerminalId).distinct().collect(Collectors.toList());
List<PmsTerminal> pwPmsTerminals = terminalMapper.selectList(new LambdaQueryWrapper<PmsTerminal>().in(CollUtil.isNotEmpty(pwTerminalIds),PmsTerminal::getId, pwTerminalIds)); List<PmsTerminal> pwPmsTerminals = terminalMapper.selectList(new LambdaQueryWrapper<PmsTerminal>().in(CollUtil.isNotEmpty(pwTerminalIds),PmsTerminal::getId, pwTerminalIds));
Map<String, List<PmsTerminal>> mapPms = pwPmsTerminals.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId)); Map<String, List<PmsTerminal>> mapPms = pwPmsTerminals.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId));
*/
Map<String, List<Monitor>> monitorMap = new HashMap<>(); Map<String, List<Monitor>> monitorMap = new HashMap<>();
Map<String, List<PmsMonitorBaseDTO>> pwMonitorMap = new HashMap<>(); Map<String, List<PmsMonitorBaseDTO>> pwMonitorMap = new HashMap<>();
if (type == 1) { if (type == 1) {
//获取装置接入的监测点 //获取装置接入的监测点
monitorMap = monitorList.stream().collect(Collectors.groupingBy(Monitor::getTerminalId)); monitorMap = monitorList.stream().collect(Collectors.groupingBy(Monitor::getTerminalId));
pwMonitorMap = pmsMonitorBaseDTOList.stream().filter(x-> ObjectUtil.isNotNull(x.getTerminalId())).collect(Collectors.groupingBy(PmsMonitorBaseDTO::getTerminalId)); //pwMonitorMap = pmsMonitorBaseDTOList.stream().filter(x-> ObjectUtil.isNotNull(x.getTerminalId())).collect(Collectors.groupingBy(PmsMonitorBaseDTO::getTerminalId));
} }
@@ -295,7 +296,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
}); });
} }
if (mapPms.containsKey(i)) { /* if (mapPms.containsKey(i)) {
mapPms.get(i).forEach(dev -> { mapPms.get(i).forEach(dev -> {
LineDevGetDTO lineDevGetDTO = new LineDevGetDTO(); LineDevGetDTO lineDevGetDTO = new LineDevGetDTO();
lineDevGetDTO.setDevId(dev.getId()); lineDevGetDTO.setDevId(dev.getId());
@@ -309,7 +310,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
} }
devGetDTOListPw.add(lineDevGetDTO); devGetDTOListPw.add(lineDevGetDTO);
}); });
} }*/
}); });
deptGetDeviceDTO.setDeviceList(devGetDTOList); deptGetDeviceDTO.setDeviceList(devGetDTOList);
deptGetDeviceDTO.setPwDeviceList(devGetDTOListPw); deptGetDeviceDTO.setPwDeviceList(devGetDTOListPw);

5
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/PqsEventdetailController.java
View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.pojo.param.LineParam;
import com.njcn.prepare.harmonic.service.mysql.line.PqsEventdetailHandlerService; import com.njcn.prepare.harmonic.service.mysql.line.PqsEventdetailHandlerService;
@@ -42,6 +43,8 @@ public class PqsEventdetailController extends BaseController {
private final LineFeignClient lineFeignClient; private final LineFeignClient lineFeignClient;
private final CommTerminalGeneralClient commTerminalGeneralClient;
private final PqsEventdetailHandlerService pqsEventdetailHandlerService; private final PqsEventdetailHandlerService pqsEventdetailHandlerService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/eventdetailHandler") @PostMapping("/eventdetailHandler")
@@ -52,7 +55,7 @@ public class PqsEventdetailController extends BaseController {
String methodDescribe = getMethodDescribe("eventdetailHandler"); String methodDescribe = getMethodDescribe("eventdetailHandler");
List<String> indexLists = new ArrayList<> (); List<String> indexLists = new ArrayList<> ();
if(CollectionUtils.isEmpty (lineParam.getLineIds ())){ if(CollectionUtils.isEmpty (lineParam.getLineIds ())){
indexLists = lineFeignClient.getLineList ( ).getData ( ); indexLists = commTerminalGeneralClient.getRunMonitorIds ().getData ();
}else{ }else{
indexLists = lineParam.getLineIds (); indexLists = lineParam.getLineIds ();
} }

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatOrgController.java
View File

@@ -63,7 +63,7 @@ public class RStatOrgController extends BaseController {
@ApiImplicitParam(name = "orgParam", value = "参数", required = true) @ApiImplicitParam(name = "orgParam", value = "参数", required = true)
public HttpResult<String> handler(@RequestBody @Validated OrgParam orgParam ){ public HttpResult<String> handler(@RequestBody @Validated OrgParam orgParam ){
log.info(LocalDateTime.now()+"dayHandler始执行"); log.info(LocalDateTime.now()+"dayHandler始执行");
String methodDescribe = getMethodDescribe("dayHandler"); String methodDescribe = getMethodDescribe("handler");
/** /**
* 支持补录 * 支持补录
*/ */

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PqsEventdetailHandlerServiceImpl.java
View File

@@ -53,11 +53,11 @@ public class PqsEventdetailHandlerServiceImpl implements PqsEventdetailHandlerSe
@Override @Override
@Async("asyncExecutor") @Async("asyncExecutor")
public void eventdetailHandler(LineParam lineParam) { public void eventdetailHandler(LineParam lineParam) {
if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.ORACLE_DATA)) { /*if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.ORACLE_DATA)) {
hanlderOracleData (lineParam); hanlderOracleData (lineParam);
} else if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.INFLUX_DATA)) { } else if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.INFLUX_DATA)) {*/
hanlderInfludxbData (lineParam); hanlderInfludxbData (lineParam);
} // }
} }
/** /**
* @Description: hanlderInfludxbData * @Description: hanlderInfludxbData