From 564bf7ab6a639c2c4557d35b8fd9b51dca60a738 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:32:34 +0800
Subject: [PATCH] #规则完善

---
 src/main/java/com/zy/crm/manager/controller/PlanController.java |   68 +++++++++++++++++++++++++++------
 1 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 2e95f41..89c6475 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -14,6 +14,7 @@
 import com.core.exception.CoolException;
 import com.zy.crm.common.entity.RouteCollectCountType;
 import com.zy.crm.common.model.SettleDto;
+import com.zy.crm.common.service.OssService;
 import com.zy.crm.common.utils.FileSaveExampleUtil;
 import com.zy.crm.common.utils.SetOfUtils;
 import com.zy.crm.common.web.BaseController;
@@ -61,6 +62,8 @@
     private PlanTypeService planTypeService;
     @Autowired
     private DeptService deptService;
+    @Autowired
+    private OssService ossService;
 
     @GetMapping(value = "/plan/{id}/auth")
     @ManagerAuth
@@ -220,16 +223,41 @@
     @RequestMapping(value = "/plan/insert/file/auth")
 //    @ManagerAuth
     public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
-        String[] split = planId.split("-");
-        int id = Integer.parseInt(split[1]);
-        System.out.println("---寮�濮�---");
-        String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
         try{
-            FileSaveExampleUtil.saveFile(file, savePath);
+            InputStream inputStream = file.getInputStream();
+            // 鑾峰彇鏂囦欢鐨勫唴瀹圭被鍨�
+            String contentType = file.getContentType();
+            String suffix = getFileSuffix(file.getOriginalFilename());
+            String url = ossService.upload(inputStream, suffix,contentType);
+//            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
+            String[] names = url.split("com/");
+            String name= names[1];
+            String[] split = planId.split("-");
+            int id = Integer.parseInt(split[1]);
+            planService.increasePlanUrl(id,url,name,file.getSize());
+
+            /*String[] split = planId.split("-");
+            int id = Integer.parseInt(split[1]);
+            System.out.println("---寮�濮�---");
+            String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+            try{
+                FileSaveExampleUtil.saveFile(file, savePath);
+            }catch (Exception e){
+                return R.error();
+            }*/
+            return R.ok();
         }catch (Exception e){
+            System.out.println(e);
             return R.error();
         }
-        return R.ok();
+    }
+
+    private String getFileSuffix(String filename) {
+        int dotIndex = filename.lastIndexOf(".");
+        if (dotIndex > 0 && dotIndex < filename.length() - 1) {
+            return filename.substring(dotIndex + 1);
+        }
+        return "";
     }
 
     @RequestMapping(value = "/plan/delete/file/auth")
@@ -252,9 +280,18 @@
 //    @ManagerAuth
     public R viewFile(@RequestParam("planId") String planId){
         int id = Integer.parseInt(planId);
-        String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+//        String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
         try{
-            List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
+            List<Integer> ids = planService.selectPlanUrlId(id);
+            List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
+            for (int id2 : ids){
+                String url = planService.selectPlanUrlPlanIdUrl(id2);
+                String name = planService.selectPlanUrlPlanIdName(id2);
+                Long size = planService.selectPlanUrlPlanIdSize(id2);
+                FileSaveExampleUtil.FileDTO dto = new FileSaveExampleUtil.FileDTO(name,size,url);
+                fileDTOS.add(dto);
+            }
+//            List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
             return R.ok(fileDTOS);
         }catch (Exception e){
             return R.error();
@@ -264,14 +301,19 @@
     @RequestMapping(value = "/plan/download/file/auth")
 //    @ManagerAuth
     public R downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
-        System.out.println("---寮�濮�---");
+//        System.out.println("---寮�濮�---");
 //        MultipartFile
         try{
-            ResponseEntity<Resource> resourceResponseEntity = FileSaveExampleUtil.downloadFile(downloadUrl, response);
-            return R.ok(resourceResponseEntity);
+            String[] names = downloadUrl.split("com/");
+            String name= names[1];
+//            ResponseEntity<Resource> resourceResponseEntity = FileSaveExampleUtil.downloadFile(downloadUrl, response);
+//            return R.ok(resourceResponseEntity);
+            String download = ossService.download(name);
+            return R.ok().add(download);
         }catch (Exception e){
-            return R.error();
+
         }
+        return R.error();
     }
 
 
@@ -533,7 +575,7 @@
         for (Plan plan : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
             map.put("id", plan.getId());
-            map.put("value", plan.getName());
+            map.put("value", plan.getName()+"---"+plan.getId());
             result.add(map);
         }
         return R.ok(result);

--
Gitblit v1.9.1