ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-09-18 08:58:48 +08:00
parent c3c46b5257
commit 947ee4f771
4 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
View File

@@ -109,14 +109,13 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl<Detect
}
if (nonHarmonicResultList.get(0) instanceof ContrastNonHarmonicResult) {
List<ContrastNonHarmonicResult> contrastNonHarmonicResultList = BeanUtil.copyToList(nonHarmonicResultList, ContrastNonHarmonicResult.class);
List<String> monitorIds = contrastNonHarmonicResultList.stream().map(ContrastNonHarmonicResult::getDevMonitorId).distinct().collect(Collectors.toList());
if (CollUtil.isNotEmpty(monitorIds)) {
contrastNonHarmonicService.remove(new LambdaQueryWrapper<ContrastNonHarmonicResult>().in(ContrastNonHarmonicResult::getDevMonitorId, monitorIds)
.eq(ContrastNonHarmonicResult::getNum, contrastNonHarmonicResultList.get(0).getNum())
.eq(ContrastNonHarmonicResult::getDataType, contrastNonHarmonicResultList.get(0).getDataType())
.eq(ObjectUtil.isNotNull(contrastNonHarmonicResultList.get(0).getWaveNum()), ContrastNonHarmonicResult::getWaveNum, contrastNonHarmonicResultList.get(0).getWaveNum())
.isNull(ObjectUtil.isNull(contrastNonHarmonicResultList.get(0).getWaveNum()), ContrastNonHarmonicResult::getWaveNum));
}
ContrastNonHarmonicResult contrastNonHarmonicResult = contrastNonHarmonicResultList.get(0);
contrastNonHarmonicService.remove(new LambdaQueryWrapper<ContrastNonHarmonicResult>().in(ContrastNonHarmonicResult::getDevMonitorId, contrastNonHarmonicResult.getDevMonitorId())
.eq(ContrastNonHarmonicResult::getNum, contrastNonHarmonicResult.getNum())
.eq(ContrastNonHarmonicResult::getAdType, contrastNonHarmonicResult.getAdType())
.eq(ContrastNonHarmonicResult::getDataType, contrastNonHarmonicResult.getDataType())
.eq(ObjectUtil.isNotNull(contrastNonHarmonicResult.getWaveNum()), ContrastNonHarmonicResult::getWaveNum, contrastNonHarmonicResult.getWaveNum())
.isNull(ObjectUtil.isNull(contrastNonHarmonicResult.getWaveNum()), ContrastNonHarmonicResult::getWaveNum));
contrastNonHarmonicService.saveBatch(contrastNonHarmonicResultList);
}
DynamicTableNameHandler.remove();
@@ -143,14 +142,13 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl<Detect
if (harmonicResultList.get(0) instanceof ContrastHarmonicResult) {
List<ContrastHarmonicResult> contrastHarmonicResultList = BeanUtil.copyToList(harmonicResultList, ContrastHarmonicResult.class);
List<String> monitorIds = contrastHarmonicResultList.stream().map(ContrastHarmonicResult::getDevMonitorId).distinct().collect(Collectors.toList());
if (CollUtil.isNotEmpty(monitorIds)) {
contrastHarmonicService.remove(new LambdaQueryWrapper<ContrastHarmonicResult>().in(ContrastHarmonicResult::getDevMonitorId, monitorIds)
.eq(ContrastHarmonicResult::getNum, contrastHarmonicResultList.get(0).getNum())
.eq(ContrastHarmonicResult::getDataType, contrastHarmonicResultList.get(0).getDataType())
.eq(ObjectUtil.isNotNull(contrastHarmonicResultList.get(0).getWaveNum()), ContrastHarmonicResult::getWaveNum, contrastHarmonicResultList.get(0).getWaveNum())
.isNull(ObjectUtil.isNull(contrastHarmonicResultList.get(0).getWaveNum()), ContrastHarmonicResult::getWaveNum));
}
ContrastHarmonicResult contrastHarmonicResult = contrastHarmonicResultList.get(0);
contrastHarmonicService.remove(new LambdaQueryWrapper<ContrastHarmonicResult>().eq(ContrastHarmonicResult::getDevMonitorId, contrastHarmonicResult.getDevMonitorId())
.eq(ContrastHarmonicResult::getNum, contrastHarmonicResult.getNum())
.eq(ContrastHarmonicResult::getAdType, contrastHarmonicResult.getAdType())
.eq(ContrastHarmonicResult::getDataType, contrastHarmonicResult.getDataType())
.eq(ObjectUtil.isNotNull(contrastHarmonicResult.getWaveNum()), ContrastHarmonicResult::getWaveNum, contrastHarmonicResult.getWaveNum())
.isNull(ObjectUtil.isNull(contrastHarmonicResult.getWaveNum()), ContrastHarmonicResult::getWaveNum));
contrastHarmonicService.saveBatch(contrastHarmonicResultList);
}
DynamicTableNameHandler.remove();