Browse Source

扫描服务接口返回数据格式进行调整

zhaojinyu 6 days ago
parent
commit
93db3fbc79

+ 3 - 2
base-modules/service-file/src/main/java/com/ruoyi/file/controller/FileUpdateInfoController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.file.controller;
 
 import com.ruoyi.file.domain.FileUpdateInfo;
+import com.ruoyi.file.domain.FileWithId;
 import com.ruoyi.file.service.FileUpdateInfoService;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
@@ -95,11 +96,11 @@ public class FileUpdateInfoController {
 
     // 扫描服务所在目录下的文件
     @GetMapping("/scan")
-    public ApiResult<CommonPage<String>> scanFilesInServiceDir(
+    public ApiResult<CommonPage<FileWithId>> scanFilesInServiceDir(
             @RequestParam(required = false, defaultValue = "1") int current,
             @RequestParam(required = false, defaultValue = "10") int size) {
         try {
-            CommonPage<String> fileNamesPage = fileUpdateInfoService.scanFilesInServiceDir(current, size);
+            CommonPage<FileWithId> fileNamesPage = fileUpdateInfoService.scanFilesInServiceDir(current, size);
             return ApiResult.success(fileNamesPage);
         } catch (Exception e) {
             return ApiResult.error("扫描文件失败: " + e.getMessage());

+ 14 - 0
base-modules/service-file/src/main/java/com/ruoyi/file/domain/FileWithId.java

@@ -0,0 +1,14 @@
+package com.ruoyi.file.domain;
+
+import lombok.Data;
+
+@Data
+public class FileWithId {
+    private Long id;
+    private String fileName;
+
+    public FileWithId(Long id, String fileName) {
+        this.id = id;
+        this.fileName = fileName;
+    }
+}

+ 2 - 1
base-modules/service-file/src/main/java/com/ruoyi/file/service/FileUpdateInfoService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.file.service;
 
 import com.ruoyi.file.domain.FileUpdateInfo;
+import com.ruoyi.file.domain.FileWithId;
 import com.usky.common.core.bean.CommonPage;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -36,7 +37,7 @@ public interface FileUpdateInfoService {
     void controlApplication(String fileName, String action) throws Exception;
 
     // 扫描 JAR 文件所在的目录并获取文件列表
-    CommonPage<String> scanFilesInServiceDir(
+    CommonPage<FileWithId> scanFilesInServiceDir(
             @RequestParam(required = false, defaultValue = "1") int current,
             @RequestParam(required = false, defaultValue = "10") int size) throws Exception;
 }

+ 9 - 2
base-modules/service-file/src/main/java/com/ruoyi/file/service/impl/FileUpdateInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.file.domain.FileUpdateInfo;
+import com.ruoyi.file.domain.FileWithId;
 import com.ruoyi.file.mapper.FileUpdateInfoMapper;
 import com.ruoyi.file.service.FileUpdateInfoService;
 import com.usky.common.core.bean.CommonPage;
@@ -267,7 +268,7 @@ public class FileUpdateInfoServiceImpl implements FileUpdateInfoService {
 
     //扫描服务所在目录下的文件
     @Override
-    public CommonPage<String> scanFilesInServiceDir(int current, int size) throws Exception {
+    public CommonPage<FileWithId> scanFilesInServiceDir(int current, int size) throws Exception {
         // 获取 JAR 文件所在的目录
         String serviceDir = FileUpdateInfo.getServiceDir();
         File dir = new File(serviceDir);
@@ -307,7 +308,13 @@ public class FileUpdateInfoServiceImpl implements FileUpdateInfoService {
 
         List<String> pageFileNames = newFileNames.subList(start, end);
 
+        // 创建包含 id 的文件信息列表
+        List<FileWithId> fileWithIds = new ArrayList<>();
+        for (int i = 0; i < pageFileNames.size(); i++) {
+            fileWithIds.add(new FileWithId((long) (start + i + 1), pageFileNames.get(i)));
+        }
+
         // 返回分页结果
-        return new CommonPage<>(pageFileNames, total, size, current);
+        return new CommonPage<>(fileWithIds, total, size, current);
     }
 }