From 0c2f52494d78c67b7c2941d1eeb9df8d54e4b592 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Wed, 3 Sep 2025 19:49:20 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/resourcecenter/ResourceSearchVo.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java index 29b0f987..1f951924 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java @@ -115,6 +115,10 @@ public class ResourceSearchVo extends ConditionConfigVo { private List timeRange; @EntityField(name = "高级搜索条件", type = ApiParamType.JSONOBJECT) ResourceConditionConfigVo conditionConfig; + @EntityField(name = "前置高级搜索条件", type = ApiParamType.JSONOBJECT) + ResourceSearchVo preCondition; + @EntityField(name = "前置高级搜索条件生产的动态where sql", type = ApiParamType.STRING) + String preConditionWhereSql; public ResourceSearchVo() { } @@ -482,4 +486,20 @@ public class ResourceSearchVo extends ConditionConfigVo { public void setConditionConfig(ResourceConditionConfigVo conditionConfig) { this.conditionConfig = conditionConfig; } + + public ResourceSearchVo getPreCondition() { + return preCondition; + } + + public void setPreCondition(ResourceSearchVo preCondition) { + this.preCondition = preCondition; + } + + public String getPreConditionWhereSql() { + return preConditionWhereSql; + } + + public void setPreConditionWhereSql(String preConditionWhereSql) { + this.preConditionWhereSql = preConditionWhereSql; + } } -- Gitee From 2dabe78d45231b0a63303a2c24b71440a108daa3 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Thu, 4 Sep 2025 12:12:00 +0800 Subject: [PATCH 02/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onConfigVo.java => ResourceCustomConditionConfigVo.java} | 2 +- .../framework/cmdb/dto/resourcecenter/ResourceSearchVo.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/{ResourceConditionConfigVo.java => ResourceCustomConditionConfigVo.java} (98%) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceCustomConditionConfigVo.java similarity index 98% rename from src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java rename to src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceCustomConditionConfigVo.java index 058d2c9f..e69f1f70 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceCustomConditionConfigVo.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.*; -public class ResourceConditionConfigVo extends ConditionConfigBaseVo> { +public class ResourceCustomConditionConfigVo extends ConditionConfigBaseVo> { public List getFilterItemFieldNameList() { Set filterItemFieldNameSet = new HashSet<>(); diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java index 1f951924..e9931bb0 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java @@ -114,7 +114,7 @@ public class ResourceSearchVo extends ConditionConfigVo { @EntityField(name = "时间范围", type = ApiParamType.JSONARRAY) private List timeRange; @EntityField(name = "高级搜索条件", type = ApiParamType.JSONOBJECT) - ResourceConditionConfigVo conditionConfig; + ResourceCustomConditionConfigVo conditionConfig; @EntityField(name = "前置高级搜索条件", type = ApiParamType.JSONOBJECT) ResourceSearchVo preCondition; @EntityField(name = "前置高级搜索条件生产的动态where sql", type = ApiParamType.STRING) @@ -479,11 +479,11 @@ public class ResourceSearchVo extends ConditionConfigVo { this.timeRange = timeRange; } - public ResourceConditionConfigVo getConditionConfig() { + public ResourceCustomConditionConfigVo getConditionConfig() { return conditionConfig; } - public void setConditionConfig(ResourceConditionConfigVo conditionConfig) { + public void setConditionConfig(ResourceCustomConditionConfigVo conditionConfig) { this.conditionConfig = conditionConfig; } -- Gitee From 0792d02524b91556106ca30ca2f886d6f06e1b8c Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Thu, 4 Sep 2025 12:15:32 +0800 Subject: [PATCH 03/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onditionConfigVo.java => ResourceConditionConfigVo.java} | 2 +- .../framework/cmdb/dto/resourcecenter/ResourceSearchVo.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/{ResourceCustomConditionConfigVo.java => ResourceConditionConfigVo.java} (98%) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceCustomConditionConfigVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java similarity index 98% rename from src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceCustomConditionConfigVo.java rename to src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java index e69f1f70..058d2c9f 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceCustomConditionConfigVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.*; -public class ResourceCustomConditionConfigVo extends ConditionConfigBaseVo> { +public class ResourceConditionConfigVo extends ConditionConfigBaseVo> { public List getFilterItemFieldNameList() { Set filterItemFieldNameSet = new HashSet<>(); diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java index e9931bb0..1f951924 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java @@ -114,7 +114,7 @@ public class ResourceSearchVo extends ConditionConfigVo { @EntityField(name = "时间范围", type = ApiParamType.JSONARRAY) private List timeRange; @EntityField(name = "高级搜索条件", type = ApiParamType.JSONOBJECT) - ResourceCustomConditionConfigVo conditionConfig; + ResourceConditionConfigVo conditionConfig; @EntityField(name = "前置高级搜索条件", type = ApiParamType.JSONOBJECT) ResourceSearchVo preCondition; @EntityField(name = "前置高级搜索条件生产的动态where sql", type = ApiParamType.STRING) @@ -479,11 +479,11 @@ public class ResourceSearchVo extends ConditionConfigVo { this.timeRange = timeRange; } - public ResourceCustomConditionConfigVo getConditionConfig() { + public ResourceConditionConfigVo getConditionConfig() { return conditionConfig; } - public void setConditionConfig(ResourceCustomConditionConfigVo conditionConfig) { + public void setConditionConfig(ResourceConditionConfigVo conditionConfig) { this.conditionConfig = conditionConfig; } -- Gitee From 959c65959820ce72e7e84d79ca6c65ef15d18032 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Thu, 4 Sep 2025 16:05:35 +0800 Subject: [PATCH 04/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmdb/dto/resourcecenter/ResourceSearchVo.java | 10 +++++----- .../table/CmdbResourcecenterAccountTable.java | 2 +- .../table/CmdbResourcecenterResourceAccountTable.java | 2 +- .../table/CmdbResourcecenterResourceTagTable.java | 2 +- .../table/ScenceIpobjectDetailTable.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java index 1f951924..296d3622 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java @@ -118,7 +118,7 @@ public class ResourceSearchVo extends ConditionConfigVo { @EntityField(name = "前置高级搜索条件", type = ApiParamType.JSONOBJECT) ResourceSearchVo preCondition; @EntityField(name = "前置高级搜索条件生产的动态where sql", type = ApiParamType.STRING) - String preConditionWhereSql; + String conditionWhereSql; public ResourceSearchVo() { } @@ -495,11 +495,11 @@ public class ResourceSearchVo extends ConditionConfigVo { this.preCondition = preCondition; } - public String getPreConditionWhereSql() { - return preConditionWhereSql; + public String getConditionWhereSql() { + return conditionWhereSql; } - public void setPreConditionWhereSql(String preConditionWhereSql) { - this.preConditionWhereSql = preConditionWhereSql; + public void setConditionWhereSql(String conditionWhereSql) { + this.conditionWhereSql = conditionWhereSql; } } diff --git a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterAccountTable.java b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterAccountTable.java index f46656b2..f44b64e3 100644 --- a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterAccountTable.java +++ b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterAccountTable.java @@ -28,7 +28,7 @@ public class CmdbResourcecenterAccountTable implements ISqlTable { @Override public String getShortName() { - return "cra"; + return "c"; } public enum FieldEnum { diff --git a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceAccountTable.java b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceAccountTable.java index fa26f731..6ce371b2 100644 --- a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceAccountTable.java +++ b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceAccountTable.java @@ -28,7 +28,7 @@ public class CmdbResourcecenterResourceAccountTable implements ISqlTable { @Override public String getShortName() { - return "crra"; + return "b"; } public enum FieldEnum { diff --git a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceTagTable.java b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceTagTable.java index beffe76d..3fd59428 100644 --- a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceTagTable.java +++ b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/CmdbResourcecenterResourceTagTable.java @@ -13,7 +13,7 @@ public class CmdbResourcecenterResourceTagTable implements ISqlTable { @Override public String getShortName() { - return "crrt"; + return "d"; } public enum FieldEnum { diff --git a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/ScenceIpobjectDetailTable.java b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/ScenceIpobjectDetailTable.java index 62462641..2c4411f7 100644 --- a/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/ScenceIpobjectDetailTable.java +++ b/src/main/java/neatlogic/framework/cmdb/resourcecenter/table/ScenceIpobjectDetailTable.java @@ -13,7 +13,7 @@ public class ScenceIpobjectDetailTable implements ISqlTable { @Override public String getShortName() { - return "sid"; + return "a"; } public enum FieldEnum { -- Gitee From 087d323bd1d09dba8dd3f53142b56f32600519da Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Thu, 4 Sep 2025 16:53:14 +0800 Subject: [PATCH 05/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D=20#[1500817822023680]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E7=BB=84=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D?= =?UTF-8?q?=E9=83=BD=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E2=80=9D=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/15?= =?UTF-8?q?00817822023680?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/cmdb/crossover/IResourceCrossoverMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java index 6209d803..5a448850 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java @@ -39,11 +39,11 @@ public interface IResourceCrossoverMapper extends ICrossoverService { @Deprecated int getResourceCount(ResourceSearchVo searchVo); - int getResourceCountByDynamicCondition(@Param("searchVo") ResourceSearchVo searchVo, @Param("conditionSql") String conditionSql); + int getResourceCountByDynamicCondition(ResourceSearchVo searchVo); @Deprecated List getResourceIdList(ResourceSearchVo searchVo); - List getResourceIdListByDynamicCondition(@Param("searchVo") ResourceSearchVo searchVo, @Param("conditionSql") String conditionSql); + List getResourceIdListByDynamicCondition(ResourceSearchVo searchVo); @Deprecated List getResourceListByIdList(List idList); -- Gitee From e6bd8d72503b191f70fd930b27e427e1b6b99924 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 4 Sep 2025 19:29:45 +0800 Subject: [PATCH 06/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1500817822023680]自动化组合工具“全局“、“阶段组”和“阶段”都支持选择执行目标支持“前置过滤器” http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1500817822023680 --- .../config/ResourceQueryCriteriaVo.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java index b2d216c3..6f8f0579 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java @@ -18,10 +18,13 @@ package neatlogic.framework.cmdb.dto.resourcecenter.config; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.cmdb.dto.resourcecenter.ResourceConditionConfigVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.restful.annotation.EntityField; +import org.apache.commons.collections4.CollectionUtils; import java.util.List; @@ -76,6 +79,9 @@ public class ResourceQueryCriteriaVo { private Integer isNameFieldSort; @EntityField(name = "作业ID", type = ApiParamType.LONG) private Long jobId; + @EntityField(name = "高级搜索条件", type = ApiParamType.JSONOBJECT) + ResourceConditionConfigVo conditionConfig; + public ResourceQueryCriteriaVo() { } @@ -105,6 +111,12 @@ public class ResourceQueryCriteriaVo { this.nameFieldAttrId = searchVo.getNameFieldAttrId(); this.isIpFieldSort = searchVo.getIsIpFieldSort(); this.isNameFieldSort = searchVo.getIsNameFieldSort(); + if (CollectionUtils.isNotEmpty(searchVo.getConditionGroupList())) { + JSONObject conditionConfigObj = new JSONObject(); + conditionConfigObj.put("conditionGroupList", searchVo.getConditionGroupList()); + conditionConfigObj.put("conditionGroupRelList", searchVo.getConditionGroupRelList()); + this.conditionConfig = conditionConfigObj.toJavaObject(ResourceConditionConfigVo.class); + } } public String getKeyword() { @@ -314,4 +326,12 @@ public class ResourceQueryCriteriaVo { public void setJobId(Long jobId) { this.jobId = jobId; } + + public ResourceConditionConfigVo getConditionConfig() { + return conditionConfig; + } + + public void setConditionConfig(ResourceConditionConfigVo conditionConfig) { + this.conditionConfig = conditionConfig; + } } -- Gitee From 63c5c253665d4046178e07de1aa2e8c4b06d8b6c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 4 Sep 2025 19:31:31 +0800 Subject: [PATCH 07/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1500817822023680]自动化组合工具“全局“、“阶段组”和“阶段”都支持选择执行目标支持“前置过滤器” http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1500817822023680 --- .../java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java b/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java index fad6d2b9..2b50563f 100644 --- a/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java +++ b/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java @@ -21,7 +21,7 @@ import neatlogic.framework.util.$; public enum CmdbTenantConfig implements ITenantConfig { IS_RESOURCECENTER_AUTH("is.resourcecenter.auth", "0", "nfce.cmdbtenantconfig.isresourcecenterauth"), RESOURCECENTER_DATA_COMPARISON_MODE_ENABLE("resourcecenter.data.comparison.mode.enable", "0", "是否开启资产清单新SQL和旧SQL查询结果对比模式，结果不一致会打印error日志"), - RESOURCECENTER_SQL_MODE("resourcecenter.sql.mode", "jsqlparser", "资产清单SQL模式，可选值为jsqlparser和mybatis，默认值是jsqlparser"), + RESOURCECENTER_SQL_MODE("resourcecenter.sql.mode", "mybatis", "资产清单SQL模式，可选值为jsqlparser和mybatis，默认值是jsqlparser"), ; String key; -- Gitee From 6e8ccb0b13aa5f09e717872b48426420da61c9e3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 5 Sep 2025 18:54:37 +0800 Subject: [PATCH 08/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1500817822023680]自动化组合工具“全局“、“阶段组”和“阶段”都支持选择执行目标支持“前置过滤器” http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1500817822023680 --- .../config/ResourceQueryCriteriaVo.java | 75 +++++++++++++++---- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java index 6f8f0579..1280785a 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/ResourceQueryCriteriaVo.java @@ -21,11 +21,13 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceConditionConfigVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; +import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.restful.annotation.EntityField; import org.apache.commons.collections4.CollectionUtils; +import java.util.ArrayList; import java.util.List; public class ResourceQueryCriteriaVo { @@ -79,6 +81,8 @@ public class ResourceQueryCriteriaVo { private Integer isNameFieldSort; @EntityField(name = "作业ID", type = ApiParamType.LONG) private Long jobId; + @EntityField(name = "输入节点列表", type = ApiParamType.JSONARRAY) + private List inputNodeList; @EntityField(name = "高级搜索条件", type = ApiParamType.JSONOBJECT) ResourceConditionConfigVo conditionConfig; @@ -87,30 +91,63 @@ public class ResourceQueryCriteriaVo { public ResourceQueryCriteriaVo(ResourceSearchVo searchVo) { this.keyword = searchVo.getKeyword(); - this.keywordList = searchVo.getKeywordList(); - this.protocolIdList = searchVo.getProtocolIdList(); - this.tagIdList = searchVo.getTagIdList(); - this.inspectJobPhaseNodeStatusList = searchVo.getInspectJobPhaseNodeStatusList(); + if (CollectionUtils.isNotEmpty(searchVo.getKeywordList())) { + this.keywordList = new ArrayList<>(searchVo.getKeywordList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getProtocolIdList())) { + this.protocolIdList = new ArrayList<>(searchVo.getProtocolIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getTagIdList())) { + this.tagIdList = new ArrayList<>(searchVo.getTagIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getInspectJobPhaseNodeStatusList())) { + this.inspectJobPhaseNodeStatusList = new ArrayList<>(searchVo.getInspectJobPhaseNodeStatusList()); + } this.isHasAuth = searchVo.getIsHasAuth(); this.cmdbGroupType = searchVo.getCmdbGroupType(); - this.batchSearchList = searchVo.getBatchSearchList(); + if (CollectionUtils.isNotEmpty(searchVo.getBatchSearchList())) { + this.batchSearchList = new ArrayList<>(searchVo.getBatchSearchList()); + } this.searchField = searchVo.getSearchField(); - this.typeIdList = searchVo.getTypeIdList(); - this.authedTypeIdList = searchVo.getAuthedTypeIdList(); - this.stateIdList = searchVo.getStateIdList(); - this.vendorIdList = searchVo.getVendorIdList(); - this.envIdList = searchVo.getEnvIdList(); + if (CollectionUtils.isNotEmpty(searchVo.getTypeIdList())) { + this.typeIdList = new ArrayList<>(searchVo.getTypeIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getAuthedTypeIdList())) { + this.authedTypeIdList = new ArrayList<>(searchVo.getAuthedTypeIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getStateIdList())) { + this.stateIdList = new ArrayList<>(searchVo.getStateIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getVendorIdList())) { + this.vendorIdList = new ArrayList<>(searchVo.getVendorIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getEnvIdList())) { + this.envIdList = new ArrayList<>(searchVo.getEnvIdList()); + } this.isExistNoEnv = searchVo.getExistNoEnv(); - this.appSystemIdList = searchVo.getAppSystemIdList(); - this.appModuleIdList = searchVo.getAppModuleIdList(); - this.defaultValue = searchVo.getDefaultValue(); - this.idList = searchVo.getIdList(); - this.inspectStatusList = searchVo.getInspectStatusList(); + if (CollectionUtils.isNotEmpty(searchVo.getAppSystemIdList())) { + this.appSystemIdList = new ArrayList<>(searchVo.getAppSystemIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getAppModuleIdList())) { + this.appModuleIdList = new ArrayList<>(searchVo.getAppModuleIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getDefaultValue())) { + this.defaultValue = new JSONArray(new ArrayList<>(searchVo.getDefaultValue())); + } + if (CollectionUtils.isNotEmpty(searchVo.getIdList())) { + this.idList = new ArrayList<>(searchVo.getIdList()); + } + if (CollectionUtils.isNotEmpty(searchVo.getInspectStatusList())) { + this.inspectStatusList = new ArrayList<>(searchVo.getInspectStatusList()); + } this.authenticationInfo = searchVo.getAuthenticationInfo(); this.ipFieldAttrId = searchVo.getIpFieldAttrId(); this.nameFieldAttrId = searchVo.getNameFieldAttrId(); this.isIpFieldSort = searchVo.getIsIpFieldSort(); this.isNameFieldSort = searchVo.getIsNameFieldSort(); + if (CollectionUtils.isNotEmpty(searchVo.getInputNodeList())) { + this.inputNodeList = new ArrayList<>(searchVo.getInputNodeList()); + } if (CollectionUtils.isNotEmpty(searchVo.getConditionGroupList())) { JSONObject conditionConfigObj = new JSONObject(); conditionConfigObj.put("conditionGroupList", searchVo.getConditionGroupList()); @@ -327,6 +364,14 @@ public class ResourceQueryCriteriaVo { this.jobId = jobId; } + public List getInputNodeList() { + return inputNodeList; + } + + public void setInputNodeList(List inputNodeList) { + this.inputNodeList = inputNodeList; + } + public ResourceConditionConfigVo getConditionConfig() { return conditionConfig; } -- Gitee From c9a35273962a52475494ef9fa74aa494bc95c804 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 8 Sep 2025 11:37:48 +0800 Subject: [PATCH 09/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1500817822023680]自动化组合工具“全局“、“阶段组”和“阶段”都支持选择执行目标支持“前置过滤器” http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1500817822023680 --- .../ResourceConditionConfigVo.java | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 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 058d2c9f..7b00420b 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceConditionConfigVo.java @@ -202,10 +202,24 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo vendorIdList = new ArrayList<>(); @@ -275,6 +289,24 @@ public class ResourceConditionConfigVo extends ConditionConfigBaseVo Date: Mon, 8 Sep 2025 17:18:36 +0800 Subject: [PATCH 10/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1500817822023680]自动化组合工具“全局“、“阶段组”和“阶段”都支持选择执行目标支持“前置过滤器” http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1500817822023680 --- .../IResourceCenterResourceCrossoverService.java | 8 -------- .../cmdb/crossover/IResourceCrossoverMapper.java | 4 ---- 2 files changed, 12 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java index b79ee9bd..45ddca38 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java @@ -84,14 +84,6 @@ public interface IResourceCenterResourceCrossoverService extends ICrossoverServi List getAppResourceListByIdList(ResourceSearchVo searchVo); - Long getResourceIdByIpAndPortAndName(ResourceSearchVo searchVo); - - List getResourceIdListByIpAndPortAndName(ResourceSearchVo searchVo); - - List getResourceListByIpAndPortAndName(ResourceSearchVo searchVo); - - List getResourceListByIpAndPortAndNameWithFilter(ResourceSearchVo searchVo); - List getResourceByIdList(List idList); List getAuthResourceList(ResourceSearchVo searchVo); diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java index 5a448850..080cc6b0 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java @@ -39,11 +39,9 @@ public interface IResourceCrossoverMapper extends ICrossoverService { @Deprecated int getResourceCount(ResourceSearchVo searchVo); - int getResourceCountByDynamicCondition(ResourceSearchVo searchVo); @Deprecated List getResourceIdList(ResourceSearchVo searchVo); - List getResourceIdListByDynamicCondition(ResourceSearchVo searchVo); @Deprecated List getResourceListByIdList(List idList); @@ -74,8 +72,6 @@ public interface IResourceCrossoverMapper extends ICrossoverService { // 该SQL语句可以使用 getResourceListByIpAndPortAndName 代替 List getResourceListByResourceVoList(@Param("resourceList") List resourceList,@Param("searchVo") ResourceSearchVo searchVo); -// Set getResourceTypeIdListByAppSystemIdAndModuleIdAndEnvIdAndInspectStatusList(ResourceSearchVo searchVo); - List getResourceIdListByAppSystemIdAndModuleIdAndEnvId(ResourceVo resourceVo); /** * 根据类型和IP列表查询资源 -- Gitee From a87c4792ad9b724752c324cb161d354f36823c6a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 8 Sep 2025 17:23:10 +0800 Subject: [PATCH 11/11] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E2=80=9C=E3=80=81=E2=80=9C=E9=98=B6=E6=AE=B5=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=98=B6=E6=AE=B5=E2=80=9D=E9=83=BD?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E6=89=A7=E8=A1=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E6=94=AF=E6=8C=81=E2=80=9C=E5=89=8D=E7=BD=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1500817822023680]自动化组合工具“全局“、“阶段组”和“阶段”都支持选择执行目标支持“前置过滤器” http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1500817822023680 --- .../framework/cmdb/crossover/IResourceCrossoverMapper.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java index 080cc6b0..f193d831 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java @@ -47,8 +47,6 @@ public interface IResourceCrossoverMapper extends ICrossoverService { List getAppInstanceResourceListByIdListSimple(List idList); - Long getResourceIdByIpAndPortAndName(ResourceSearchVo searchVo); - List getResourceByIdList(List idList); List getAuthResourceList(ResourceSearchVo searchVo); @@ -69,9 +67,6 @@ public interface IResourceCrossoverMapper extends ICrossoverService { List getAppModuleListByIdListSimple(@Param("idList") List idList, @Param("needOrder") boolean needOrder); - // 该SQL语句可以使用 getResourceListByIpAndPortAndName 代替 - List getResourceListByResourceVoList(@Param("resourceList") List resourceList,@Param("searchVo") ResourceSearchVo searchVo); - List getResourceIdListByAppSystemIdAndModuleIdAndEnvId(ResourceVo resourceVo); /** * 根据类型和IP列表查询资源 @@ -111,6 +106,4 @@ public interface IResourceCrossoverMapper extends ICrossoverService { List searchAppSystemListByIdList(List idList); List getOsResourceListByResourceIdList(List resourceIdList); - - List getResourceListByIpAndPortAndNameWithFilter(ResourceSearchVo searchVo); } -- Gitee