From 7291e3d36ffdae149d33276042b3671e5852b7d3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 25 Sep 2025 12:24:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86=E6=B6=89?= =?UTF-8?q?=E5=8F=8Ascence=5Fipobject=5Fdetail=E8=A7=86=E5=9B=BE=E7=9A=84S?= =?UTF-8?q?QL=E8=AF=AD=E5=8F=A5=E6=94=B9=E6=88=90=E5=8A=A8=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1469827334504448]将涉及scence_ipobject_detail视图的SQL语句改成动态sql http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1469827334504448 --- .../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 2b50563..fad6d2b 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", "mybatis", "资产清单SQL模式，可选值为jsqlparser和mybatis，默认值是jsqlparser"), + RESOURCECENTER_SQL_MODE("resourcecenter.sql.mode", "jsqlparser", "资产清单SQL模式，可选值为jsqlparser和mybatis，默认值是jsqlparser"), ; String key; -- Gitee From 4fba956f49179d76812d76507a4fd885247a229f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 25 Sep 2025 17:06:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86=E6=B6=89?= =?UTF-8?q?=E5=8F=8Ascence=5Fipobject=5Fdetail=E8=A7=86=E5=9B=BE=E7=9A=84S?= =?UTF-8?q?QL=E8=AF=AD=E5=8F=A5=E6=94=B9=E6=88=90=E5=8A=A8=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1469827334504448]将涉及scence_ipobject_detail视图的SQL语句改成动态sql http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1469827334504448 --- .../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 fad6d2b..2b50563 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 598abe247e1d15fed4dfd30717ff91d582ceb3e3 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 25 Sep 2025 19:14:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B0=86=E6=B6=89?= =?UTF-8?q?=E5=8F=8Ascence=5Fvendor=E8=A7=86=E5=9B=BE=E7=9A=84SQL=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E6=94=B9=E6=88=90=E5=8A=A8=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1518156957319168]将涉及scence_vendor视图的SQL语句改成动态sql http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1518156957319168 --- .../cmdb/crossover/IResourceBuildSqlCrossoverService.java | 7 +++++++ .../crossover/IResourceCenterResourceCrossoverService.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java index 2bb66ba..a67a791 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java @@ -20,6 +20,7 @@ package neatlogic.framework.cmdb.crossover; import neatlogic.framework.cmdb.dto.resourcecenter.AccountComponentVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; +import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.crossover.ICrossoverService; import java.util.List; @@ -94,6 +95,12 @@ public interface IResourceBuildSqlCrossoverService extends ICrossoverService { String buildGetAppSystemIdListByIdSql(String viewName, Long id); + String buildSearchVendorCountSql(BasePageVo searchVo); + + String buildSearchVendorIdListSql(BasePageVo searchVo); + + String buildSearchVendorListByIdListSql(List idList); + // InspectMapper String buildGetInspectResourceListByIdListSql(List idList, List selectFieldNameList); diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java index 45ddca3..85b5c89 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java @@ -18,6 +18,7 @@ package neatlogic.framework.cmdb.crossover; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.cmdb.dto.resourcecenter.*; import neatlogic.framework.cmdb.dto.tag.TagVo; +import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.crossover.ICrossoverService; import java.util.List; @@ -124,5 +125,11 @@ public interface IResourceCenterResourceCrossoverService extends ICrossoverServi List getAppSystemIdListById(String viewName, Long id); + int searchVendorCount(BasePageVo searchVo); + + List searchVendorIdList(BasePageVo searchVo); + + List searchVendorListByIdList(List idList); + } -- Gitee