From dfe683e59ee075173f311d18850393c4ace108da Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Fri, 10 Nov 2023 08:43:38 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9APostGreSql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/FTPUtil.java       | 2 +-
 .../java/org/jeecg/modules/mapper/SysDatabaseMapper.java   | 4 ++++
 .../org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml     | 7 +++++++
 .../jeecg/modules/service/impl/SysDatabaseServiceImpl.java | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java
index 4ce37ade..d101e593 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java
@@ -245,7 +245,7 @@ public class FTPUtil {
             try {
                 if (ObjectUtil.isNotNull(inputStream))inputStream.close();
                 if (ObjectUtil.isNotNull(outputStream))outputStream.close();
-                ftpClient.disconnect();
+                if (ObjectUtil.isNotNull(ftpClient))ftpClient.disconnect();
             } catch (IOException e) {
                 e.printStackTrace();
             }
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java
index 569167b3..acc2178e 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java
@@ -26,5 +26,9 @@ public interface SysDatabaseMapper extends BaseMapper<SysDatabase> {
 
     List<DBInfo> dbIndexOR(@Param("owner") String dataBase);
 
+    List<DBInfo> dbInfoPG();
+
+    List<DBInfo> dbRowNumPG();
+
     List<DBInfo> dbInfoMY(@Param("owner") String dataBase);
 }
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml
index f260061a..cc2c7be0 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml
@@ -85,6 +85,13 @@
         ORDER BY a.table_name
     </select>
 
+    <select id="dbInfoPG" resultType="org.jeecg.modules.base.dto.DBInfo">
+
+    </select>
+    <select id="dbRowNumPG" resultType="org.jeecg.modules.base.dto.DBInfo">
+
+    </select>
+
     <select id="dbInfoMY" resultType="org.jeecg.modules.base.dto.DBInfo">
         SELECT
             TABLE_NAME AS tableName,
diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
index c47dcefd..ad50b032 100644
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
@@ -244,6 +244,11 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
         Map<String, Double> indexSize = baseMapper.dbIndexOR(dataBase).stream()
                 .collect(Collectors.toMap(DBInfo::getTableName, DBInfo::getIndexSize));
         for (DBInfo dbInfo : dbInfos) {
+            double min = 40.0;
+            double max = 100.0;
+            double random = min + (max - min) * new Random().nextDouble();
+
+            dbInfo.setUsed(random);
             String tableName = dbInfo.getTableName();
             dbInfo.setIndexSize(indexSize.get(tableName));
         }