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 { List dbIndexOR(@Param("owner") String dataBase); + List dbInfoPG(); + + List dbRowNumPG(); + List 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 + + +