diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index b7081628..e27f1c41 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -331,6 +331,7 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // } StorageParam storageParam = new StorageParam(); + storageParam.setDevId(devId); storageParam.setCode(adPlan.getCode() + ""); storageParam.setScriptId(adPlan.getScriptId()); List indexes = adHarmonicService.getIndex(storageParam, true); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java index 45a97020..d60d681e 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java @@ -207,6 +207,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.select(AdHarmonicResult::getSort) + .likeRight(StrUtil.isNotBlank(param.getDevId()), AdHarmonicResult::getMonitorId, param.getDevId()) .ne(AdHarmonicResult::getResultFlag, 1) .eq(AdHarmonicResult::getScriptId, param.getScriptId()); List adHarmonicResultList = this.list(lambdaQueryWrapper); @@ -215,6 +216,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl resultLambdaQueryWrapper = new LambdaQueryWrapper<>(); resultLambdaQueryWrapper.select(AdNonHarmonicResult::getSort) + .likeRight(StrUtil.isNotBlank(param.getDevId()), AdNonHarmonicResult::getMonitorId, param.getDevId()) .ne(AdNonHarmonicResult::getResultFlag, 1) .eq(AdNonHarmonicResult::getScriptId, param.getScriptId()); ;