|
@@ -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);
|
|
|
}
|
|
|
}
|