From 154b38709aa8151222382240392f120ae5542a69 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 18 二月 2025 15:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java | 2 ++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/common/utils/DllUtils.java | 17 +++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java
index 58e5c42..04f69cf 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java
@@ -14,6 +14,7 @@
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigPageReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigRespVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigSaveReqVO;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -64,6 +65,7 @@
public List<AlarmConfigRespDTO> list(Map<String, Object> params) {
QueryWrapper<MmPredictAlarmConfigEntity> wrapper = new QueryWrapper<>();
wrapper.eq("is_enable", 1);
+ wrapper.eq(StringUtils.isNotBlank(params.get("alarmObj").toString()),"alarm_obj", params.get("alarmObj"));
List<MmPredictAlarmConfigEntity> list = baseDao.selectList(wrapper);
return ConvertUtils.sourceToTarget(list, AlarmConfigRespDTO.class);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/common/utils/DllUtils.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/common/utils/DllUtils.java
index 74df6bb..8151cc7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/common/utils/DllUtils.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/common/utils/DllUtils.java
@@ -12,10 +12,7 @@
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Vector;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -156,17 +153,21 @@
}
}
public static synchronized void removeClassCache(String projectId) {
- for (String key : classCache.keySet()) {
+ Iterator<String> iterator = classCache.keySet().iterator();
+ while (iterator.hasNext()) {
+ String key = iterator.next();
if (key.startsWith(projectId)) {
- classCache.remove(key);
+ iterator.remove();
}
}
}
public static synchronized void removeClassMethodCache(String projectId) {
- for (String key : classMethodCache.keySet()) {
+ Iterator<String> iterator = classMethodCache.keySet().iterator();
+ while (iterator.hasNext()) {
+ String key = iterator.next();
if (key.startsWith(projectId)) {
- classMethodCache.remove(key);
+ iterator.remove();
}
}
}
--
Gitblit v1.9.3