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:
cdf
2024-03-13 13:37:23 +08:00
parent b68c1a2f75
commit f6f570ee83
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,10 +77,6 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
@Override
public String pushMonitor(List<String> ids) {
/*if (ids.size() > 100) {
throw new BusinessException("一次最多上送100条数据");
}*/
List<PushMonitorDTO> pushResult = new ArrayList<>();
//电压等级
@@ -104,15 +100,13 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
// Map<String, DictData> pointMap = pointDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
DictData monitorStateDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData();
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(CollUtil.isEmpty(ids)){
lambdaQueryWrapper.eq(Monitor::getMonitorState,monitorStateDic.getId())
lambdaQueryWrapper
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
}else {
lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
}
List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper);
if(CollUtil.isEmpty(monitorList)){
@@ -321,10 +315,10 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(CollUtil.isEmpty(ids)){
lambdaQueryWrapper.eq(Monitor::getMonitorState,monitorStateDic.getId())
lambdaQueryWrapper
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getIsUpToGrid,1);
}else {
lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getMonitorState,monitorStateDic.getId()).eq(Monitor::getIsUpToGrid,1).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper.in(Monitor::getId, ids).eq(Monitor::getIsUpToGrid,1).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode());
}
List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper);
@@ -332,10 +326,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
throw new BusinessException("未查询到有效监测点！");
}
long noCount = monitorList.stream().filter(item-> !Objects.equals(item.getMonitorState(),monitorStateDic.getId()) || item.getIsUpToGrid() == 0).count();
if(noCount>0){
throw new BusinessException("当前监测点未投运或非上送国网监测点");
}
List<String> monitorIds = monitorList.stream().map(Monitor::getId).distinct().collect(Collectors.toList());

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

@@ -101,18 +101,13 @@ public class MonitorSendServiceImpl implements MonitorSendService {
}
//运行状态
List<DictData> lineState = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData();
List<DictData> run = lineState.stream().filter(x -> DicDataEnum.RUN.getCode()
.equals(x.getCode())).collect(Collectors.toList());
//获取监测点信息
lambdaQueryWrapper.in(StrUtil.isNotBlank(param.getMonitorTag()),Monitor::getMonitorTag, param.getMonitorTag())
.eq(Monitor::getIsUpToGrid,1)
.eq(Monitor::getMonitorState,run.get(0).getId())
.ne(param.getFiy(),Monitor::getIsUploadHead,1)
//.ne(param.getFiy(),Monitor::getIsUploadHead,1)
.in(CollUtil.isNotEmpty(param.getIds()),Monitor::getId, param.getIds());
List<Monitor> monitorList = monitorService.list(lambdaQueryWrapper);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
View File

@@ -156,9 +156,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
sendParam.setStats(dtoList);
sendParam.setStatisticalDate(temp.get(0).getComputeDate());
String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT);
log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
Map<String, String> send = GwSendUtil.send(sendParam, GWSendEnum.TYPICAL_SOURCE);
log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
List<String> trIds = dtoList.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList());
returnInformation(1, trIds, send);
});