Browse Source

20230816-bug修复和优化

iaun 3 năm trước cách đây
mục cha
commit
82e1af3349

+ 7 - 0
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.ItMonitorItemGroupVo;
 import cn.iaun.it.model.vo.monitor.controller.*;
 import cn.iaun.it.service.ItMonitorService;
 import cn.iaun.it.util.MD5Util;
@@ -191,6 +192,12 @@ public class ItMonitorController {
         return new Result<>(ResultCode.SUCCESS, itMonitorService.getAllItemGroup());
     }
 
+    @PostMapping("/item/group/get/{i}")
+    public Result<List<ItMonitorItemGroupVo>> getItResourceItemGroupByTemplateId(@PathVariable String i) {
+        Long templateId = Long.parseLong(i);
+        return new Result<>(ResultCode.SUCCESS, itMonitorService.getItemGroupByTemplateId(templateId));
+    }
+
     @PostMapping("/item/group/add")
     public Result<?> addItMonitorItemGroup(@Validated @RequestBody ItMonitorItemGroup itMonitorItemGroup) {
         if (!itMonitorService.checkTemplateExistByTemplateId(itMonitorItemGroup.getTemplateId())

+ 2 - 0
src/main/java/cn/iaun/it/mapper/ItMonitorItemGroupMapper.java

@@ -2,6 +2,7 @@ package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItMonitorItemGroup;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
+import cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -11,4 +12,5 @@ import java.util.List;
 public interface ItMonitorItemGroupMapper extends BaseMapper<ItMonitorItemGroup> {
     Long getByGroupId(Long groupId);
     List<ItMonitorApiAgentInitItemGroupVo> selectByResourceId(Long resourceId);
+    List<ItMonitorItemGroupVo> selectByTemplateId(Long templateId);
 }

+ 2 - 0
src/main/java/cn/iaun/it/model/ItMonitorItemGroup.java

@@ -1,6 +1,7 @@
 package cn.iaun.it.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import javax.validation.constraints.NotBlank;
@@ -14,6 +15,7 @@ public class ItMonitorItemGroup {
     @NotNull
     private Long templateId;
     @NotNull
+    @TableField("`interval`")
     private Integer interval;
     @NotNull
     private Long topItemId;

+ 22 - 0
src/main/java/cn/iaun/it/model/vo/monitor/ItMonitorItemGroupVo.java

@@ -0,0 +1,22 @@
+package cn.iaun.it.model.vo.monitor;
+
+import cn.iaun.it.model.ItMonitorItemGroup;
+
+public class ItMonitorItemGroupVo extends ItMonitorItemGroup {
+    private String topItemName;
+
+    public String getTopItemName() {
+        return topItemName;
+    }
+
+    public void setTopItemName(String topItemName) {
+        this.topItemName = topItemName;
+    }
+
+    @Override
+    public String toString() {
+        return "ItMonitorItemGroupVo{" +
+                "topItemName='" + topItemName + '\'' +
+                "} " + super.toString();
+    }
+}

+ 3 - 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.ItMonitorItemGroupVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
@@ -64,6 +65,8 @@ public interface ItMonitorService {
     // 监控指标组
     List<ItMonitorItemGroup> getAllItemGroup();
 
+    List<ItMonitorItemGroupVo> getItemGroupByTemplateId(Long templateId);
+
     boolean checkItemGroupExistByGroupId(Long groupId);
 
     int addItemGroup(ItMonitorItemGroup itMonitorItemGroup);

+ 6 - 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.ItMonitorItemGroupVo;
 import cn.iaun.it.service.ItMonitorService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -183,6 +184,11 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         return itMonitorItemGroupMapper.selectList(null);
     }
 
+    @Override
+    public List<ItMonitorItemGroupVo> getItemGroupByTemplateId(Long templateId) {
+        return itMonitorItemGroupMapper.selectByTemplateId(templateId);
+    }
+
     @Override
     public boolean checkItemGroupExistByGroupId(Long groupId) {
         return itMonitorItemGroupMapper.getByGroupId(groupId) != null;

+ 12 - 0
src/main/resources/mapper/ItMonitorItemGroupMapper.xml

@@ -15,4 +15,16 @@
                                   FROM it_monitor_resource mr
                                   where mr.resource_id = #{resourceId})
     </select>
+    <select id="selectByTemplateId" resultType="cn.iaun.it.model.vo.monitor.ItMonitorItemGroupVo">
+        select mig.`group_id`    as `group_id`,
+               mig.`group_name`  as `group_name`,
+               mig.`template_id` as `template_id`,
+               mig.`interval`    as `interval`,
+               mig.`top_item_id` as `top_item_id`,
+               mig.`is_table`    as `is_table`,
+               mi.`item_name`    as `top_item_name`
+        from it_monitor_item_group mig
+                 left join it_monitor_item mi on mi.`item_id` = mig.`top_item_id`
+        where mig.`template_id` = #{templateId}
+    </select>
 </mapper>