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

复检bug

Browse Source
This commit is contained in:
caozehui
2025-05-08 15:27:52 +08:00
parent a9515f42b3
commit bfed1b3e93
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

@@ -331,6 +331,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
// scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList());
// } // }
StorageParam storageParam = new StorageParam(); StorageParam storageParam = new StorageParam();
storageParam.setDevId(devId);
storageParam.setCode(adPlan.getCode() + ""); storageParam.setCode(adPlan.getCode() + "");
storageParam.setScriptId(adPlan.getScriptId()); storageParam.setScriptId(adPlan.getScriptId());
List<Integer> indexes = adHarmonicService.getIndex(storageParam, true); List<Integer> indexes = adHarmonicService.getIndex(storageParam, true);

2
storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java
View File

@@ -207,6 +207,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
DynamicTableNameHandler.setTableName(prefix + param.getCode()); DynamicTableNameHandler.setTableName(prefix + param.getCode());
LambdaQueryWrapper<AdHarmonicResult> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<AdHarmonicResult> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(AdHarmonicResult::getSort) lambdaQueryWrapper.select(AdHarmonicResult::getSort)
.likeRight(StrUtil.isNotBlank(param.getDevId()), AdHarmonicResult::getMonitorId, param.getDevId())
.ne(AdHarmonicResult::getResultFlag, 1) .ne(AdHarmonicResult::getResultFlag, 1)
.eq(AdHarmonicResult::getScriptId, param.getScriptId()); .eq(AdHarmonicResult::getScriptId, param.getScriptId());
List<AdHarmonicResult> adHarmonicResultList = this.list(lambdaQueryWrapper); List<AdHarmonicResult> adHarmonicResultList = this.list(lambdaQueryWrapper);
@@ -215,6 +216,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
DynamicTableNameHandler.setTableName(prefixNon + param.getCode()); DynamicTableNameHandler.setTableName(prefixNon + param.getCode());
LambdaQueryWrapper<AdNonHarmonicResult> resultLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<AdNonHarmonicResult> resultLambdaQueryWrapper = new LambdaQueryWrapper<>();
resultLambdaQueryWrapper.select(AdNonHarmonicResult::getSort) resultLambdaQueryWrapper.select(AdNonHarmonicResult::getSort)
.likeRight(StrUtil.isNotBlank(param.getDevId()), AdNonHarmonicResult::getMonitorId, param.getDevId())
.ne(AdNonHarmonicResult::getResultFlag, 1) .ne(AdNonHarmonicResult::getResultFlag, 1)
.eq(AdNonHarmonicResult::getScriptId, param.getScriptId()); .eq(AdNonHarmonicResult::getScriptId, param.getScriptId());
; ;