From d50cf53770fe473525bb19d047ccb3b2ee3e5d20 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 4 Sep 2025 15:51:22 +0800 Subject: [PATCH] =?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 --- .../cmdb/crossover/IResourceBuildSqlCrossoverService.java | 5 +++-- .../crossover/IResourceCenterResourceCrossoverService.java | 7 +++++++ .../neatlogic/framework/cmdb/enums/CmdbTenantConfig.java | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java index 1276474..2bb66ba 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceBuildSqlCrossoverService.java @@ -76,8 +76,9 @@ public interface IResourceBuildSqlCrossoverService extends ICrossoverService { String buildGetAppEnvCountMapByAppSystemIdGroupByAppModuleIdSql(Long appSystemId); -// String buildGetResourceCountByDynamicConditionSql(); -// String buildGetResourceIdListByDynamicConditionSql(); + String buildGetResourceCountByDynamicConditionSql(ResourceSearchVo searchVo); + + String buildGetResourceIdListByDynamicConditionSql(ResourceSearchVo searchVo); String buildGetAppResourceCountSql(ResourceSearchVo searchVo); diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCenterResourceCrossoverService.java index 6588112..8fdcbf9 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.AccountVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; +import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; import neatlogic.framework.cmdb.dto.tag.TagVo; import neatlogic.framework.crossover.ICrossoverService; @@ -67,5 +68,11 @@ public interface IResourceCenterResourceCrossoverService extends ICrossoverServi */ Map> getResourceTagByResourceIdList(List idList); + int getResourceCount(ResourceSearchVo searchVo); + + List getResourceIdList(ResourceSearchVo searchVo); + + List getResourceListByIdList(List idList); + } diff --git a/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java b/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java index 4614770..fad6d2b 100644 --- a/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java +++ b/src/main/java/neatlogic/framework/cmdb/enums/CmdbTenantConfig.java @@ -21,6 +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"), ; String key; -- Gitee