From fa3737fbe1a83ccf9e8ad8c6c8e81483f987ab5b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 08 十一月 2023 13:51:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 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 eb74659..0cd26b0 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -257,31 +257,23 @@
@RequestMapping(value = "/plan/insert/file/auth")
// @ManagerAuth
- public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
- try{
- 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];
+ public R insertFile(@RequestParam("planId") String planId, @RequestParam("filename") String filename, @RequestParam("filesize") Long filesize) {
+ try {
+// InputStream inputStream = file.getInputStream();
+// // 鑾峰彇鏂囦欢鐨勫唴瀹圭被鍨�
+// String contentType = file.getContentType();
+// String url = ossService.upload(inputStream, file.getOriginalFilename(), 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();
- }*/
+ String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
+ planService.increasePlanUrl(id, url, filename, filesize);
return R.ok();
- }catch (Exception e){
+ } catch (Exception e) {
System.out.println(e);
return R.error();
}
@@ -314,11 +306,14 @@
@RequestMapping(value = "/plan/view/file/auth")
// @ManagerAuth
public R viewFile(@RequestParam("planId") String planId){
+ List<FileSaveExampleUtil.FileDTO> fileDTOS = new ArrayList<>();
+ if (Cools.isEmpty(planId)){
+ return R.ok(fileDTOS);
+ }
int id = Integer.parseInt(planId);
// String savePath = "D:/crm/plan/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
try{
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);
--
Gitblit v1.9.1