Pārlūkot izejas kodu

20230829-完善接口

iaun 3 gadi atpakaļ
vecāks
revīzija
2cdc44b4f6

+ 12 - 7
src/main/java/cn/iaun/it/controller/ItMonitorController.java

@@ -1,6 +1,7 @@
 package cn.iaun.it.controller;
 
 import cn.iaun.it.model.*;
+import cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo;
 import cn.iaun.it.model.vo.monitor.controller.*;
 import cn.iaun.it.service.ItMonitorService;
@@ -154,12 +155,12 @@ public class ItMonitorController {
     }
 
     @PostMapping("/resource/get/{i}")
-    public Result<List<ItMonitorResource>> getItMonitorResource(@PathVariable String i) {
+    public Result<List<ItMonitorItMonitorResourceDetailsVo>> getItMonitorResource(@PathVariable String i) {
         if (i.equals("all")) {
-            return new Result<>(ResultCode.SUCCESS, itMonitorService.getAllResource());
+            return new Result<>(ResultCode.SUCCESS, itMonitorService.getAllResourceDetails());
         }
         Long id = Long.parseLong(i);
-        return new Result<>(ResultCode.SUCCESS, itMonitorService.getResourceByGroupId(id));
+        return new Result<>(ResultCode.SUCCESS, itMonitorService.getResourceDetailsByGroupId(id));
     }
 
     @PostMapping("/resource/add")
@@ -224,7 +225,8 @@ public class ItMonitorController {
     }
 
     @PostMapping("/item/group/set")
-    public Result<?> setItMonitorItemGroup(ItMonitorItemGroup itMonitorItemGroup) { // 只允许修改名称、间隔、置顶itemId、是否为表格
+    public Result<?> setItMonitorItemGroup(@RequestBody ItMonitorItemGroup itMonitorItemGroup) { // 只允许修改名称、间隔、置顶itemId、是否为表格
+        System.out.println(itMonitorItemGroup);
         if (itMonitorItemGroup.getGroupId() == null || itMonitorItemGroup.getGroupName() == null || itMonitorItemGroup.getGroupName().isEmpty()
                 || (itMonitorItemGroup.getTopItemId() != -1 && !itMonitorService.checkItemExistByItemId(itMonitorItemGroup.getTopItemId(), itMonitorItemGroup.getGroupId()))
         ) {
@@ -243,7 +245,8 @@ public class ItMonitorController {
 
     @PostMapping("/item/add") // TODO: check groupId
     public Result<?> addItMonitorItem(@Validated @RequestBody ItMonitorItem itMonitorItem) {
-        if (!itMonitorService.checkItemGroupExistByGroupId(itMonitorItem.getItemGroupId())) {
+        if (itMonitorItem.getItemGroupId() == null ||
+                !itMonitorService.checkItemGroupExistByGroupId(itMonitorItem.getItemGroupId())) {
             return new Result<>(ResultCode.FAILED_PARAM_INVALID);
         }
         itMonitorItem.setItemId(null);
@@ -259,8 +262,10 @@ public class ItMonitorController {
     }
 
     @PostMapping("/item/set") // TODO: check groupId
-    public Result<?> setItMonitorItem(@Validated @RequestBody ItMonitorItem itMonitorItem) {
-        return new Result<>(ResultCode.SUCCESS, itMonitorService.setItem(itMonitorItem));
+    public Result<?> setItMonitorItem(@RequestBody ItMonitorItem itMonitorItem) {
+        itMonitorItem.setItemGroupId(null);
+        int result = itMonitorService.setItem(itMonitorItem);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
     }
 
     @PostMapping("/threshold/get")

+ 5 - 1
src/main/java/cn/iaun/it/mapper/ItMonitorResourceMapper.java

@@ -1,11 +1,15 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItMonitorResource;
+import cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ItMonitorResourceMapper extends BaseMapper<ItMonitorResource> {
     Boolean apiAuthCheck(Long resourceId, String agentIP, String agentKey);
+    List<ItMonitorItMonitorResourceDetailsVo> getMonitorResourceDetailsByResourceGroupId(Long resourceGroupId);
+    List<ItMonitorItMonitorResourceDetailsVo> getAllMonitorResourceDetailsByResourceGroupId();
 }

+ 1 - 1
src/main/java/cn/iaun/it/model/ItMonitorItem.java

@@ -15,7 +15,7 @@ public class ItMonitorItem {
     private String itemName;
     @NotBlank
     private String itemKeyName;
-    @NotNull
+//    @NotNull
     private Long itemGroupId;
     @NotNull
     @Min(0)

+ 93 - 0
src/main/java/cn/iaun/it/model/vo/monitor/ItMonitorItMonitorResourceDetailsVo.java

@@ -0,0 +1,93 @@
+package cn.iaun.it.model.vo.monitor;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+public class ItMonitorItMonitorResourceDetailsVo {
+    private Long resourceId;
+    private Long templateId;
+    private String templateName;
+    private Long agentId;
+    private String agentName;
+    @TableField("agent_ip")
+    private String agentIP;
+    private Long resourceGroupId;
+    private String resourceName;
+
+    @Override
+    public String toString() {
+        return "ItMonitorItMonitorResourceDetailVo{" +
+                "resourceId=" + resourceId +
+                ", templateId=" + templateId +
+                ", templateName='" + templateName + '\'' +
+                ", agentId=" + agentId +
+                ", agentName='" + agentName + '\'' +
+                ", agentIP='" + agentIP + '\'' +
+                ", resourceGroupId=" + resourceGroupId +
+                ", resourceName='" + resourceName + '\'' +
+                '}';
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Long getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Long agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
+    public String getAgentIP() {
+        return agentIP;
+    }
+
+    public void setAgentIP(String agentIP) {
+        this.agentIP = agentIP;
+    }
+
+    public Long getResourceGroupId() {
+        return resourceGroupId;
+    }
+
+    public void setResourceGroupId(Long resourceGroupId) {
+        this.resourceGroupId = resourceGroupId;
+    }
+
+    public String getResourceName() {
+        return resourceName;
+    }
+
+    public void setResourceName(String resourceName) {
+        this.resourceName = resourceName;
+    }
+}

+ 5 - 0
src/main/java/cn/iaun/it/service/ItMonitorService.java

@@ -3,6 +3,7 @@ package cn.iaun.it.service;
 import cn.iaun.it.model.*;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo;
+import cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -58,6 +59,10 @@ public interface ItMonitorService {
 
     List<ItMonitorResource> getResourceByGroupId(Long groupId);
 
+    List<ItMonitorItMonitorResourceDetailsVo> getAllResourceDetails();
+
+    List<ItMonitorItMonitorResourceDetailsVo> getResourceDetailsByGroupId(Long groupId);
+
     int addResource(ItMonitorResource itMonitorResource);
 
     int delResource(Long resourceId);

+ 11 - 0
src/main/java/cn/iaun/it/service/impl/ItMonitorServiceImpl.java

@@ -4,6 +4,7 @@ import cn.iaun.it.mapper.*;
 import cn.iaun.it.model.*;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo;
+import cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo;
 import cn.iaun.it.service.ItMonitorService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -164,6 +165,11 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         return itMonitorResourceMapper.selectList(null);
     }
 
+    @Override
+    public List<ItMonitorItMonitorResourceDetailsVo> getAllResourceDetails() {
+        return itMonitorResourceMapper.getAllMonitorResourceDetailsByResourceGroupId();
+    }
+
     @Override
     public List<ItMonitorResource> getResourceByGroupId(Long groupId) {
         QueryWrapper<ItMonitorResource> queryWrapper = new QueryWrapper<>();
@@ -171,6 +177,11 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         return itMonitorResourceMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public List<ItMonitorItMonitorResourceDetailsVo> getResourceDetailsByGroupId(Long groupId) {
+        return itMonitorResourceMapper.getMonitorResourceDetailsByResourceGroupId(groupId);
+    }
+
     @Override
     public int addResource(ItMonitorResource itMonitorResource) {
         return itMonitorResourceMapper.insert(itMonitorResource);

+ 29 - 0
src/main/resources/mapper/ItMonitorResourceMapper.xml

@@ -11,4 +11,33 @@
           AND ma.agent_ip = #{agentIP}
           AND mak.`key` = #{agentKey}
     </select>
+    <select id="getMonitorResourceDetailsByResourceGroupId"
+            resultType="cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo">
+        SELECT imr.`resource_id`       AS `resource_id`,
+               imr.`template_id`       AS `template_id`,
+               imt.`template_name`     AS `template_name`,
+               imr.`agent_id`          AS `agent_id`,
+               ima.`agent_name`        AS `agent_name`,
+               ima.`agent_ip`          AS `agent_ip`,
+               imr.`resource_group_id` AS `resource_group_id`,
+               imr.`resource_name`     AS `resource_name`
+        FROM `it_monitor_resource` imr
+                 LEFT JOIN it_monitor_template imt ON imr.`template_id` = imt.`template_id`
+                 LEFT JOIN it_monitor_agent ima ON imr.`agent_id` = ima.`agent_id`
+        WHERE `resource_group_id` = #{resourceGroupId}
+    </select>
+    <select id="getAllMonitorResourceDetailsByResourceGroupId"
+            resultType="cn.iaun.it.model.vo.monitor.ItMonitorItMonitorResourceDetailsVo">
+        SELECT imr.`resource_id`       AS `resource_id`,
+               imr.`template_id`       AS `template_id`,
+               imt.`template_name`     AS `template_name`,
+               imr.`agent_id`          AS `agent_id`,
+               ima.`agent_name`        AS `agent_name`,
+               ima.`agent_ip`          AS `agent_ip`,
+               imr.`resource_group_id` AS `resource_group_id`,
+               imr.`resource_name`     AS `resource_name`
+        FROM `it_monitor_resource` imr
+                 LEFT JOIN it_monitor_template imt ON imr.`template_id` = imt.`template_id`
+                 LEFT JOIN it_monitor_agent ima ON imr.`agent_id` = ima.`agent_id`
+    </select>
 </mapper>