From f2a0324e4d7280fb54ebb439953b733b0608bf51 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 十一月 2023 09:38:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 57 +++++----------------------------------------------------
1 files changed, 5 insertions(+), 52 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 3865da3..aaa3922 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -382,30 +382,6 @@
return R.ok();
}
- @RequestMapping(value = "/plan/insert/file/auth")
-// @ManagerAuth
- 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]);
- String url = "http://zhongyang-ftpserver.oss-cn-hangzhou.aliyuncs.com/" + filename;
- planService.increasePlanUrl(id, url, filename, filesize);
- return R.ok();
- } catch (Exception e) {
- System.out.println(e);
- return R.error();
- }
- }
-
private String getFileSuffix(String filename) {
int dotIndex = filename.lastIndexOf(".");
if (dotIndex > 0 && dotIndex < filename.length() - 1) {
@@ -429,31 +405,6 @@
// }
// return R.ok();
// }
-
- @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);
- 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();
- }
- }
@RequestMapping(value = "/plan/download/file/auth")
// @ManagerAuth
@@ -857,10 +808,11 @@
List<Map<String, Object>> result = new ArrayList<>();
// for (Plan plan : page.getRecords()){
for (Plan plan : plans){
+ User user = userService.selectById(plan.getUserId());
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
// map.put("value", plan.getName()+"---"+plan.getId());
- map.put("value", plan.getName());
+ map.put("value", plan.getName()+"---"+user.getNickname());
result.add(map);
}
if (type==1){
@@ -870,10 +822,11 @@
wrapper2.eq("assistant_host_sign",1);
List<Plan> plan2s = planService.selectList(wrapper2);
for (Plan plan : plan2s){
+ User user = userService.selectById(plan.getUserId());
Map<String, Object> map = new HashMap<>();
map.put("id", plan.getId());
// map.put("value", plan.getName()+"---"+plan.getId());
- map.put("value", plan.getName());
+ map.put("value", plan.getName()+"---"+user.getNickname());
result.add(map);
}
}
@@ -905,7 +858,7 @@
* excel瀵煎叆
*/
@PostMapping(value = "/plan/excel/import/auth")
- @ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
+ @ManagerAuth(memo = "瀹㈡埛淇℃伅Excel瀵煎叆")
// @Transactional
public R planExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
--
Gitblit v1.9.1