fix: 修改endpoint label处理 assetType数据处理

6 files changed, 58 insertions, 4 deletions

diff --git a/src/main/java/com/nis/handler/SqlHandler.java b/src/main/java/com/nis/handler/SqlHandler.java
index 0b815f7..f49db3d 100644
--- a/src/main/java/com/nis/handler/SqlHandler.java
+++ b/src/main/java/com/nis/handler/SqlHandler.java
@@ -31,6 +31,7 @@ import com.nis.service.AlertMessageService;
 import com.nis.service.AssetAssetService;
 import com.nis.service.AssetBrandService;
 import com.nis.service.AssetModelService;
+import com.nis.service.AssetTypeConfService;
 import com.nis.service.ChartService;
 import com.nis.service.DcService;
 import com.nis.service.EndpointService;
@@ -90,9 +91,15 @@ public class SqlHandler {
 	@Autowired
 	private ProjectTopoService projectTopoService;
 	
+	@Autowired
+	private AssetTypeConfService assetTypeConfService;
+	
 	public void removeData() {
 		String assetPing = "delete from asset_ping";
 		sqlDao.execute(assetPing);
+		
+		String updateChartData="update visual_chart set height = ceil(height/100) where height > 12";
+		sqlDao.execute(updateChartData);
 	}
 	
 	public void removeTable() {
@@ -721,6 +728,8 @@ public class SqlHandler {
  		assetBrandService.handler();
  		// asset_model表数据处理 前提先处理好brand表数据信息
  		assetModelService.handler();
+ 		// asset_type_conf表数据处理
+ 		assetTypeConfService.handler();
 		/*StringBuilder sb = new StringBuilder();
 		sb.append("INSERT INTO `asset_field_group`(`id`, `name`, `remark`, `build_in`, `seq`) VALUES (1, 'default', 'Default meta group', '1', '');");
 		sb.append("INSERT INTO `alert_severity_conf`(`id`, `name`, `color`, `weight`, `remark`) VALUES (1, 'P1', '#f2866e', 1, '高级告警');");
diff --git a/src/main/java/com/nis/service/AssetTypeConfService.java b/src/main/java/com/nis/service/AssetTypeConfService.java
index d93d719..73d0a61 100644
--- a/src/main/java/com/nis/service/AssetTypeConfService.java
+++ b/src/main/java/com/nis/service/AssetTypeConfService.java
@@ -6,5 +6,5 @@ import com.nis.entity.AssetTypeConf;
 
 public interface AssetTypeConfService extends IService<AssetTypeConf> {
     
-	
+	public void handler();
 }
\ No newline at end of file
diff --git a/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java b/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
index 7a9b765..2a6dc82 100644
--- a/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
+++ b/src/main/java/com/nis/service/impl/AssetAssetServiceImpl.java
@@ -157,7 +157,7 @@ public class AssetAssetServiceImpl extends ServiceImpl<AssetAssetDao, AssetAsset
 			assetAsset.setPid(-1);
 			assetAsset.setBrandId(modelAndBrand.get(asset.getModelId()));
 			Integer typeId = assetTypeNameAndId.get(modelIdAndTypeName.get(asset.getModelId()));
-			assetAsset.setTypeId(typeId);
+			assetAsset.setTypeId(ToolUtil.isNotEmpty(typeId)?typeId:-1);
 			assetAsset.setModelId(asset.getModelId());
 			assetAsset.setStateId(asset.getState());
 			assetAsset.setDcId(asset.getIdcId());
diff --git a/src/main/java/com/nis/service/impl/AssetTypeConfServiceImpl.java b/src/main/java/com/nis/service/impl/AssetTypeConfServiceImpl.java
index a8f8c0f..6d98c5f 100644
--- a/src/main/java/com/nis/service/impl/AssetTypeConfServiceImpl.java
+++ b/src/main/java/com/nis/service/impl/AssetTypeConfServiceImpl.java
@@ -7,13 +7,18 @@ import com.nis.dao.DcDao;
 import com.nis.entity.AssetTypeConf;
 import com.nis.entity.Dc;
 import com.nis.entity.Idc;
+import com.nis.entity.SysDictEntity;
 import com.nis.service.AssetTypeConfService;
 import com.nis.service.DcService;
 import com.nis.service.IdcService;
+import com.nis.service.SysDictService;
 import com.nis.util.ToolUtil;
 
 import java.util.ArrayList;
 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;
@@ -22,7 +27,41 @@ import org.springframework.stereotype.Service;
 public class AssetTypeConfServiceImpl extends ServiceImpl<AssetTypeConfDao, AssetTypeConf> implements AssetTypeConfService {
     private static Log logger = Log.get();
 
+    @Autowired
+    private SysDictService sysDictService;
     
+	@Override
+	public void handler() {
+		// 初始化数据
+		this.initData();
+	}
 
-	
+    public void initData() {
+    	List<SysDictEntity> types = sysDictService.queryDatas("assetType");
+    	List<AssetTypeConf> list = this.list();
+    	List<AssetTypeConf> assetTypeConfs = new ArrayList<AssetTypeConf>();
+    	Map<String, AssetTypeConf> nameAndData = list.stream().collect(Collectors.toMap(AssetTypeConf::getName, Function.identity()));
+    	for(SysDictEntity type : types) {
+    		AssetTypeConf assetTypeConf = nameAndData.get(type.getValue());
+    		if(ToolUtil.isEmpty(assetTypeConf)) {
+    			assetTypeConf = new AssetTypeConf();
+    			assetTypeConf.setPid(0);
+    			assetTypeConf.setVm(0);
+    			assetTypeConf.setVmh(0);
+    			assetTypeConf.setName(type.getValue());
+    			assetTypeConf.setRemark("");
+    			assetTypeConf.setBuildIn(0);
+    			assetTypeConf.setAuthProtocol(0);
+    			assetTypeConf.setSnmpEnable(0);
+    			assetTypeConf.setSnmpCollect(0);
+    			assetTypeConf.setSshCollect(0);
+    			assetTypeConf.setSshCollectScript("");
+    			assetTypeConfs.add(assetTypeConf);
+    		}
+    	}
+    	
+    	if(ToolUtil.isNotEmpty(assetTypeConfs)) {
+    		this.saveBatch(assetTypeConfs);
+    	}
+    }
 }
diff --git a/src/main/java/com/nis/service/impl/EndpointServiceImpl.java b/src/main/java/com/nis/service/impl/EndpointServiceImpl.java
index 00bc06a..4274587 100644
--- a/src/main/java/com/nis/service/impl/EndpointServiceImpl.java
+++ b/src/main/java/com/nis/service/impl/EndpointServiceImpl.java
@@ -205,7 +205,10 @@ public class EndpointServiceImpl extends ServiceImpl<EndpointDao, Endpoint> impl
 				}
 				configs.put("params", params);
 			}
-			configs.put("labels",endpoint.getLabels());
+			String labels = endpoint.getLabels();
+			if(StrUtil.isNotBlank(labels)) {
+				configs.put("labels",JSON.parseObject(labels));
+			}
 			MonitorEndpoint monitorEndpoint = new MonitorEndpoint();
 			monitorEndpoint.setId(endpoint.getId());
 			monitorEndpoint.setEnabled(endpoint.getEnabled());
diff --git a/src/main/java/com/nis/service/impl/ProjectTopoServiceImpl.java b/src/main/java/com/nis/service/impl/ProjectTopoServiceImpl.java
index 49f353b..6001180 100644
--- a/src/main/java/com/nis/service/impl/ProjectTopoServiceImpl.java
+++ b/src/main/java/com/nis/service/impl/ProjectTopoServiceImpl.java
@@ -49,6 +49,9 @@ public class ProjectTopoServiceImpl extends ServiceImpl<ProjectTopoDao, ProjectT
 			Map topoData =new LinkedHashMap(); 
 			List<Map> pens = new ArrayList<Map>();
 			Map topo = JSONObject.parseObject(projectTopo.getTopo().toString(), Map.class);
+			if(ToolUtil.isEmpty(topo.get("nodes"))) {
+				continue;
+			}
 			List<Map> nodes = JSONObject.parseArray(topo.get("nodes").toString(),Map.class);
 			List<Map> lines = JSONObject.parseArray(topo.get("lines").toString(),Map.class);
 			Map moduleAndNode = new HashMap();