Просмотр исходного кода

20230806-添加部分监控controller

iaun 3 лет назад
Родитель
Сommit
f468e4927b

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

@@ -1,9 +1,7 @@
 package cn.iaun.it.controller;
 
 import cn.iaun.it.model.*;
-import cn.iaun.it.model.vo.monitor.controller.ItMonitorAgentKeyReqVo;
-import cn.iaun.it.model.vo.monitor.controller.ItMonitorAgentReqVo;
-import cn.iaun.it.model.vo.monitor.controller.ItMonitorThresholdGetReqVo;
+import cn.iaun.it.model.vo.monitor.controller.*;
 import cn.iaun.it.service.ItMonitorService;
 import cn.iaun.it.util.MD5Util;
 import cn.iaun.it.util.MyPage;
@@ -243,9 +241,6 @@ public class ItMonitorController {
 
     @PostMapping("/item/set")
     public Result<?> setItMonitorItem(@Validated @RequestBody ItMonitorItem itMonitorItem) {
-        if (itMonitorItem.getItemId() == null) {
-            return new Result<>(ResultCode.FAILED_PARAM_INVALID);
-        }
         return new Result<>(ResultCode.SUCCESS, itMonitorService.setItem(itMonitorItem));
     }
 
@@ -256,8 +251,50 @@ public class ItMonitorController {
 
     @PostMapping("/threshold/set")
     public Result<?> setItMonitorThreshold(ItMonitorThreshold itMonitorThreshold) {
-        return null;
+        int result = itMonitorService.setThreshold(itMonitorThreshold);
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
+    }
+
+    @PostMapping("/threshold/del")
+    public Result<?> delItMonitorThreshold(@Validated @RequestBody ItMonitorThresholdDelReqVo ids) {
+        int result = itMonitorService.delThresholdByIds(ids.getItemId(), ids.getResourceId(), ids.getAlarmType());
+        return new Result<>(result == 1 ? ResultCode.SUCCESS : ResultCode.FAILED);
     }
 
+    @PostMapping("/alarm/get/{i}")
+    public Result<List<ItMonitorAlarm>> getItMonitorAlarm(@PathVariable String i) {
+        Long id = Long.parseLong(i);
+        return new Result<>(ResultCode.SUCCESS, itMonitorService.getAlarmByResourceId(id));
+    }
+
+    @PostMapping("/alarm/confirm")
+    public Result<?> setItMonitorAlarmConfirm(@RequestAttribute("userId") Long userId, @Validated @RequestBody ItMonitorAlarmConfirmReqVo itMonitorAlarmConfirmReqVo) {
+        boolean success = itMonitorService.confirmAlarm(
+                itMonitorAlarmConfirmReqVo.getAlarmId(), itMonitorAlarmConfirmReqVo.getItemId(), itMonitorAlarmConfirmReqVo.getResourceId(), userId
+        );
+        return new Result<>(success ? ResultCode.SUCCESS : ResultCode.FAILED);
+    }
+
+    @PostMapping("/data/getItem")
+    public Result<MyPage<ItMonitorData>> getItMonitorDataByIds(@RequestBody ItMonitorDataGetReqVo itMonitorDataGetReqVo) {
+        if (itMonitorDataGetReqVo.getPageNo() == null) {
+            itMonitorDataGetReqVo.setPageNo(1);
+        }
+        if (itMonitorDataGetReqVo.getPageSize() == null) {
+            itMonitorDataGetReqVo.setPageSize(20);
+        }
+        MyPage<ItMonitorData> myPage = new MyPage<>(itMonitorService.getDataByIds(
+                itMonitorDataGetReqVo.getPageNo(), itMonitorDataGetReqVo.getPageSize(),
+                itMonitorDataGetReqVo.getResourceId(), itMonitorDataGetReqVo.getItemId(), itMonitorDataGetReqVo.getDays()
+        ));
+
+        return new Result<>(ResultCode.SUCCESS, myPage);
+    }
+
+    @PostMapping("/data/get/{i}")
+    public Result<List<ItMonitorData>> getItMonitorDataByResourceId(@PathVariable String i) {
+        Long id = Long.parseLong(i);
+        return new Result<>(ResultCode.SUCCESS, itMonitorService.getLatestDataByResourceId(id));
+    }
 
 }

+ 1 - 0
src/main/java/cn/iaun/it/mapper/ItMonitorAlarmMapper.java

@@ -4,4 +4,5 @@ import cn.iaun.it.model.ItMonitorAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface ItMonitorAlarmMapper extends BaseMapper<ItMonitorAlarm> {
+    int confirmAlarmByIds(Long alarmId, Long itemId, Long resourceId, Long userId);
 }

+ 12 - 2
src/main/java/cn/iaun/it/model/ItMonitorAlarm.java

@@ -12,9 +12,10 @@ public class ItMonitorAlarm {
     private Long resourceId;
     private String alarmTxt;
     private Integer alarmType;
-    private Integer alarmStatus;
+    private Integer alarmStatus; // 告警状态:0未处理;1已恢复;2已处理 SYS/USER update
     private Date firstAlarmTime;
-    private Integer alarmTimes; // 连续警告次数
+    private Integer alarmTimes; // 连续警告次数 SYS update
+    private Long updateUserId; // 最后更新用户 SYS/USER update
 
     @Override
     public String toString() {
@@ -27,9 +28,18 @@ public class ItMonitorAlarm {
                 ", alarmStatus=" + alarmStatus +
                 ", firstAlarmTime=" + firstAlarmTime +
                 ", alarmTimes=" + alarmTimes +
+                ", updateUserId=" + updateUserId +
                 '}';
     }
 
+    public Long getUpdateUserId() {
+        return updateUserId;
+    }
+
+    public void setUpdateUserId(Long updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
     public Long getAlarmId() {
         return alarmId;
     }

+ 45 - 0
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorAlarmConfirmReqVo.java

@@ -0,0 +1,45 @@
+package cn.iaun.it.model.vo.monitor.controller;
+
+import javax.validation.constraints.NotNull;
+
+public class ItMonitorAlarmConfirmReqVo {
+    @NotNull
+    private Long alarmId;
+    @NotNull
+    private Long itemId;
+    @NotNull
+    private Long resourceId;
+
+    @Override
+    public String toString() {
+        return "ItMonitorAlarmConfirmReqVo{" +
+                "alarmId=" + alarmId +
+                ", itemId=" + itemId +
+                ", resourceId=" + resourceId +
+                '}';
+    }
+
+    public Long getAlarmId() {
+        return alarmId;
+    }
+
+    public void setAlarmId(Long alarmId) {
+        this.alarmId = alarmId;
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+}

+ 65 - 0
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorDataGetReqVo.java

@@ -0,0 +1,65 @@
+package cn.iaun.it.model.vo.monitor.controller;
+
+import javax.validation.constraints.NotNull;
+
+public class ItMonitorDataGetReqVo {
+    private Integer pageNo;
+    private Integer pageSize;
+    @NotNull
+    private Long resourceId;
+    @NotNull
+    private Long itemId;
+    @NotNull
+    private Integer days;
+
+    @Override
+    public String toString() {
+        return "ItMonitorDataGetReqVo{" +
+                "pageNo=" + pageNo +
+                ", pageSize=" + pageSize +
+                ", resourceId=" + resourceId +
+                ", itemId=" + itemId +
+                ", days=" + days +
+                '}';
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Integer getDays() {
+        return days;
+    }
+
+    public void setDays(Integer days) {
+        this.days = days;
+    }
+}

+ 45 - 0
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorThresholdDelReqVo.java

@@ -0,0 +1,45 @@
+package cn.iaun.it.model.vo.monitor.controller;
+
+import javax.validation.constraints.NotNull;
+
+public class ItMonitorThresholdDelReqVo {
+    @NotNull
+    private Long itemId;
+    @NotNull
+    private Long resourceId;
+    @NotNull
+    private Integer alarmType;
+
+    @Override
+    public String toString() {
+        return "ItMonitorThresholdDelReqVo{" +
+                "itemId=" + itemId +
+                ", resourceId=" + resourceId +
+                ", alarmType=" + alarmType +
+                '}';
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Integer getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(Integer alarmType) {
+        this.alarmType = alarmType;
+    }
+}

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

@@ -89,8 +89,12 @@ public interface ItMonitorService {
     // 监控告警(不做删除?)
     List<ItMonitorAlarm> getAlarmByResourceId(Long resourceId);
 
+    int addAlarm(ItMonitorAlarm itMonitorAlarm);
+
     int setAlarm(ItMonitorAlarm itMonitorAlarm);
 
+    boolean confirmAlarm(Long alarmId, Long itemId, Long resourceId, Long userId);
+
     // 监控数据
     IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days); //
 

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

@@ -232,6 +232,7 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         if (updateResult == 0) {
             return itMonitorThresholdMapper.insert(itMonitorThreshold);
         }
+        return updateResult;
     }
 
     @Override
@@ -250,11 +251,21 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         return itMonitorAlarmMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public int addAlarm(ItMonitorAlarm itMonitorAlarm) {
+        return itMonitorAlarmMapper.insert(itMonitorAlarm);
+    }
+
     @Override
     public int setAlarm(ItMonitorAlarm itMonitorAlarm) {
         return itMonitorAlarmMapper.updateById(itMonitorAlarm);
     }
 
+    @Override
+    public boolean confirmAlarm(Long alarmId, Long itemId, Long resourceId, Long userId) {
+        return itMonitorAlarmMapper.confirmAlarmByIds(alarmId, itemId, resourceId, userId) != 0;
+    }
+
     @Override
     public IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days) {
         Page<ItMonitorData> page = new Page<>(pageNo, pageSize);

+ 1 - 0
src/main/resources/db/schema.sql

@@ -119,6 +119,7 @@ CREATE TABLE `it_monitor_alarm`
     `alarm_status`     INT(11) NOT NULL DEFAULT '0' COMMENT '告警状态:0未处理;1已恢复;2已处理',
     `first_alarm_time` TIMESTAMP NOT NULL COMMENT '初次告警时间',
     `alarm_times`      INT(11) NOT NULL DEFAULT '0' COMMENT '连续告警次数',
+    `update_user_id`   BIGINT(20) NOT NULL DEFAULT '-1' COMMENT '最后更新用户ID',
     PRIMARY KEY (`alarm_id`)
 ) COMMENT ='监控-告警'
 ;

+ 14 - 0
src/main/resources/mapper/ItMonitorAlarmMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iaun.it.mapper.ItMonitorAlarmMapper">
+
+    <update id="confirmAlarmByIds">
+        update it_monitor_alarm
+        set alarm_status   = 2,
+            update_user_id = #{userId}
+        where alarm_id = #{alarmId}
+          and item_id = #{itemId}
+          and resource_id = #{resourceId}
+          and alarm_status = 0
+    </update>
+</mapper>