Explorar o código

20230815-bug修复和优化

iaun %!s(int64=3) %!d(string=hai) anos
pai
achega
0574923f8e

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

@@ -6,4 +6,6 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface ItMonitorAgentKeyMapper extends BaseMapper<ItMonitorAgentKey> {
+    // 仅删除未给引用的agent key
+    int deleteAgentKeyById(Long agentKeyId);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 public class ItMonitorAgent {
     @TableId(type = IdType.AUTO)
@@ -14,7 +15,7 @@ public class ItMonitorAgent {
     @NotBlank
     @TableField("agent_ip")
     private String agentIP;
-    @NotBlank
+    @NotNull
     private Long agentKeyId;
 
     @Override

+ 2 - 1
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorAgentKeyReqVo.java

@@ -1,10 +1,11 @@
 package cn.iaun.it.model.vo.monitor.controller;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 public class ItMonitorAgentKeyReqVo {
     private Long id;
-    @NotNull
+    @NotBlank
     private String remark;
 
     public String getRemark() {

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

@@ -42,7 +42,9 @@ public class ItMonitorServiceImpl implements ItMonitorService {
 
     @Override
     public List<ItMonitorAgentKey> getAllAgentKey() {
-        return itMonitorAgentKeyMapper.selectList(null);
+        QueryWrapper<ItMonitorAgentKey> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("agent_key_id");
+        return itMonitorAgentKeyMapper.selectList(queryWrapper);
     }
 
     @Override
@@ -55,7 +57,7 @@ public class ItMonitorServiceImpl implements ItMonitorService {
 
     @Override
     public int delAgentKey(Long agentKeyId) {
-        return itMonitorAgentKeyMapper.deleteById(agentKeyId);
+        return itMonitorAgentKeyMapper.deleteAgentKeyById(agentKeyId);
     }
 
     @Override
@@ -73,6 +75,7 @@ public class ItMonitorServiceImpl implements ItMonitorService {
         if (itMonitorAgent.getAgentIP() != null && !itMonitorAgent.getAgentIP().isEmpty()) {
             queryWrapper.likeRight("agent_ip", itMonitorAgent.getAgentIP());
         }
+        queryWrapper.orderByDesc("agent_id");
         return itMonitorAgentMapper.selectPage(page, queryWrapper);
     }
 

+ 1 - 1
src/main/resources/db/data.sql

@@ -157,7 +157,7 @@ from `it_monitor_agent_key`;
 INSERT INTO `it_monitor_agent_key` (`agent_key_id`, `key`, `remark`)
 VALUES (1, '123456', '备注1');
 INSERT INTO `it_monitor_agent_key` (`agent_key_id`, `key`, `remark`)
-VALUES (2, '654321', '');
+VALUES (2, '654321', 'key2');
 
 delete
 from `it_monitor_agent`;

+ 11 - 0
src/main/resources/mapper/ItMonitorAgentKeyMapper.xml

@@ -0,0 +1,11 @@
+<?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.ItMonitorAgentKeyMapper">
+
+    <delete id="deleteAgentKeyById">
+        DELETE
+        FROM it_monitor_agent_key
+        WHERE agent_key_id = #{agentKeyId}
+          AND (SELECT COUNT(1) FROM it_monitor_agent WHERE agent_key_id = #{agentKeyId}) = 0
+    </delete>
+</mapper>