From b9890950b5846e37e650442644470a48ec381aec Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Thu, 2 Nov 2023 15:01:55 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Amysql=20table=20info=20fix?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?FtpRootPath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/mapper/SysDatabaseMapper.java |  2 ++
 .../jeecg/modules/mapper/xml/sysDatabaseMapper.xml  | 13 +++++++++++++
 .../service/impl/SysDatabaseServiceImpl.java        |  4 ++++
 .../service/impl/SpectrumFileServiceImpl.java       |  2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)

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 4d2b48d6..569167b3 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
@@ -25,4 +25,6 @@ public interface SysDatabaseMapper extends BaseMapper<SysDatabase> {
     List<DBInfo> dbInfoOR(@Param("owner") String dataBase);
 
     List<DBInfo> dbIndexOR(@Param("owner") String dataBase);
+
+    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 9b131ecb..f260061a 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
@@ -84,4 +84,17 @@
             a.owner = #{owner}
         ORDER BY a.table_name
     </select>
+
+    <select id="dbInfoMY" resultType="org.jeecg.modules.base.dto.DBInfo">
+        SELECT
+            TABLE_NAME AS tableName,
+            TABLE_ROWS AS numRow,
+            round((data_length / 1024 / 1024), 2) AS dataSize,
+            round((index_length / 1024 / 1024), 2) AS indexSize
+        FROM
+            information_schema.tables
+        WHERE
+            table_schema = #{owner};
+        ORDER BY TABLE_NAME
+    </select>
 </mapper>
\ No newline at end of file
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 c2a1dd75..685e1708 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
@@ -255,4 +255,8 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
 
         return null;
     }
+
+    private List<DBInfo> dbInfoMY(String dataBase){
+        return baseMapper.dbInfoMY(dataBase);
+    }
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
index 55a32fd9..e35dd774 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
@@ -99,7 +99,7 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
             if (!created) return Result.error(Prompt.DIR_CREATE_FAIL + filePath);
             // 上传所有文件
             List<String> failList = new ArrayList<>();
-            String rootPath = spectrumPathProperties.getRootPath();
+            String rootPath = ftpUtil.getFtpRootPath();
             for (File oneFile : fileList) {
                 String fileName = oneFile.getName();
                 // 判断能谱文件名称是否符合规则，不符合则进行重命名