Prechádzať zdrojové kódy

update AdminFileController

reghao 5 dní pred
rodič
commit
158ff99062

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/AdminFileController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.file.app.model.dto.OssConfigDto;
-import cn.reghao.tnb.file.app.model.po.OssConfig;
+import cn.reghao.tnb.file.app.model.vo.OssConfigInfo;
 import cn.reghao.tnb.file.app.service.AdminFileService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,7 +29,7 @@ public class AdminFileController {
     @Operation(summary = "获取文件存储列表", description = "N")
     @GetMapping(value = "/file_store", produces = MediaType.APPLICATION_JSON_VALUE)
     public String getFileStores() {
-        List<OssConfig> list = adminFileService.getOssConfigList();
+        List<OssConfigInfo> list = adminFileService.getOssConfigList();
         return WebResult.success(list);
     }
 

+ 4 - 0
file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/OssConfigMapper.java

@@ -1,9 +1,12 @@
 package cn.reghao.tnb.file.app.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
+import cn.reghao.jutil.jdk.web.db.Page;
 import cn.reghao.tnb.file.app.model.po.OssConfig;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author reghao
  * @date 2026-03-02 21:48:46
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface OssConfigMapper extends BaseMapper<OssConfig> {
     OssConfig findByOssType(int ossType);
+    List<OssConfig> findByPage(Page page);
 }

+ 3 - 3
file/file-service/src/main/java/cn/reghao/tnb/file/app/model/constant/OssType.java

@@ -13,10 +13,10 @@ public enum OssType {
 
     private final int code;
     private final String desc;
-    private static Map<Integer, String> descMap = new HashMap<>();
+    private static Map<Integer, OssType> descMap = new HashMap<>();
     static {
         for (OssType type : OssType.values()) {
-            descMap.put(type.code, type.desc);
+            descMap.put(type.code, type);
         }
     }
 
@@ -48,7 +48,7 @@ public enum OssType {
         return desc;
     }
 
-    public static String getDescByCode(int code) {
+    public static OssType getByCode(int code) {
         return descMap.get(code);
     }
 }

+ 32 - 0
file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/OssConfigInfo.java

@@ -0,0 +1,32 @@
+package cn.reghao.tnb.file.app.model.vo;
+
+import cn.reghao.jutil.jdk.web.db.BaseObject;
+import cn.reghao.tnb.file.app.model.constant.OssType;
+import cn.reghao.tnb.file.app.model.dto.OssConfigDto;
+import cn.reghao.tnb.file.app.model.po.OssConfig;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author reghao
+ * @date 2026-03-02 21:47:20
+ */
+@NoArgsConstructor
+@Data
+public class OssConfigInfo {
+    private String ossType;
+    private String endpoint;
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String bucketName;
+
+    public OssConfigInfo(OssConfig ossConfig) {
+        this.ossType = OssType.getByCode(ossConfig.getOssType()).name();
+        this.endpoint = ossConfig.getEndpoint();
+        this.accessKeyId = ossConfig.getAccessKeyId();
+        this.accessKeySecret = ossConfig.getAccessKeySecret();
+        this.bucketName = ossConfig.getBucketName();
+    }
+}

+ 8 - 8
file/file-service/src/main/java/cn/reghao/tnb/file/app/service/AdminFileService.java

@@ -1,8 +1,12 @@
 package cn.reghao.tnb.file.app.service;
 
+import cn.reghao.jutil.jdk.web.db.Page;
+import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.file.app.db.mapper.OssConfigMapper;
+import cn.reghao.tnb.file.app.model.constant.OssType;
 import cn.reghao.tnb.file.app.model.dto.OssConfigDto;
 import cn.reghao.tnb.file.app.model.po.OssConfig;
+import cn.reghao.tnb.file.app.model.vo.OssConfigInfo;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
@@ -25,13 +29,9 @@ public class AdminFileService {
         ossConfigMapper.save(ossConfig);
     }
 
-    public List<OssConfig> getOssConfigList() {
-        int ossType = 1;
-        OssConfig ossConfig = ossConfigMapper.findByOssType(ossType);
-        if (ossConfig != null) {
-            return List.of(ossConfig);
-        }
-
-        return Collections.emptyList();
+    public List<OssConfigInfo> getOssConfigList() {
+        Page page = new Page(1, ConstantId.PAGE_SIZE);
+        List<OssConfig> list = ossConfigMapper.findByPage(page);
+        return list.stream().map(OssConfigInfo::new).toList();
     }
 }

+ 4 - 0
file/file-service/src/main/resources/mapper/file/OssConfigMapper.xml

@@ -21,4 +21,8 @@
         where oss_type=#{ossType}
         limit 1
     </select>
+    <select id="findByPage" resultType="cn.reghao.tnb.file.app.model.po.OssConfig">
+        select *
+        from file_oss_config
+    </select>
 </mapper>