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

代码调整

Browse Source
This commit is contained in:
hongawen
2023-07-05 15:38:42 +08:00
parent 52ad2e054e
commit 920aead30f
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1897,11 +1897,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deviceBakLambdaQueryWrapper.eq(DeviceBak::getDevId, oracleTerminalExcel.getDeviceId()); deviceBakLambdaQueryWrapper.eq(DeviceBak::getDevId, oracleTerminalExcel.getDeviceId());
List<DeviceBak> deviceBaks = deviceBakService.list(deviceBakLambdaQueryWrapper); List<DeviceBak> deviceBaks = deviceBakService.list(deviceBakLambdaQueryWrapper);
List<String> devIds = deviceBaks.stream().map(DeviceBak::getId).collect(Collectors.toList()); List<String> devIds = deviceBaks.stream().map(DeviceBak::getId).collect(Collectors.toList());
List<Line> devList = new ArrayList<>();
if(!CollectionUtil.isEmpty(devIds)){
LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>();
devLambda.in(Line::getId, devIds) devLambda.in(Line::getId, devIds)
.orderByAsc(Line::getCreateTime) .orderByAsc(Line::getCreateTime)
.eq(Line::getState, DataStateEnum.ENABLE.getCode()); .eq(Line::getState, DataStateEnum.ENABLE.getCode());
List<Line> devList = lineMapper.selectList(devLambda); devList = lineMapper.selectList(devLambda);
}
if (CollectionUtil.isEmpty(deviceBaks) || CollectionUtil.isEmpty(devList)) { if (CollectionUtil.isEmpty(deviceBaks) || CollectionUtil.isEmpty(devList)) {
temp = assembleLine(deviceName, LineBaseEnum.DEVICE_LEVEL.getCode(), pids.get(LineBaseEnum.SUB_LEVEL.getCode()), pids); temp = assembleLine(deviceName, LineBaseEnum.DEVICE_LEVEL.getCode(), pids.get(LineBaseEnum.SUB_LEVEL.getCode()), pids);
this.baseMapper.insert(temp); this.baseMapper.insert(temp);
@@ -2040,11 +2043,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineBakLambdaQueryWrapper.eq(LineBak::getLineId, oracleTerminalExcel.getId()); lineBakLambdaQueryWrapper.eq(LineBak::getLineId, oracleTerminalExcel.getId());
List<LineBak> lineBaks = lineBakService.list(lineBakLambdaQueryWrapper); List<LineBak> lineBaks = lineBakService.list(lineBakLambdaQueryWrapper);
List<String> lineIds = lineBaks.stream().map(LineBak::getId).collect(Collectors.toList()); List<String> lineIds = lineBaks.stream().map(LineBak::getId).collect(Collectors.toList());
List<Line> lineList = new ArrayList<>();
if(CollectionUtil.isNotEmpty(lineIds)){
LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>();
devLambda.in(Line::getId, lineIds) devLambda.in(Line::getId, lineIds)
.orderByAsc(Line::getCreateTime) .orderByAsc(Line::getCreateTime)
.eq(Line::getState, DataStateEnum.ENABLE.getCode()); .eq(Line::getState, DataStateEnum.ENABLE.getCode());
List<Line> lineList = lineMapper.selectList(devLambda); lineList = lineMapper.selectList(devLambda);
}
if (CollectionUtil.isEmpty(lineBaks) || CollectionUtil.isEmpty(lineList)) { if (CollectionUtil.isEmpty(lineBaks) || CollectionUtil.isEmpty(lineList)) {
temp = assembleLine(lineName, LineBaseEnum.LINE_LEVEL.getCode(), pids.get(LineBaseEnum.SUB_V_LEVEL.getCode()), pids); temp = assembleLine(lineName, LineBaseEnum.LINE_LEVEL.getCode(), pids.get(LineBaseEnum.SUB_V_LEVEL.getCode()), pids);
this.baseMapper.insert(temp); this.baseMapper.insert(temp);