summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshizhendong <[email protected]>2024-03-22 10:31:33 +0800
committershizhendong <[email protected]>2024-03-22 10:31:33 +0800
commit05a810ce95b3f819217601e6905a8d08a300157e (patch)
treea75c19e6cce6049ddf7e3102b4a307f86eb3c881
parentba90d7e6b9132f1966afb92eaf2e47e3cc408086 (diff)
fix: NEZ-3429 快照查询资产详情时返回 Feature 信息rel-24.01.07
-rw-r--r--nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualDashboardServiceImpl.java2
-rw-r--r--nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualDashboardServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualDashboardServiceImpl.java
index 053d5f58..f5d16baa 100644
--- a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualDashboardServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualDashboardServiceImpl.java
@@ -952,7 +952,7 @@ public class VisualDashboardServiceImpl extends ServiceImpl<VisualDashboardDao,
VisualDashboard visualDashboard = this.getById(chart.getDashboardId());
R ok = R.ok();
if (StrUtil.equals("assetInfo", chart.getType())) {
- ok.put("data", assetAssetService.queryAssetInfo(visualDashboard.getLink()));
+ ok.put("data", assetAssetService.queryAssetWithFeatureInfo(visualDashboard.getLink(), 1));
} else if (StrUtil.equals("endpointInfo", chart.getType())) {
ok.put("data", monitorEndpointService.queryEndpointEntity(visualDashboard.getLink()));
} else {
diff --git a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
index baea1510..c4cb64ef 100644
--- a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
@@ -1100,7 +1100,7 @@ public class VisualServiceImpl implements VisualService {
if (StrUtil.equals(Constant.CHART_ASSETINFO_TYPE, chart.getType())) {
queryParams.put("assetId", visualDashboard.getLink());
Map<String, Object> alertMessageTrend = statServiceImpl.queryAlertMessageTrend(queryParams);
- AssetAsset asset = assetAssetService.queryAssetInfo(visualDashboard.getLink());
+ AssetAsset asset = assetAssetService.queryAssetWithFeatureInfo(visualDashboard.getLink(), 1);
Map<String, Object> assetDataMap = BeanUtil.beanToMap(asset);
assetDataMap.put("alertMessageTrend", alertMessageTrend);
r.put("data", assetDataMap);