From ca4d537c4065315be5c5c27cdef733fc383c4b74 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang@960204@163.com>
Date: 星期四, 13 十一月 2025 08:02:24 +0800
Subject: [PATCH] fix：新分支
---
src/main/java/com/wgcloud/controller/TuopuController.java | 73 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/wgcloud/controller/TuopuController.java b/src/main/java/com/wgcloud/controller/TuopuController.java
index 271c67a..ea3036e 100644
--- a/src/main/java/com/wgcloud/controller/TuopuController.java
+++ b/src/main/java/com/wgcloud/controller/TuopuController.java
@@ -80,13 +80,15 @@
HostUtil.addAccountquery(request, params);
List<SystemInfo> pageInfo = systemInfoService.selectAllByParams(params);
- for (SystemInfo systemInfo : pageInfo) {
- TuopuNodeDto dto = new TuopuNodeDto();
- systemInfoMap.put(systemInfo.getHostname(), systemInfo.getHostname());
- dto.setHostname(systemInfo.getHostname() + HostUtil.addRemark(systemInfo.getHostname()));
- dto.setState(systemInfo.getState());
- dto.setType("1");
- nodeList.add(dto);
+ if(pageInfo!=null &&pageInfo.size()>0){
+ for (SystemInfo systemInfo : pageInfo) {
+ TuopuNodeDto dto = new TuopuNodeDto();
+ systemInfoMap.put(systemInfo.getHostname(), systemInfo.getHostname());
+ dto.setHostname(systemInfo.getHostname() + HostUtil.addRemark(systemInfo.getHostname()));
+ dto.setState(systemInfo.getState());
+ dto.setType("1");
+ nodeList.add(dto);
+ }
}
//缁勮涓绘満 ends
@@ -120,20 +122,22 @@
HostUtil.addAccountquery(request, params);
List<DceInfo> pageInfoDce = dceInfoService.selectAllByParams(params);
- for (DceInfo dceInfo : pageInfoDce) {
- TuopuNodeDto dto = new TuopuNodeDto();
- if (!StringUtils.isEmpty(dceInfo.getRemark())) {
- dto.setHostname(dceInfo.getHostname() + "(" + dceInfo.getRemark() + ")");
- } else {
- dto.setHostname(dceInfo.getHostname());
+ if(pageInfoDce!=null &&pageInfoDce.size()>0){
+ for (DceInfo dceInfo : pageInfoDce) {
+ TuopuNodeDto dto = new TuopuNodeDto();
+ if (!StringUtils.isEmpty(dceInfo.getRemark())) {
+ dto.setHostname(dceInfo.getHostname() + "(" + dceInfo.getRemark() + ")");
+ } else {
+ dto.setHostname(dceInfo.getHostname());
+ }
+ if (dceInfo.getResTimes() < 0) {
+ dto.setState(StaticKeys.DOWN_STATE);
+ } else {
+ dto.setState(StaticKeys.ON_STATE);
+ }
+ dto.setType("2");
+ nodeList.add(dto);
}
- if (dceInfo.getResTimes() < 0) {
- dto.setState(StaticKeys.DOWN_STATE);
- } else {
- dto.setState(StaticKeys.ON_STATE);
- }
- dto.setType("2");
- nodeList.add(dto);
}
//缁勮鏁伴�歅ING璁惧 end
@@ -146,22 +150,25 @@
HostUtil.addAccountquery(request, params);
List<SnmpInfo> pageInfoSnmp = snmpInfoService.selectAllByParams(params);
- for (SnmpInfo snmpInfo : pageInfoSnmp) {
- for (SnmpInfo snmpInfoAdded : snmpAddedList) {
- if (snmpInfo.getHostname().equals(snmpInfoAdded.getHostname())) {
- continue;
+ if(pageInfoSnmp!=null &&pageInfoSnmp.size()>0){
+ for (SnmpInfo snmpInfo : pageInfoSnmp) {
+ for (SnmpInfo snmpInfoAdded : snmpAddedList) {
+ if (snmpInfo.getHostname().equals(snmpInfoAdded.getHostname())) {
+ continue;
+ }
}
+ TuopuNodeDto dto = new TuopuNodeDto();
+ if (!StringUtils.isEmpty(snmpInfo.getRemark())) {
+ dto.setHostname(snmpInfo.getHostname() + "(" + snmpInfo.getRemark() + ")");
+ } else {
+ dto.setHostname(snmpInfo.getHostname());
+ }
+ dto.setState(snmpInfo.getState());
+ dto.setType("2");
+ nodeList.add(dto);
}
- TuopuNodeDto dto = new TuopuNodeDto();
- if (!StringUtils.isEmpty(snmpInfo.getRemark())) {
- dto.setHostname(snmpInfo.getHostname() + "(" + snmpInfo.getRemark() + ")");
- } else {
- dto.setHostname(snmpInfo.getHostname());
- }
- dto.setState(snmpInfo.getState());
- dto.setType("2");
- nodeList.add(dto);
}
+
//缁勮鏁伴�歋NMP璁惧 end
//璁剧疆鑺傜偣鍧愭爣
--
Gitblit v1.9.1