From f101e9ec8f5b833db6cc231811db145c29353113 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 25 Apr 2025 16:11:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=B5=84=E4=BA=A7?=
=?UTF-8?q?=E6=B8=85=E5=8D=95-=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=9C=80?=
=?UTF-8?q?=E5=90=8E=E4=B8=80=E9=A1=B5=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1407219000639488]资产清单-跳转到最后一页，接口返回数据为空 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1407219000639488
---
.../mapper/resourcecenter/ResourceMapper.xml | 3 +-
.../DefaultResourceCenterDataSourceImpl.java | 30 +++++++++++++++++--
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index 81ca0686..fce7ea66 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -309,7 +309,8 @@ along with this program. If not, see .-->
COUNT(DISTINCT a.`id`)
- FROM `cmdb_cientity` a
+ FROM @{DATA_SCHEMA}.`${viewName}` b
+ JOIN `cmdb_cientity` a on a.`id` = b.`cientity_id`
LEFT JOIN `cmdb_cientity_expiredtime` `ex` ON `ex`.`cientity_id` = `a`.`id`
LEFT JOIN cmdb_cientity_group ccg ON ccg.cientity_id = a.id
diff --git a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java
index dbd64224..0d887265 100644
--- a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java
@@ -28,6 +28,7 @@ import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityConfigVo
import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityFieldMappingVo;
import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityVo;
import neatlogic.framework.cmdb.dto.resourcecenter.config.SceneEntityVo;
+import neatlogic.framework.cmdb.exception.ci.CiNotFoundException;
import neatlogic.framework.cmdb.exception.resourcecenter.AppModuleNotFoundException;
import neatlogic.framework.cmdb.exception.resourcecenter.AppSystemNotFoundException;
import neatlogic.framework.cmdb.resourcecenter.datasource.core.IResourceCenterDataSource;
@@ -652,7 +653,17 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS
if (Objects.equals(searchVo.getRowNum(), 0)) {
int rowNum = 0;
if (noFilterCondition(searchVo)) {
- rowNum = resourceMapper.getAllResourceCount(searchVo);
+ ResourceEntityVo resourceEntityVo = resourceEntityMapper.getResourceEntityByName("scence_ipobject_detail");
+ if (resourceEntityVo != null) {
+ ResourceEntityConfigVo config = resourceEntityVo.getConfig();
+ if (config != null) {
+ CiVo ciVo = ciMapper.getCiByName(config.getMainCi());
+ if (ciVo != null) {
+ searchVo.setViewName("cmdb_" + ciVo.getId());
+ rowNum = resourceMapper.getAllResourceCount(searchVo);
+ }
+ }
+ }
} else {
rowNum = resourceMapper.getResourceCount(searchVo);
}
@@ -670,10 +681,23 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS
keyword = keyword.toLowerCase();
}
List resultList = new ArrayList<>();
- List ciIdList = resourceEntityMapper.getAllResourceTypeCiIdList();
- if (CollectionUtils.isEmpty(ciIdList)) {
+// List ciIdList = resourceEntityMapper.getAllResourceTypeCiIdList();
+// if (CollectionUtils.isEmpty(ciIdList)) {
+// return resultList;
+// }
+ AssetListDisplayVo assetListDisplayVo = resourceEntityMapper.getAssetListDisplay();
+ if (assetListDisplayVo == null) {
return resultList;
}
+ String rootCiName = assetListDisplayVo.getRootCiName();
+ if (StringUtils.isBlank(rootCiName)) {
+ return resultList;
+ }
+ CiVo rootCiVo = ciMapper.getCiByName(rootCiName);
+ if (rootCiVo == null) {
+ throw new CiNotFoundException(rootCiName);
+ }
+ List ciIdList = Collections.singletonList(rootCiVo.getId());
List authCiVoList = new ArrayList<>();
ResourceSearchVo searchVo = new ResourceSearchVo();
searchVo.setTypeIdList(ciIdList);
--
Gitee
From 7a71a8fc640bbacfb9a440ad991d1faad902dee1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 25 Apr 2025 16:14:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=B5=84=E4=BA=A7?=
=?UTF-8?q?=E6=B8=85=E5=8D=95-=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=9C=80?=
=?UTF-8?q?=E5=90=8E=E4=B8=80=E9=A1=B5=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
关联 #[1407219000639488]资产清单-跳转到最后一页，接口返回数据为空 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1407219000639488
---
.../datasource/handler/DefaultResourceCenterDataSourceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java
index 0d887265..4a39a869 100644
--- a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java
@@ -659,7 +659,7 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS
if (config != null) {
CiVo ciVo = ciMapper.getCiByName(config.getMainCi());
if (ciVo != null) {
- searchVo.setViewName("cmdb_" + ciVo.getId());
+ searchVo.setViewName(ciVo.getCiTableName(false));
rowNum = resourceMapper.getAllResourceCount(searchVo);
}
}
--
Gitee