gfwleak/nezha-nz-transfer
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改endpoint asset name命名

Browse Source
This commit is contained in:
tanghao
2021-05-13 20:27:04 +08:00
parent 8ca99bf580
commit 5f7c133260
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
View File

@@ -151,7 +151,7 @@ public class AssetAssetServiceImpl extends ServiceImpl<AssetAssetDao, AssetAsset
for(Asset asset : assets) { for(Asset asset : assets) {
AssetAsset assetAsset = new AssetAsset(); AssetAsset assetAsset = new AssetAsset();
assetAsset.setId(asset.getId()); assetAsset.setId(asset.getId());
assetAsset.setName(asset.getSn()); assetAsset.setName(asset.getHost());
assetAsset.setNumber(asset.getSn()); assetAsset.setNumber(asset.getSn());
assetAsset.setSn(asset.getSn()); assetAsset.setSn(asset.getSn());
assetAsset.setPid(-1); assetAsset.setPid(-1);

15
src/main/java/com/nis/service/impl/EndpointServiceImpl.java
View File

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