瀏覽代碼

app上传代理商标识

lyhzzz 2 年之前
父節點
當前提交
4ba9b90734

+ 2 - 1
src/main/java/com/fdkankan/manage/service/IAppFileService.java

@@ -8,6 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -23,7 +24,7 @@ public interface IAppFileService extends IService<AppFile> {
 
     PageInfo pageList(AppFileParam param);
 
-    List<String> agentList(String agentName);
+    Set<String> agentList(String agentName);
 
     void saveByParam(AppFile param);
 }

+ 10 - 6
src/main/java/com/fdkankan/manage/service/impl/AppFileServiceImpl.java

@@ -24,10 +24,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -87,8 +84,15 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
     }
 
     @Override
-    public List<String> agentList(String agentName) {
-        return mangeUploadToOssUtil.listKeys(FilePath.appOssPath);
+    public Set<String> agentList(String agentName) {
+        List<String> strings = mangeUploadToOssUtil.listKeys(FilePath.appOssPath);
+        Set<String> keys = new HashSet<>();
+        for (String key : strings) {
+            String agent = key.replace(FilePath.appOssPath,"");
+            String[] split = agent.split("/");
+            keys.add(split[0]);
+        }
+        return keys;
     }
 
     @Override

+ 5 - 3
src/main/java/com/fdkankan/manage/test/TestController.java

@@ -1,21 +1,23 @@
 package com.fdkankan.manage.test;
 
+import cn.hutool.core.io.FileUtil;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.FilePath;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
+import java.util.*;
 
 @RestController
 public class TestController {
 
     @RequestMapping("/test")
     public ResultData test(){
-        String date = Dateutils.getDate(new Date());
-        return ResultData.ok(date);
+        return ResultData.ok();
     }
 
 }