`fix`

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java

@@ -15,4 +15,6 @@ public interface OssService {
      */
     String selectUrlByIds(String ossIds);
 
+    void updateOssSortindex(Long ossId,Integer sortindex);
+
 }

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/TblArchivesFile.java

@@ -42,5 +42,7 @@ public class TblArchivesFile extends BaseEntity {
      */
     private String remark;
 
+    private Integer sortindex;
+
 
 }

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/bo/TblArchivesFileBo.java

@@ -23,26 +23,24 @@ public class TblArchivesFileBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 文件编号
      */
-    @NotNull(message = "文件编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long ossFileId;
 
     /**
      * 项目编号
      */
-    @NotNull(message = "项目编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long archiveId;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+
     private String remark;
 
 
+    private Integer sortindex;
 }

ruoyi-modules/ruoyi-filemanager/src/main/java/org/dromara/filemanager/domain/vo/TblArchivesFileVo.java

@@ -53,4 +53,5 @@ public class TblArchivesFileVo implements Serializable {
     private String remark;
 
 
+    private Integer sortindex;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java

@@ -76,6 +76,15 @@ public class SysOssController extends BaseController {
         return R.ok(list);
     }
 
+    @PutMapping("/update")
+    public R update(SysOssBo bo) {
+        if(bo.getOssId()!=null && bo.getSortindex()!=null){
+            ossService.updateOssSortindex(bo.getOssId(),bo.getSortindex());
+            return R.ok();
+        }
+        return R.ok();
+    }
+
     /**
      * 上传OSS对象存储
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java

@@ -49,4 +49,6 @@ public class SysOss extends TenantEntity {
 
     private Long size;
 
+    private Integer sortindex;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java

@@ -50,4 +50,6 @@ public class SysOssBo extends BaseEntity {
 
     private String qiuquan;
 
+    private Integer sortindex;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java

@@ -70,5 +70,7 @@ public class SysOssVo implements Serializable {
 
     private Long size;
 
+    private Integer sortindex;
+
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java

@@ -39,4 +39,6 @@ public interface ISysOssService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     TableDataInfo<SysOssFilesVo> queryPageFileList(SysOssBo sysOss,PageQuery pageQuery);
+
+    void updateOssSortindex(Long ossId, Integer sortindex);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java

@@ -64,20 +64,32 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         return TableDataInfo.build(result);
     }
 
+
+
     @Override
     public List<SysOssVo> listByIds(Collection<Long> ossIds) {
         List<SysOssVo> list = new ArrayList<>();
-        for (Long id : ossIds) {
-            SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
+        list = baseMapper.selectVoBatchIds(ossIds);
+        for (SysOssVo vo : list) {
             if (ObjectUtil.isNotNull(vo)) {
                 try {
-                    list.add(this.matchingUrl(vo));
+                    vo = this.matchingUrl(vo);
                 } catch (Exception ignored) {
-                    // 如果oss异常无法连接则将数据直接返回
-                    list.add(vo);
                 }
             }
+
         }
+//        for (Long id : ossIds) {
+//            SysOssVo vo = baseMapper.selectVoById(id);
+//            if (ObjectUtil.isNotNull(vo)) {
+//                try {
+//                    list.add(this.matchingUrl(vo));
+//                } catch (Exception ignored) {
+//                    // 如果oss异常无法连接则将数据直接返回
+//                    list.add(vo);
+//                }
+//            }
+//        }
         return list;
     }
 
@@ -98,6 +110,14 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         return String.join(StringUtils.SEPARATOR, list);
     }
 
+    @Override
+    public void updateOssSortindex(Long ossId, Integer sortindex) {
+        SysOss sysOss = new SysOss();
+        sysOss.setOssId(ossId);
+        sysOss.setSortindex(sortindex);
+        baseMapper.updateById(sysOss);
+    }
+
     private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
@@ -113,7 +133,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         return lqw;
     }
 
-    @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
+//    @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
     @Override
     public SysOssVo getById(Long ossId) {
         return baseMapper.selectVoById(ossId);