From 68e6e63670351165cc3c9aede5d7a1b5b7ba3fde Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 14 九月 2023 14:22:39 +0800
Subject: [PATCH] #CstmrId$
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 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 c27f9fb..178b6ef 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -19,13 +19,8 @@
import com.zy.crm.common.utils.SetOfUtils;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.controller.result.FollowerTableVo;
-import com.zy.crm.manager.entity.Order;
-import com.zy.crm.manager.entity.Plan;
-import com.zy.crm.manager.entity.PlanFoll;
-import com.zy.crm.manager.entity.PlanType;
-import com.zy.crm.manager.service.PlanFollService;
-import com.zy.crm.manager.service.PlanService;
-import com.zy.crm.manager.service.PlanTypeService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
@@ -64,6 +59,8 @@
private DeptService deptService;
@Autowired
private OssService ossService;
+ @Autowired
+ private PriOnline2Service priOnline2Service;
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
@@ -110,7 +107,7 @@
}
@RequestMapping(value = "/plan/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "娣诲姞瑙勫垝鐢宠鍗�")
@Transactional
public R add(@RequestParam Map<String, Object> param) {
// pre
@@ -159,7 +156,7 @@
}
@RequestMapping(value = "/plan/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏇存柊瑙勫垝鐢宠鍗�")
@Transactional
public R update(@RequestParam Map<String, Object> param){
// String planNeed = null;
@@ -212,10 +209,14 @@
}
@RequestMapping(value = "/plan/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎瑙勫垝鐢宠鍗�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- planService.deleteById(id);
+ int priOnline2 = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("item_id", id));
+ if (priOnline2!=0){
+ return R.error("瀛樺湪鍏宠仈鐨勬牳浠峰崟锛岀姝㈠垹闄わ紒锛侊紒");
+ }
+ planService.deleteById(id);
}
return R.ok();
}
@@ -225,9 +226,11 @@
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);
- String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+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("-");
@@ -258,21 +261,21 @@
return "";
}
- @RequestMapping(value = "/plan/delete/file/auth")
-// @ManagerAuth
- public R deleteFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
- planId="涓婁紶鏂囦欢-20";
- String[] split = planId.split("-");
- int id = Integer.parseInt(split[1]);
- System.out.println("---寮�濮�---");
- String savePath = "D:/crm/plan/file/"+id+"/"+file.getName(); // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
- try{
- FileSaveExampleUtil.deleteFilesInDirectory(savePath);
- }catch (Exception e){
- return R.error();
- }
- return R.ok();
- }
+// @RequestMapping(value = "/plan/delete/file/auth")
+//// @ManagerAuth
+// public R deleteFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
+// planId="涓婁紶鏂囦欢-20";
+// String[] split = planId.split("-");
+// int id = Integer.parseInt(split[1]);
+// System.out.println("---寮�濮�---");
+// String savePath = "D:/crm/plan/file/"+id+"/"+file.getName(); // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+// try{
+// FileSaveExampleUtil.deleteFilesInDirectory(savePath);
+// }catch (Exception e){
+// return R.error();
+// }
+// return R.ok();
+// }
@RequestMapping(value = "/plan/view/file/auth")
// @ManagerAuth
@@ -298,7 +301,7 @@
@RequestMapping(value = "/plan/download/file/auth")
// @ManagerAuth
- public void downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
+ public R downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
// System.out.println("---寮�濮�---");
// MultipartFile
try{
@@ -306,16 +309,18 @@
String name= names[1];
// ResponseEntity<Resource> resourceResponseEntity = FileSaveExampleUtil.downloadFile(downloadUrl, response);
// return R.ok(resourceResponseEntity);
- ossService.download(name);
+ String download = ossService.download(name);
+ return R.ok().add(download);
}catch (Exception e){
}
+ return R.error();
}
@PostMapping(value = "/plan/approval/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀹℃壒鐢宠鍗�")
public R approval(@RequestParam Long planId,
@RequestParam(required = false) Long plannerId){
Plan plan = planService.selectById(planId);
@@ -571,6 +576,7 @@
for (Plan plan : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
+// map.put("value", plan.getName()+"---"+plan.getId());
map.put("value", plan.getName());
result.add(map);
}
--
Gitblit v1.9.1