From 3006962315de5e94dc9a9e80e8e33f4ef12f0b5b Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 24 Dec 2025 15:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/web/service/data/StorageService.java     |  5 +++--
 .../java/com/bonus/data/mapper/DISystemInfoMapper.java | 10 ++++++++++
 .../com/bonus/data/service/DISystemInfoService.java    | 10 ++++++++++
 .../data/service/impl/DSystemInfoServiceImpl.java      |  6 ++++++
 .../src/main/resources/mapper/DStorageMapper.xml       |  1 +
 .../src/main/resources/mapper/DSystemInfoMapper.xml    |  5 +++++
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/service/data/StorageService.java b/bonus-admin/src/main/java/com/bonus/web/service/data/StorageService.java
index 855300f..86076fa 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/data/StorageService.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/data/StorageService.java
@@ -38,12 +38,13 @@ public class StorageService {
         StorageVo vo = null;
         try {
             List<StorageVo> results = StorageScanner.scanAllStorages(1L);
-            StorageVo totalVo = StorageScanner.mergeStorageData(results, 1L, "TOTAL_SYSTEM_STORAGE");
+            StorageVo totalVo = StorageScanner.mergeStorageData(results, 1L, "1");
             if (Objects.nonNull(totalVo)) {
                 // 保存存储信息
                 try {
-                    totalVo.setSystemStorageId(1L);
                     diStorageService.saveStorageInfo(totalVo);
+                    // 更新设备信息的存储
+
                 } catch (Exception e) {
                     log.error(e.toString(), e);
                 }
diff --git a/bonus-data/src/main/java/com/bonus/data/mapper/DISystemInfoMapper.java b/bonus-data/src/main/java/com/bonus/data/mapper/DISystemInfoMapper.java
index 7f396a6..3d02458 100644
--- a/bonus-data/src/main/java/com/bonus/data/mapper/DISystemInfoMapper.java
+++ b/bonus-data/src/main/java/com/bonus/data/mapper/DISystemInfoMapper.java
@@ -1,6 +1,7 @@
 package com.bonus.data.mapper;
 
 import com.bonus.common.domain.data.dto.ParamsDto;
+import com.bonus.common.domain.data.vo.StorageVo;
 import com.bonus.common.domain.data.vo.SystemInfoVo;
 import org.springframework.stereotype.Repository;
 
@@ -39,4 +40,13 @@ public interface DISystemInfoMapper {
      * @date 2025/12/24 13:20
      */
     void updateAlarmStatus(ParamsDto dto);
+
+    /**
+     * 更新设备存储
+     * @param vo
+     * @return void
+     * @author cwchen
+     * @date 2025/12/24 15:07
+     */
+    void updateSystemStorage(StorageVo vo);
 }
diff --git a/bonus-data/src/main/java/com/bonus/data/service/DISystemInfoService.java b/bonus-data/src/main/java/com/bonus/data/service/DISystemInfoService.java
index 90af97f..0456f0a 100644
--- a/bonus-data/src/main/java/com/bonus/data/service/DISystemInfoService.java
+++ b/bonus-data/src/main/java/com/bonus/data/service/DISystemInfoService.java
@@ -1,6 +1,7 @@
 package com.bonus.data.service;
 
 import com.bonus.common.domain.data.dto.ParamsDto;
+import com.bonus.common.domain.data.vo.StorageVo;
 import com.bonus.common.domain.data.vo.SystemInfoVo;
 
 /**
@@ -37,4 +38,13 @@ public interface DISystemInfoService {
      * @date 2025/12/24 13:20
      */
     void updateAlarmStatus(ParamsDto dto);
+
+    /**
+     * 更新设备存储
+     * @param vo
+     * @return void
+     * @author cwchen
+     * @date 2025/12/24 15:06
+     */
+    void updateSystemStorage(StorageVo vo);
 }
diff --git a/bonus-data/src/main/java/com/bonus/data/service/impl/DSystemInfoServiceImpl.java b/bonus-data/src/main/java/com/bonus/data/service/impl/DSystemInfoServiceImpl.java
index 3638ab2..86b0540 100644
--- a/bonus-data/src/main/java/com/bonus/data/service/impl/DSystemInfoServiceImpl.java
+++ b/bonus-data/src/main/java/com/bonus/data/service/impl/DSystemInfoServiceImpl.java
@@ -1,6 +1,7 @@
 package com.bonus.data.service.impl;
 
 import com.bonus.common.domain.data.dto.ParamsDto;
+import com.bonus.common.domain.data.vo.StorageVo;
 import com.bonus.common.domain.data.vo.SystemInfoVo;
 import com.bonus.data.mapper.DISystemInfoMapper;
 import com.bonus.data.service.DISystemInfoService;
@@ -35,4 +36,9 @@ public class DSystemInfoServiceImpl implements DISystemInfoService {
     public void updateAlarmStatus(ParamsDto dto) {
         diSystemInfoMapper.updateAlarmStatus(dto);
     }
+
+    @Override
+    public void updateSystemStorage(StorageVo vo) {
+        diSystemInfoMapper.updateSystemStorage(vo);
+    }
 }
diff --git a/bonus-data/src/main/resources/mapper/DStorageMapper.xml b/bonus-data/src/main/resources/mapper/DStorageMapper.xml
index 5c4faf7..bdd4ed4 100644
--- a/bonus-data/src/main/resources/mapper/DStorageMapper.xml
+++ b/bonus-data/src/main/resources/mapper/DStorageMapper.xml
@@ -11,6 +11,7 @@
                used_capacity AS usedCapacity
         FROM tb_system_storage
         WHERE storage_type = '1'
+        ORDER BY system_storage_id DESC
         LIMIT 1
     </select>
     <!--保存存储信息-->
diff --git a/bonus-data/src/main/resources/mapper/DSystemInfoMapper.xml b/bonus-data/src/main/resources/mapper/DSystemInfoMapper.xml
index e98ccad..1cd8251 100644
--- a/bonus-data/src/main/resources/mapper/DSystemInfoMapper.xml
+++ b/bonus-data/src/main/resources/mapper/DSystemInfoMapper.xml
@@ -37,4 +37,9 @@
     <update id="updateAlarmStatus">
         UPDATE tb_system_info SET alarm_status = #{alarmStatus} WHERE system_id = #{systemId}
     </update>
+
+    <!--更新设备存储-->
+    <update id="updateSystemStorage">
+        UPDATE tb_system_info SET tf_storage = #{capacity} WHERE system_id = #{systemId}
+    </update>
 </mapper>