Selaa lähdekoodia

20230813-监控API逻辑错误修复

iaun 3 vuotta sitten
vanhempi
sitoutus
c65f23a4fc

+ 54 - 59
src/main/java/cn/iaun/it/controller/ItMonitorApiController.java

@@ -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();

+ 3 - 0
src/main/java/cn/iaun/it/mapper/ItMonitorDataMapper.java

@@ -13,4 +13,7 @@ public interface ItMonitorDataMapper extends BaseMapper<ItMonitorData> {
 
     // api
     ItMonitorApiDataResourceInfoVo apiSelectDataResourceInfo(Long resourceId, String agentIP);
+
+    ItMonitorApiDataResourceInfoVo apiSelectDataResource(Long resourceId, String agentIP);
+
 }

+ 18 - 18
src/main/java/cn/iaun/it/model/vo/monitor/ItMonitorApiDataResourceInfoVo.java

@@ -5,12 +5,12 @@ public class ItMonitorApiDataResourceInfoVo {
     private Long templateId;
     private Long agentId;
     private Long resourceGroupId;
-    private Long itemGroupId;
+    //    private Long itemGroupId;
     private String resourceName;
     private String agentName;
     private String agentKey;
     private String templateName;
-    private String groupName;
+//    private String groupName;
 
     @Override
     public String toString() {
@@ -19,12 +19,12 @@ public class ItMonitorApiDataResourceInfoVo {
                 ", templateId=" + templateId +
                 ", agentId=" + agentId +
                 ", resourceGroupId=" + resourceGroupId +
-                ", itemGroupId=" + itemGroupId +
+//                ", itemGroupId=" + itemGroupId +
                 ", resourceName='" + resourceName + '\'' +
                 ", agentName='" + agentName + '\'' +
                 ", agentKey='" + agentKey + '\'' +
                 ", templateName='" + templateName + '\'' +
-                ", groupName='" + groupName + '\'' +
+//                ", groupName='" + groupName + '\'' +
                 '}';
     }
 
@@ -68,13 +68,13 @@ public class ItMonitorApiDataResourceInfoVo {
         this.resourceGroupId = resourceGroupId;
     }
 
-    public Long getItemGroupId() {
-        return itemGroupId;
-    }
-
-    public void setItemGroupId(Long itemGroupId) {
-        this.itemGroupId = itemGroupId;
-    }
+//    public Long getItemGroupId() {
+//        return itemGroupId;
+//    }
+//
+//    public void setItemGroupId(Long itemGroupId) {
+//        this.itemGroupId = itemGroupId;
+//    }
 
     public String getResourceName() {
         return resourceName;
@@ -100,11 +100,11 @@ public class ItMonitorApiDataResourceInfoVo {
         this.templateName = templateName;
     }
 
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
+//    public String getGroupName() {
+//        return groupName;
+//    }
+//
+//    public void setGroupName(String groupName) {
+//        this.groupName = groupName;
+//    }
 }

+ 35 - 0
src/main/java/cn/iaun/it/model/vo/monitor/ItMonitorApiDataSetListReqVo.java

@@ -0,0 +1,35 @@
+package cn.iaun.it.model.vo.monitor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+public class ItMonitorApiDataSetListReqVo {
+    @NotBlank
+    private Long itemId;
+    @NotNull
+    private String data;
+
+    @Override
+    public String toString() {
+        return "ItMonitorApiDataSetListReqVo{" +
+                "itemId=" + itemId +
+                ", data='" + data + '\'' +
+                '}';
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+}

+ 13 - 22
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorApiDataSetReqVo.java

@@ -1,53 +1,44 @@
 package cn.iaun.it.model.vo.monitor.controller;
 
 import cn.iaun.it.model.ItMonitorData;
+import cn.iaun.it.model.vo.monitor.ItMonitorApiDataSetListReqVo;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 public class ItMonitorApiDataSetReqVo {
     @NotNull
     private Long resourceId;
     @NotBlank
-    private String itemKeyName;
-    @NotNull
-    private String data;
-    @NotBlank
     private String agentKey;
+    @NotNull
+    private List<ItMonitorApiDataSetListReqVo> data;
 
     @Override
     public String toString() {
         return "ItMonitorApiDataSetReqVo{" +
                 "resourceId=" + resourceId +
-                ", itemKeyName='" + itemKeyName + '\'' +
-                ", data='" + data + '\'' +
                 ", agentKey='" + agentKey + '\'' +
+                ", data=" + data +
                 '}';
     }
 
-    public Long getResourceId() {
-        return resourceId;
-    }
-
-    public void setResourceId(Long resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public String getItemKeyName() {
-        return itemKeyName;
+    public List<ItMonitorApiDataSetListReqVo> getData() {
+        return data;
     }
 
-    public void setItemKeyName(String itemKeyName) {
-        this.itemKeyName = itemKeyName;
+    public void setData(List<ItMonitorApiDataSetListReqVo> data) {
+        this.data = data;
     }
 
-    public String getData() {
-        return data;
+    public Long getResourceId() {
+        return resourceId;
     }
 
-    public void setData(String data) {
-        this.data = data;
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
     }
 
     public String getAgentKey() {

+ 2 - 1
src/main/java/cn/iaun/it/service/impl/ItMonitorServiceImpl.java

@@ -298,7 +298,8 @@ public class ItMonitorServiceImpl implements ItMonitorService {
 
     @Override
     public ItMonitorApiDataResourceInfoVo apiGetDataResourceInfo(Long resourceId, String agentIP) {
-        return itMonitorDataMapper.apiSelectDataResourceInfo(resourceId, agentIP);
+//        return itMonitorDataMapper.apiSelectDataResourceInfo(resourceId, agentIP);
+        return itMonitorDataMapper.apiSelectDataResource(resourceId, agentIP);
     }
 
     @Override

+ 20 - 0
src/main/resources/mapper/ItMonitorDataMapper.xml

@@ -35,4 +35,24 @@
           AND ma.agent_ip = #{agentIP}
 
     </select>
+    <select id="apiSelectDataResource" resultType="cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo">
+        SELECT mr.resource_id       AS resource_id,
+               mr.template_id       AS template_id,
+               mr.agent_id          AS agent_id,
+               mr.resource_group_id AS resource_group_id,
+               ma.agent_key_id      AS agent_key_id,
+               mr.resource_name     AS resource_name,
+               ma.agent_name        AS agent_name,
+               mak.`key`            AS agent_key,
+               mt.template_name     AS template_name
+
+        FROM it_monitor_resource mr
+                 LEFT JOIN it_monitor_agent ma ON mr.agent_id = ma.agent_id
+                 LEFT JOIN it_monitor_agent_key mak ON ma.agent_key_id = mak.agent_key_id
+                 LEFT JOIN it_monitor_template mt ON mr.template_id = mt.template_id
+
+        WHERE mr.resource_id = #{resourceId}
+          AND ma.agent_ip = #{agentIP}
+    </select>
+
 </mapper>