From 799a4095f37b9f52b1294a709b418b3736144bd3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 十二月 2025 18:41:25 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 38fdeae..ce9699a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -818,7 +818,7 @@
}*/
- public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){
+ public List<Integer> processWarnFrontWithEvent(Constants.WarningConfig warningConfig, List<WarningEvent> returnEventList){
List<WarningRuleDetail> warningRuleDetailList = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
.selectAll(WarningRuleDetail.class)
@@ -832,7 +832,7 @@
return new ArrayList<>();
}
//鎵�鏈夋姤璀﹁鍒欓厤缃俊鎭�
- List<Integer> ruleIdList = warningRuleDetailList.stream().map(i->i.getRuleId()).collect(Collectors.toList());;
+ List<Integer> ruleIdList = warningRuleDetailList.stream().map(i->i.getRuleId()).collect(Collectors.toList());
Set<Integer> ruleIdSet = new HashSet<>(ruleIdList);
if(CollectionUtils.isNotEmpty(ruleIdSet)){
List<Integer> resultList = new ArrayList<>();
@@ -868,6 +868,9 @@
);
if(this.processWarnFlag(wList,warningEventList)){
resultList.add(ruleId);
+ if(returnEventList != null){
+ returnEventList.addAll(warningEventList);
+ }
};
}else{
List<WarningRuleDetail> wList = warningRuleDetails.stream().filter(i->i.getCode().equals(warningConfig.getKey()+"")).collect(Collectors.toList());
@@ -885,6 +888,9 @@
);
if(this.processWarnFlag(wList,warningEventList)){
resultList.add(ruleId);
+ if(returnEventList != null){
+ returnEventList.addAll(warningEventList);
+ }
}
}
}
@@ -892,10 +898,14 @@
return resultList;
}
return new ArrayList<>();
+ }
+
+ public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){
+
+ return this.processWarnFrontWithEvent(warningConfig,null);
}
-
/**
--
Gitblit v1.9.3