diff options
| author | shizhendong <[email protected]> | 2023-04-12 17:31:27 +0800 |
|---|---|---|
| committer | shizhendong <[email protected]> | 2023-04-12 17:31:27 +0800 |
| commit | c984e8dbeb495e043c50369ca8bc1daa07b04f5f (patch) | |
| tree | dacb88f87d1534be32cef5f707b958f8fe332d77 | |
| parent | e831036bfbb8f07bb2620d1122fe5eed69415fa3 (diff) | |
fix: NEZ-2451 Asset & Endpoint Snapshot时补充 alertMessageTrend 信息
| -rw-r--r-- | nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java | 22 | ||||
| -rw-r--r-- | pom.xml | 20 |
2 files changed, 40 insertions, 2 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java index 4ae68de7..d96e11c4 100644 --- a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java +++ b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java @@ -21,6 +21,10 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.map.MapUtil; +import com.nis.modules.asset.entity.AssetAsset; +import com.nis.modules.endpoint.entity.MonitorEndpoint; import org.apache.commons.collections.CollectionUtils; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; @@ -774,10 +778,24 @@ public class VisualPanelServiceImpl extends ServiceImpl<VisualPanelDao, VisualPa futureList.add(CompletableFuture.supplyAsync(() -> { VisualPanel visualPanel = this.getById(chart.getPanelId()); R ok = R.ok(); + Map<String, Object> queryParams = MapUtil.newHashMap(); + queryParams.put("type", "total"); + queryParams.put("dimension", "priority"); + queryParams.put("step", "d"); if (StrUtil.equals("assetInfo", chart.getType())) { - ok.put("data", assetAssetService.queryAssetInfo(visualPanel.getLink())); + queryParams.put("assetId", visualPanel.getLink()); + Map<String, Object> alertMessageTrend = statServiceImpl.queryAlertMessageTrend(queryParams); + AssetAsset asset = assetAssetService.queryAssetInfo(visualPanel.getLink()); + Map<String, Object> assetDataMap = BeanUtil.beanToMap(asset); + assetDataMap.put("alertMessageTrend", alertMessageTrend); + ok.put("data", assetDataMap); } else if (StrUtil.equals("endpointInfo", chart.getType())) { - ok.put("data", monitorEndpointService.queryEndpointEntity(visualPanel.getLink())); + queryParams.put("endpointId", visualPanel.getLink()); + Map<String, Object> alertMessageTrend = statServiceImpl.queryAlertMessageTrend(queryParams); + MonitorEndpoint endpoint = monitorEndpointService.queryEndpointEntity(visualPanel.getLink()); + Map<String, Object> endpointDataMap = BeanUtil.beanToMap(endpoint); + endpointDataMap.put("alertMessageTrend", alertMessageTrend); + ok.put("data", endpointDataMap); } else { cn.hutool.json.JSONObject dataSource = JSONUtil.parseArray(chartParam.get("datasource")) .getJSONObject(0); @@ -224,6 +224,16 @@ <url>http://192.168.40.153:8099/content/groups/public/</url> </repository> <repository> + <id>nexus-releases</id> + <name>Team Nexus Repository</name> + <url>http://192.168.40.153:8099/content/repositories/releases/</url> + </repository> + <repository> + <id>nexus-geedge</id> + <name>Team Nexus Repository</name> + <url>http://192.168.40.153:8099/content/repositories/geedge/</url> + </repository> + <repository> <id>public</id> <name>aliyun nexus</name> <url>http://maven.aliyun.com/nexus/content/groups/public/</url> @@ -254,6 +264,16 @@ <url>http://192.168.40.153:8099/content/groups/public/</url> </pluginRepository> <pluginRepository> + <id>nexus-releases</id> + <name>Team Nexus Repository</name> + <url>http://192.168.40.153:8099/content/repositories/releases/</url> + </pluginRepository> + <pluginRepository> + <id>nexus-geedge</id> + <name>Team Nexus Repository</name> + <url>http://192.168.40.153:8099/content/repositories/geedge/</url> + </pluginRepository> + <pluginRepository> <id>public</id> <name>aliyun nexus</name> <url>http://maven.aliyun.com/nexus/content/groups/public/</url> |