From 65233c47228316d8abebb7433698dbafc43ff655 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 23 Oct 2025 18:14:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=89=A7=E8=A1=8C=E7=9B=AE=E6=A0=87=E4=B8=AD?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E9=AB=98=E7=BA=A7=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=AD=E7=BB=84=E5=90=88=E6=9D=A1=E4=BB=B6=E4=B8=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=B1=BB=E5=9E=8B=E4=B8=8D=E8=83=BD=E9=80=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1537798153142272]组合工具执行目标中过滤器高级模式中组合条件中模型类型不能选了 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1537798153142272
---
 .../ResourceConditionConfigVo.java            | 80 ++++++++++---------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java
index 7b00420..8137989 100644
--- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java
+++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java
@@ -41,7 +41,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
                 if (CollectionUtils.isNotEmpty(conditionGroup.getConditionList())) {
                     for (ConditionVo condition : conditionGroup.getConditionList()) {
                         String name = condition.getName();
-                        if (Objects.equals(name, "appSystemIdList")) {
+                        if (Objects.equals(name, "typeIdList")) {
+                            filterItemFieldNameSet.add("type_id");
+                        } else if (Objects.equals(name, "appSystemIdList")) {
                             filterItemFieldNameSet.add("app_system_id");
                             filterItemFieldNameSet.add("app_module_id");
                         } else if (Objects.equals(name, "appModuleIdList")) {
@@ -148,13 +150,24 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
         public ExpressionVo buildExpression(SqlVo sqlVo, Map<String, Column> fieldName2ColumnMap) {
             String columnName = null;
             ValueVo valueVo = null;
-            if (Objects.equals(name, "appSystemIdList")) {
+            if (Objects.equals(name, "typeIdList")) {
+                columnName = fieldName2ColumnMap.get("type_id").toString();
+                List<Long> typeIdList = new ArrayList<>();
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
+                        if (id != null) {
+                            typeIdList.add(id);
+                        }
+                    }
+                }
+                valueVo = $sql.value(typeIdList);
+            } else if (Objects.equals(name, "appSystemIdList")) {
                 columnName = fieldName2ColumnMap.get("app_system_id").toString();
                 List<Long> appSystemIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             appSystemIdList.add(id);
                         }
@@ -164,10 +177,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             } else if (Objects.equals(name, "appModuleIdList")) {
                 columnName = fieldName2ColumnMap.get("app_module_id").toString();
                 List<Long> appModuleIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             appModuleIdList.add(id);
                         }
@@ -177,10 +189,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             } else if (Objects.equals(name, "envIdList")) {
                 columnName = fieldName2ColumnMap.get("env_id").toString();
                 List<Long> envIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             envIdList.add(id);
                         }
@@ -190,10 +201,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             } else if (Objects.equals(name, "inspectStatusList")) {
                 columnName = fieldName2ColumnMap.get("inspect_status").toString();
                 List<String> inspectStatusList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        String inspectStatus = jsonArray.getString(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        String inspectStatus = valueArray.getString(i);
                         if (inspectStatus != null) {
                             inspectStatusList.add(inspectStatus);
                         }
@@ -202,8 +212,7 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
                 valueVo = $sql.value(inspectStatusList);
             } else if (Objects.equals(name, "ip")) {
                 columnName = fieldName2ColumnMap.get("ip").toString();
-                if (valueList instanceof JSONArray) {
-                    JSONArray valueArray = (JSONArray) valueList;
+                if (valueList instanceof JSONArray valueArray) {
                     if (CollectionUtils.isNotEmpty(valueArray)) {
                         valueVo = $sql.value(valueArray.getString(0));
                     }
@@ -212,8 +221,7 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
                 }
             } else if (Objects.equals(name, "name")) {
                 columnName = fieldName2ColumnMap.get("name").toString();
-                if (valueList instanceof JSONArray) {
-                    JSONArray valueArray = (JSONArray) valueList;
+                if (valueList instanceof JSONArray valueArray) {
                     if (CollectionUtils.isNotEmpty(valueArray)) {
                         valueVo = $sql.value(valueArray.getString(0));
                     }
@@ -223,10 +231,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             } else if (Objects.equals(name, "vendorIdList")) {
                 columnName = fieldName2ColumnMap.get("vendor_id").toString();
                 List<Long> vendorIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             vendorIdList.add(id);
                         }
@@ -237,10 +244,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
                 sqlVo.withAddJoin($sql.join("left join", "cmdb_resourcecenter_resource_tag", "d").withOn($sql.exp("d.resource_id", "=", fieldName2ColumnMap.get("id").toString())));
                 columnName = "d.tag_id";
                 List<Long> tagIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             tagIdList.add(id);
                         }
@@ -252,10 +258,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
                 sqlVo.withAddJoin($sql.join("left join", "cmdb_resourcecenter_account", "c").withOn($sql.exp("c.id", "=", "b.account_id")));
                 columnName = "c.protocol_id";
                 List<Long> protocolIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             protocolIdList.add(id);
                         }
@@ -265,10 +270,9 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             } else if (Objects.equals(name, "stateIdList")) {
                 columnName = fieldName2ColumnMap.get("state_id").toString();
                 List<Long> stateIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray) {
-                    JSONArray jsonArray = (JSONArray) valueList;
-                    for (int i = 0; i < jsonArray.size(); i++) {
-                        Long id = jsonArray.getLong(i);
+                if (valueList instanceof JSONArray valueArray) {
+                    for (int i = 0; i < valueArray.size(); i++) {
+                        Long id = valueArray.getLong(i);
                         if (id != null) {
                             stateIdList.add(id);
                         }
-- 
Gitee


From b398f1ab684fa35486759d9a8e454620b1dc0bb8 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 23 Oct 2025 18:26:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=89=A7=E8=A1=8C=E7=9B=AE=E6=A0=87=E4=B8=AD?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E9=AB=98=E7=BA=A7=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=AD=E7=BB=84=E5=90=88=E6=9D=A1=E4=BB=B6=E4=B8=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=B1=BB=E5=9E=8B=E4=B8=8D=E8=83=BD=E9=80=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1537798153142272]组合工具执行目标中过滤器高级模式中组合条件中模型类型不能选了 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1537798153142272
---
 .../ResourceConditionConfigVo.java            | 125 +++++-------------
 1 file changed, 35 insertions(+), 90 deletions(-)

diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java
index 8137989..6a31086 100644
--- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java
+++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java
@@ -152,64 +152,19 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             ValueVo valueVo = null;
             if (Objects.equals(name, "typeIdList")) {
                 columnName = fieldName2ColumnMap.get("type_id").toString();
-                List<Long> typeIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            typeIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(typeIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "appSystemIdList")) {
                 columnName = fieldName2ColumnMap.get("app_system_id").toString();
-                List<Long> appSystemIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            appSystemIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(appSystemIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "appModuleIdList")) {
                 columnName = fieldName2ColumnMap.get("app_module_id").toString();
-                List<Long> appModuleIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            appModuleIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(appModuleIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "envIdList")) {
                 columnName = fieldName2ColumnMap.get("env_id").toString();
-                List<Long> envIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            envIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(envIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "inspectStatusList")) {
                 columnName = fieldName2ColumnMap.get("inspect_status").toString();
-                List<String> inspectStatusList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        String inspectStatus = valueArray.getString(i);
-                        if (inspectStatus != null) {
-                            inspectStatusList.add(inspectStatus);
-                        }
-                    }
-                }
-                valueVo = $sql.value(inspectStatusList);
+                valueVo = $sql.value(convertStringList(valueList));
             } else if (Objects.equals(name, "ip")) {
                 columnName = fieldName2ColumnMap.get("ip").toString();
                 if (valueList instanceof JSONArray valueArray) {
@@ -230,55 +185,19 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
                 }
             } else if (Objects.equals(name, "vendorIdList")) {
                 columnName = fieldName2ColumnMap.get("vendor_id").toString();
-                List<Long> vendorIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            vendorIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(vendorIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "tagIdList")) {
                 sqlVo.withAddJoin($sql.join("left join", "cmdb_resourcecenter_resource_tag", "d").withOn($sql.exp("d.resource_id", "=", fieldName2ColumnMap.get("id").toString())));
                 columnName = "d.tag_id";
-                List<Long> tagIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            tagIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(tagIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "protocolIdList")) {
                 sqlVo.withAddJoin($sql.join("left join", "cmdb_resourcecenter_resource_account", "b").withOn($sql.exp("b.resource_id", "=", fieldName2ColumnMap.get("id").toString())));
                 sqlVo.withAddJoin($sql.join("left join", "cmdb_resourcecenter_account", "c").withOn($sql.exp("c.id", "=", "b.account_id")));
                 columnName = "c.protocol_id";
-                List<Long> protocolIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            protocolIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(protocolIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             } else if (Objects.equals(name, "stateIdList")) {
                 columnName = fieldName2ColumnMap.get("state_id").toString();
-                List<Long> stateIdList = new ArrayList<>();
-                if (valueList instanceof JSONArray valueArray) {
-                    for (int i = 0; i < valueArray.size(); i++) {
-                        Long id = valueArray.getLong(i);
-                        if (id != null) {
-                            stateIdList.add(id);
-                        }
-                    }
-                }
-                valueVo = $sql.value(stateIdList);
+                valueVo = $sql.value(convertLongList(valueList));
             }
             if (StringUtils.isNotBlank(columnName)) {
                 if (Objects.equals(expression, "include")) {
@@ -315,5 +234,31 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo<ResourceCon
             }
             return null;
         }
+
+        private List<Long> convertLongList(Object valueList) {
+            List<Long> list = new ArrayList<>();
+            if (valueList instanceof JSONArray valueArray) {
+                for (int i = 0; i < valueArray.size(); i++) {
+                    Long id = valueArray.getLong(i);
+                    if (id != null) {
+                        list.add(id);
+                    }
+                }
+            }
+            return list;
+        }
+
+        private List<String> convertStringList(Object valueList) {
+            List<String> list = new ArrayList<>();
+            if (valueList instanceof JSONArray valueArray) {
+                for (int i = 0; i < valueArray.size(); i++) {
+                    String id = valueArray.getString(i);
+                    if (id != null) {
+                        list.add(id);
+                    }
+                }
+            }
+            return list;
+        }
     }
 }
-- 
Gitee