|
|
@@ -6,6 +6,7 @@ import cn.iaun.it.model.ItMonitorItemGroup;
|
|
|
import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
|
|
|
import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitVo;
|
|
|
import cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo;
|
|
|
+import cn.iaun.it.model.vo.monitor.ItMonitorApiDataSetListReqVo;
|
|
|
import cn.iaun.it.model.vo.monitor.controller.ItMonitorApiAgentInitReqVo;
|
|
|
import cn.iaun.it.model.vo.monitor.controller.ItMonitorApiDataSetReqVo;
|
|
|
import cn.iaun.it.service.ItMonitorService;
|
|
|
@@ -30,80 +31,74 @@ public class ItMonitorApiController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/data/set")
|
|
|
- public Result<?> setMonitorData(HttpServletRequest request, @Validated @RequestBody List<ItMonitorApiDataSetReqVo> itMonitorApiDataSetReqVos) {
|
|
|
+ public Result<?> setMonitorData(HttpServletRequest request, @Validated @RequestBody ItMonitorApiDataSetReqVo reqVo) {
|
|
|
String ip = request.getRemoteAddr();
|
|
|
- // map: resourceId -> INFO
|
|
|
- HashMap<Long, ItMonitorApiDataResourceInfoVo> resourceInfos = new HashMap<>();
|
|
|
- HashMap<Long, HashMap<String, ItMonitorItem>> allItems = new HashMap<>();
|
|
|
+ // 获取资源信息
|
|
|
+ ItMonitorApiDataResourceInfoVo resourceInfo = itMonitorService.apiGetDataResourceInfo(reqVo.getResourceId(), ip);
|
|
|
+ System.out.println(resourceInfo);
|
|
|
+
|
|
|
+ // 判断资源是否存在
|
|
|
+ if (resourceInfo == null) {
|
|
|
+ return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 判断agent是否正确
|
|
|
+ if (!resourceInfo.getAgentKey().equals(reqVo.getAgentKey())) {
|
|
|
+ return new Result<>(ResultCode.AGENT_KEY_ERROR);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 获取所有item
|
|
|
+ List<ItMonitorApiAgentInitItemGroupVo> itemGroups = itMonitorService.apiGetItemGroupsByResourceId(reqVo.getResourceId());
|
|
|
+
|
|
|
+ if (itemGroups.isEmpty()) {
|
|
|
+ return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
+ }
|
|
|
+ List<Long> groupIds = new ArrayList<>();
|
|
|
+
|
|
|
+ for (ItMonitorApiAgentInitItemGroupVo item : itemGroups) {
|
|
|
+ groupIds.add(item.getGroupId());
|
|
|
+ }
|
|
|
+ List<ItMonitorItem> items = itMonitorService.apiGetItemsByItemGroupIds(groupIds);
|
|
|
+ System.out.println(items);
|
|
|
+
|
|
|
+ // itemId -> item
|
|
|
+ Map<Long, ItMonitorItem> itemMap = new HashMap<>();
|
|
|
+ for (ItMonitorItem item : items) {
|
|
|
+ itemMap.put(item.getItemId(), item);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 保存最终提交到数据库的结果
|
|
|
List<ItMonitorData> resultList = new ArrayList<>();
|
|
|
- for (ItMonitorApiDataSetReqVo itMonitorApiDataSetReqVo : itMonitorApiDataSetReqVos) {
|
|
|
- // 获取资源信息
|
|
|
- ItMonitorApiDataResourceInfoVo resourceInfo;
|
|
|
- if (!resourceInfos.containsKey(itMonitorApiDataSetReqVo.getResourceId())) {
|
|
|
- resourceInfo = itMonitorService.apiGetDataResourceInfo(itMonitorApiDataSetReqVo.getResourceId(), ip);
|
|
|
- if (resourceInfo == null || resourceInfo.getItemGroupId() == null) {
|
|
|
- return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
- }
|
|
|
- // 缓存到map
|
|
|
- resourceInfos.put(itMonitorApiDataSetReqVo.getResourceId(), resourceInfo);
|
|
|
- } else {
|
|
|
- resourceInfo = resourceInfos.get(itMonitorApiDataSetReqVo.getResourceId());
|
|
|
- }
|
|
|
|
|
|
- if (itMonitorApiDataSetReqVo.getAgentKey() == null || resourceInfo.getAgentKey() == null
|
|
|
- || !itMonitorApiDataSetReqVo.getAgentKey().equals(resourceInfo.getAgentKey())
|
|
|
- ) {
|
|
|
- return new Result<>(ResultCode.AGENT_KEY_ERROR);
|
|
|
- }
|
|
|
- HashMap<String, ItMonitorItem> itemMap;
|
|
|
- String fullGroupName = "group" + resourceInfo.getItemGroupId() + "." + itMonitorApiDataSetReqVo.getItemKeyName();
|
|
|
-
|
|
|
- if (!allItems.containsKey(resourceInfo.getItemGroupId())) {
|
|
|
- itemMap = new HashMap<>();
|
|
|
- List<ItMonitorItem> items = itMonitorService.getAllItemByGroupId(resourceInfo.getItemGroupId());
|
|
|
- if (items.isEmpty()) {
|
|
|
- return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
- }
|
|
|
- for (ItMonitorItem itMonitorItem : items) {
|
|
|
- itemMap.put(itMonitorItem.getItemKeyName(), itMonitorItem);
|
|
|
- }
|
|
|
- allItems.put(resourceInfo.getItemGroupId(), itemMap);
|
|
|
- } else {
|
|
|
- itemMap = allItems.get(resourceInfo.getItemGroupId());
|
|
|
- }
|
|
|
- if (!itemMap.containsKey(fullGroupName)) {
|
|
|
- return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
+ List<ItMonitorApiDataSetListReqVo> data = reqVo.getData();
|
|
|
+ for (ItMonitorApiDataSetListReqVo row : data) {
|
|
|
+ if (!itemMap.containsKey(row.getItemId())) {
|
|
|
+ // 如果未找到ID则跳过
|
|
|
+ continue;
|
|
|
}
|
|
|
+
|
|
|
ItMonitorData res = new ItMonitorData();
|
|
|
- Date now = new Date();
|
|
|
- res.setResourceId(itMonitorApiDataSetReqVo.getResourceId());
|
|
|
- res.setItemId(itemMap.get(fullGroupName).getItemId());
|
|
|
- res.setRecordTime(now);
|
|
|
- res.setData(itMonitorApiDataSetReqVo.getData());
|
|
|
+ res.setItemId(row.getItemId());
|
|
|
+ res.setResourceId(reqVo.getResourceId());
|
|
|
+ res.setRecordTime(new Date());
|
|
|
+ res.setData(row.getData());
|
|
|
resultList.add(res);
|
|
|
}
|
|
|
- // 检查是否有重复
|
|
|
- List<String> strList = new ArrayList<>();
|
|
|
- for (ItMonitorData itMonitorData : resultList) {
|
|
|
- String txt = itMonitorData.getItemId().toString() + itMonitorData.getItemId().toString();
|
|
|
- if (strList.contains(txt)) {
|
|
|
- return new Result<>(ResultCode.FAILED_PARAM_INVALID);
|
|
|
- }
|
|
|
- strList.add(txt);
|
|
|
- }
|
|
|
- strList.clear();
|
|
|
- HashSet<Integer> set = new HashSet<>();
|
|
|
+
|
|
|
+ System.out.println(resultList);
|
|
|
+ HashSet<Integer> resultSet = new HashSet<>();
|
|
|
for (ItMonitorData itMonitorData : resultList) {
|
|
|
int result = itMonitorService.addData(itMonitorData);
|
|
|
System.out.println(result);
|
|
|
- set.add(result);
|
|
|
+ resultSet.add(result);
|
|
|
}
|
|
|
- if (set.size() == 1 && set.contains(1)) {
|
|
|
+
|
|
|
+ if (resultSet.size() == 1 && resultSet.contains(1)) {
|
|
|
return new Result<>(ResultCode.SUCCESS);
|
|
|
}
|
|
|
return new Result<>(ResultCode.FAILED);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@PostMapping("/agent/init")
|
|
|
public Result<List<ItMonitorApiAgentInitVo>> agentInit(HttpServletRequest request, @Validated @RequestBody ItMonitorApiAgentInitReqVo reqVo) {
|
|
|
String ip = request.getRemoteAddr();
|