fix：取消add/update时状态更新,提高线程状态更新频率

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/DatabaseStatusConn.java

@@ -1,28 +0,0 @@
-package org.jeecg.modules.base.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("database_status_conn")
-public class DatabaseStatusConn extends JeecgEntity {
-
-    // private Double memory;
-    //
-    // private Integer loginNum;
-
-    private Integer connNum;
-
-    // private Double respTime; // 单位: 秒(S)
-    //
-    // private Double logResidue; // 单位 MB
-    //
-    // private Double dataSize; // 单位 MB
-
-    private String databaseId;
-
-    private LocalDateTime collectTime;
-}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/DatabaseStatusManager.java

@@ -51,7 +51,7 @@ public class DatabaseStatusManager {
         }
 
         private void init(){
-            sleepTime = 30 * 60 * 1000; // 睡眠时间30min
+            sleepTime = 5 * 1000; // 睡眠时间5s
             databaseService = SpringContextUtils.getBean(ISysDatabaseService.class);
         }
     }

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/EmailStatusManager.java

@@ -54,7 +54,7 @@ public class EmailStatusManager {
         }
 
         private void init(){
-            sleepTime = 30 * 60 * 1000; // 睡眠时间30min
+            sleepTime = 5 * 1000; // 睡眠时间5s
             emailService = SpringContextUtils.getBean(ISysEmailService.class);
         }
     }

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/ServerStatusManager.java

@@ -45,7 +45,7 @@ public class ServerStatusManager {
         }
 
         private void init(){
-            sleepTime = 30 * 60 * 1000; // 睡眠时间30min
+            sleepTime = 5 * 1000; // 睡眠时间5s
             serverService = SpringContextUtils.getBean(ISysServerService.class);
         }
     }

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseStatusController.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.controller;
-
-import io.swagger.annotations.Api;
-import org.jeecg.modules.service.IDatabaseStatusConnService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("sysDatabaseStatus")
-@Api(value = "数据库状态信息管理", tags = "数据库状态信息管理")
-public class SysDatabaseStatusController {
-
-    @Autowired
-    private IDatabaseStatusConnService databaseStatusService;
-
-
-}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/DatabaseStatusConnMapper.java

@@ -1,8 +0,0 @@
-package org.jeecg.modules.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.base.dto.DatabaseStatusConn;
-
-public interface DatabaseStatusConnMapper extends BaseMapper<DatabaseStatusConn> {
-
-}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/DatabaseStatusConnMapper.xml

@@ -1,5 +0,0 @@
-<?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="org.jeecg.modules.mapper.DatabaseStatusConnMapper">
-
-</mapper>

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IDatabaseStatusConnService.java

@@ -1,9 +0,0 @@
-package org.jeecg.modules.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.base.dto.DatabaseStatusConn;
-
-public interface IDatabaseStatusConnService extends IService<DatabaseStatusConn> {
-
-
-}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/DatabaseStatusConnServiceImpl.java

@@ -1,12 +0,0 @@
-package org.jeecg.modules.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.base.dto.*;
-import org.jeecg.modules.mapper.DatabaseStatusConnMapper;
-import org.jeecg.modules.service.IDatabaseStatusConnService;
-import org.springframework.stereotype.Service;
-
-@Service("databaseStatusConnService")
-public class DatabaseStatusConnServiceImpl extends ServiceImpl<DatabaseStatusConnMapper, DatabaseStatusConn> implements IDatabaseStatusConnService {
-
-}

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java

@@ -130,7 +130,7 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
         }
         boolean success = save(sysDatabase);
         if (success){
-            saveOrUpdateStatus(sysDatabase);
+            // saveOrUpdateStatus(sysDatabase);
             return Result.OK(Prompt.ADD_SUCC);
         }
         return Result.error(Prompt.ADD_ERR);
@@ -173,7 +173,7 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
         }
         boolean success = updateById(sysDatabase);
         if (success) {
-            saveOrUpdateStatus(sysDatabase);
+            // saveOrUpdateStatus(sysDatabase);
             return Result.OK(Prompt.UPDATE_SUCC);
         }
         return Result.error(Prompt.UPDATE_ERR);

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java

@@ -144,7 +144,7 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> i
         sysEmail.setIsQiye(isQiye(username));
         boolean success = save(sysEmail);
         if (success) {
-            saveOrUpdateStatus(sysEmail);
+            // saveOrUpdateStatus(sysEmail);
             return Result.OK(Prompt.ADD_SUCC);
         }
         return Result.error(Prompt.ADD_ERR);
@@ -167,7 +167,7 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> i
         sysEmail.setIsQiye(isQiye(username));
         boolean success = updateById(sysEmail);
         if (success) {
-            saveOrUpdateStatus(sysEmail);
+            // saveOrUpdateStatus(sysEmail);
             // 更新邮箱发件服务器到Redis
             // updateSender();
             return Result.OK(Prompt.UPDATE_SUCC);

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java

@@ -146,7 +146,8 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
         if (CollUtil.isNotEmpty(list(wrapper)))
             return Result.error("IP Address" + Prompt.NOT_REPEAT);
 
-        boolean success = saveOrUpatedStatus(sysServer);
+        // boolean success = saveOrUpatedStatus(sysServer);
+        boolean success = this.saveOrUpdate(sysServer);
         if (success)
             return Result.OK(Prompt.ADD_SUCC);
         return Result.error(Prompt.ADD_ERR);
@@ -172,7 +173,8 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
             if (CollUtil.isNotEmpty(list(wrapper)))
                 return Result.error("IP Address" + Prompt.NOT_REPEAT);
         }
-        boolean success = saveOrUpatedStatus(sysServer);
+        // boolean success = saveOrUpatedStatus(sysServer);
+        boolean success = this.saveOrUpdate(sysServer);
         if (success)
             return Result.OK(Prompt.UPDATE_SUCC);
         return Result.error(Prompt.UPDATE_ERR);