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

1.调整pms国网监测点台账调整

Browse Source
This commit is contained in:
雨木c
2024-02-26 19:58:38 +08:00
parent f8e28fc4b1
commit 6ffcd6e092
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java
View File

@@ -27,6 +27,8 @@ import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.DictData;
import com.njcn.system.pojo.po.SysDicTreePO; import com.njcn.system.pojo.po.SysDicTreePO;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.enums.GWSendEnum; import com.njcn.web.enums.GWSendEnum;
import com.njcn.web.factory.PageFactory; import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
@@ -60,6 +62,8 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
private final DicDataFeignClient dicDataFeignClient; private final DicDataFeignClient dicDataFeignClient;
private final DeptFeignClient deptFeignClient;
private final DictTreeFeignClient dictTreeFeignClient; private final DictTreeFeignClient dictTreeFeignClient;
private final StatationStatMapper statationStatMapper; private final StatationStatMapper statationStatMapper;
@@ -73,9 +77,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
@Override @Override
public String pushMonitor(List<String> ids) { public String pushMonitor(List<String> ids) {
if (ids.size() > 100) { /*if (ids.size() > 100) {
throw new BusinessException("一次最多上送100条数据"); throw new BusinessException("一次最多上送100条数据");
} }*/
List<PushMonitorDTO> pushResult = new ArrayList<>(); List<PushMonitorDTO> pushResult = new ArrayList<>();
@@ -139,12 +143,19 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
Map<String,PmsTerminal> mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity())); Map<String,PmsTerminal> mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity()));
Map<String,GeneratrixWire> mapBus = GeneratrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity())); Map<String,GeneratrixWire> mapBus = GeneratrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity()));
//获取母线中台信息 //获取母线中台信息
List<PmsMidLedger> pmsMidLedgers = pmsMidLedgerMapper.selectList(new LambdaQueryWrapper<PmsMidLedger>() List<PmsMidLedger> pmsMidLedgers = pmsMidLedgerMapper.selectList(new LambdaQueryWrapper<PmsMidLedger>()
.in(PmsMidLedger::getId, mapBus.keySet()) .in(PmsMidLedger::getId, GeneratrixWireList.stream().map(GeneratrixWire::getMidBusId).distinct().collect(Collectors.toList()))
); );
Map<String,PmsMidLedger> mapMidLedger = pmsMidLedgers.stream().collect(Collectors.toMap(PmsMidLedger::getId,Function.identity())); Map<String,PmsMidLedger> mapMidLedger = pmsMidLedgers.stream().collect(Collectors.toMap(PmsMidLedger::getId,Function.identity()));
//单位处理
List<Dept> deptList = deptFeignClient.getAllDept().getData();
Map<String,Dept> deptMap = deptList.stream().collect(Collectors.toMap(Dept::getCode,Function.identity()));
Map<String,Dept> deptIdMap = deptList.stream().collect(Collectors.toMap(Dept::getId,Function.identity()));
for (Monitor item : monitorList) { for (Monitor item : monitorList) {
PushMonitorDTO pushMonitorDTO = new PushMonitorDTO(); PushMonitorDTO pushMonitorDTO = new PushMonitorDTO();
@@ -152,7 +163,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
pushMonitorDTO.setMonitorId(item.getMonitorId()); pushMonitorDTO.setMonitorId(item.getMonitorId());
pushMonitorDTO.setMonitorName(item.getName()); pushMonitorDTO.setMonitorName(item.getName());
pushMonitorDTO.setTerminalCode(item.getTerminalId()); pushMonitorDTO.setTerminalCode(item.getTerminalId());
pushMonitorDTO.setCityId(item.getOrgId()); pushMonitorDTO.setCityId(deptIdMap.get(deptMap.get(item.getOrgId()).getPid()).getCode());
pushMonitorDTO.setIsMajorNet("1"); pushMonitorDTO.setIsMajorNet("1");
pushMonitorDTO.setProvinceId("13B9B47F1E483324E05338297A0A0595"); pushMonitorDTO.setProvinceId("13B9B47F1E483324E05338297A0A0595");
@@ -225,9 +236,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
}*/ }*/
/*if (StrUtil.isNotBlank(item.getOperationId())) { if (StrUtil.isNotBlank(item.getOrgName())) {
pushMonitorDTO.setMaintOrg(item.getOperationId()); pushMonitorDTO.setMaintOrg(item.getOrgName());
}*/ }
if (Objects.nonNull(item.getStatisticalInterval())) { if (Objects.nonNull(item.getStatisticalInterval())) {
pushMonitorDTO.setStatisticalInterval(item.getStatisticalInterval().toString()); pushMonitorDTO.setStatisticalInterval(item.getStatisticalInterval().toString());
} }
@@ -292,9 +303,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
@Override @Override
public String pushMonitorOverLimit(List<String> ids) { public String pushMonitorOverLimit(List<String> ids) {
if (ids.size() > 100) { /* if (ids.size() > 100) {
throw new BusinessException("一次最多上送100条数据"); throw new BusinessException("一次最多上送100条数据");
} }*/
List<MonitorLimitDTO> pushResult = new ArrayList<>(); List<MonitorLimitDTO> pushResult = new ArrayList<>();