fix: 修改endpoint asset name命名

2 files changed, 15 insertions, 2 deletions

diff --git a/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java b/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
index 241923a..7a9b765 100644
--- a/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
+++ b/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
@@ -151,7 +151,7 @@ public class AssetAssetServiceImpl extends ServiceImpl<AssetAssetDao, AssetAsset
 		for(Asset asset : assets) {
 			AssetAsset assetAsset = new AssetAsset();
 			assetAsset.setId(asset.getId());
-			assetAsset.setName(asset.getSn());
+			assetAsset.setName(asset.getHost());
 			assetAsset.setNumber(asset.getSn());
 			assetAsset.setSn(asset.getSn());
 			assetAsset.setPid(-1);
diff --git a/src/main/java/com/nis/service/impl/EndpointServiceImpl.java b/src/main/java/com/nis/service/impl/EndpointServiceImpl.java
index f7328ab..00bc06a 100644
--- a/src/main/java/com/nis/service/impl/EndpointServiceImpl.java
+++ b/src/main/java/com/nis/service/impl/EndpointServiceImpl.java
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nis.dao.DcDao;
 import com.nis.dao.EndpointDao;
 import com.nis.dao.IdcDao;
+import com.nis.entity.Asset;
 import com.nis.entity.Dc;
 import com.nis.entity.Endpoint;
 import com.nis.entity.Idc;
@@ -21,6 +22,7 @@ import com.nis.entity.MonitorModule;
 import com.nis.entity.MonitorProject;
 import com.nis.entity.Project;
 import com.nis.entity.SnmpCredential;
+import com.nis.service.AssetService;
 import com.nis.service.DcService;
 import com.nis.service.EndpointService;
 import com.nis.service.IdcService;
@@ -36,6 +38,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,6 +69,9 @@ public class EndpointServiceImpl extends ServiceImpl<EndpointDao, Endpoint> impl
     @Autowired
     private SnmpCredentialService snmpCredentialService;
     
+    @Autowired
+    private AssetService assetService;
+    
 	@Override
 	public void handler() {
 		
@@ -126,6 +133,7 @@ public class EndpointServiceImpl extends ServiceImpl<EndpointDao, Endpoint> impl
 		
 		List<MonitorModule> monitorModules =new ArrayList<MonitorModule>();
 		List<Module> modules = moduleService.list();
+		Map<Integer, Module> moduleIdAndData = modules.stream().collect(Collectors.toMap(Module::getId, Function.identity()));
 		for(Module module : modules) {
 			Map<String,Object> configs =new HashMap<String,Object>();
 			configs.put("metrics_path", module.getPath());
@@ -174,6 +182,9 @@ public class EndpointServiceImpl extends ServiceImpl<EndpointDao, Endpoint> impl
 			monitorModuleService.saveBatch(monitorModules);
 		}
 		
+		// 查询所有asset信息
+		List<Asset> assets = assetService.list();
+		Map<Integer, Asset> assetIdAndData = assets.stream().collect(Collectors.toMap(Asset::getId, Function.identity()));
 		// 同步endpoint信息
 		List<Endpoint> endpoints = endpointService.list();
 		List<MonitorEndpoint> monitorEndpoints =new ArrayList<MonitorEndpoint>();
@@ -200,7 +211,9 @@ public class EndpointServiceImpl extends ServiceImpl<EndpointDao, Endpoint> impl
 			monitorEndpoint.setEnabled(endpoint.getEnabled());
 			monitorEndpoint.setModuleId(endpoint.getModuleId());
 			monitorEndpoint.setAssetId(endpoint.getAssetId());
-			monitorEndpoint.setName("import_endpoint_"+endpoint.getId());
+			Asset asset = assetIdAndData.get(endpoint.getAssetId());
+			Module module = moduleIdAndData.get(endpoint.getModuleId());
+			monitorEndpoint.setName(asset.getHost()+"-"+module.getName());
 			monitorEndpoint.setSeq(endpoint.getSeq());
 			monitorEndpoint.setConfigs(JSON.toJSONString(configs));			
 			String hash = endpoint.getModuleId() + endpoint.getAssetId() + JSON.toJSONString(configs);