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

bug修改

Browse Source
This commit is contained in:
chendaofei
2025-05-19 09:41:36 +08:00
parent 2265bf11b9
commit c532cdb595
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
View File

@@ -119,15 +119,6 @@ public class TerminalBaseController extends BaseController {
}
}
terminalBaseService.addTerminal(addTerminalParam);
//新增终端后发送消息给前置重启设备
/* if (Objects.nonNull(addTerminalParam.getDeviceParam())) {
addTerminalParam.getDeviceParam().forEach(temp->{
Line line = terminalBaseService.queryTerminalByName(temp.getName());
terminalBaseService.askRestartDevice(line.getId(), DeviceRebootType.ADD_TERMINAL);
});
}*/
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}

18
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -378,7 +378,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (CollectionUtil.isNotEmpty(deviceParam.getSubVoltageParam())) {
//当通过设备节点新增时候需要校验是否存在同名母线名称
List<String> subvNameList = deviceParam.getSubVoltageParam().stream()
.filter((subv) -> subv.getSubvIndex() == null)
.filter((subv) -> StrUtil.isBlank(subv.getSubvIndex()))
.map(SubVoltageParam::getName).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(subvNameList)) {
lineLambdaQueryWrapper.clear();
@@ -404,7 +404,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
//校验同一变电站下只能有唯一母线名称
List<String> addVoltage = deviceParam.getSubVoltageParam().stream().filter(item -> item.getSubvIndex() == null).map(SubVoltageParam::getName).collect(Collectors.toList());
List<String> addVoltage = deviceParam.getSubVoltageParam().stream().filter(item -> StrUtil.isBlank(item.getSubvIndex())).map(SubVoltageParam::getName).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(addVoltage)) {
List<Line> voltageListBySubId = this.baseMapper.getVoltageListBySubId(subIndex, addVoltage);
if (CollectionUtil.isNotEmpty(voltageListBySubId)) {
@@ -446,7 +446,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
//监测点
if (CollectionUtil.isNotEmpty(subVoltageParam.getLineParam())) {
//校验监测点名称重复
List<String> lineNameList = subVoltageParam.getLineParam().stream().filter((line) -> line.getLineIndex() == null).map(LineParam::getName).collect(Collectors.toList());
List<String> lineNameList = subVoltageParam.getLineParam().stream().filter((line) -> StrUtil.isBlank(line.getLineIndex())).map(LineParam::getName).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(lineNameList)) {
lineLambdaQueryWrapper.clear();
lineLambdaQueryWrapper.eq(Line::getPid, subvIndex)
@@ -552,9 +552,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
* 校验装置
*/
private void checkDevNameAndIp(AddTerminalParam addTerminalParam, String subIndex, LambdaQueryWrapper<Line> lineLambdaQueryWrapper) {
List<String> devNameList = addTerminalParam.getDeviceParam().stream().filter((dev -> dev.getDevIndex() == null)).map(DeviceParam::getName).collect(Collectors.toList());
List<String> devNameList = addTerminalParam.getDeviceParam().stream().filter((dev -> StrUtil.isBlank(dev.getDevIndex()))).map(DeviceParam::getName).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(devNameList)) {
lineLambdaQueryWrapper.eq(Line::getPid, subIndex).in(Line::getName, devNameList);
List<Line> deviceListRes = this.list(lineLambdaQueryWrapper);
@@ -564,7 +562,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
throw new BusinessException(DeviceResponseEnum.DEVICE_SAME_NAME, String.join(";", stringList));
}
}
List<DeviceParam> devIpList = addTerminalParam.getDeviceParam().stream().filter((dev -> dev.getDevIndex() == null)).collect(Collectors.toList());
//校验当前变电站下的装置是否有相同ip
List<DeviceParam> devIpList = addTerminalParam.getDeviceParam().stream().filter((dev -> StrUtil.isBlank(dev.getDevIndex()))).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(devIpList)) {
for (DeviceParam deviceParam : devIpList) {
List<Device> deviceListIpRes = deviceMapper.getDeviceBySubId(subIndex, deviceParam.getIp(), deviceParam.getPort(), null);
@@ -573,11 +572,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
}
}
//校验当前变电站下的装置是否有相同ip
/* if (CollectionUtil.isNotEmpty(deviceListIpRes)) {
List<String> stringList = deviceListIpRes.stream().map(Device::getIp).collect(Collectors.toList());
throw new BusinessException(DeviceResponseEnum.DEVICE_SAME_IP, String.join(";", stringList));
}*/
}
}