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 | 77 ++++++++++----------------------------
1 files changed, 20 insertions(+), 57 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 4e77bb0..aaa3922 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -9,6 +9,7 @@
import com.core.common.*;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
+import com.zy.crm.common.entity.PhoneCodeTypeParam;
import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.service.OssService;
import com.zy.crm.common.utils.FileSaveExampleUtil;
@@ -205,6 +206,10 @@
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
}
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
+
return R.ok();
}
@@ -290,6 +295,9 @@
if (!planService.updateById(hostPlan)) {
throw new CoolException("鏇存柊澶辫触锛岃閲嶈瘯");
}
+ if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("鍒涘缓鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
+ }
return R.ok("淇濆瓨鎴愬姛");
}
@@ -374,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) {
@@ -421,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
@@ -584,11 +543,6 @@
plan.setUpdateBy(getUserId());
plan.setUpdateTime(new Date());
- boolean sendSmsCode = smsCodeService.sendSmsCodeText(planner.getMobile());
- if (!sendSmsCode) {
- System.out.println("鐭俊鍙戦�佸け璐ワ紒");
- }
-
if (!planService.updateById(plan)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -599,6 +553,10 @@
planFoll.setUserId(planner.getId());
if (!planFollService.insert(planFoll)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ if (!smsCodeService.sendSmsCodeText(planner.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3)) {
+ return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
break;
case 2:
@@ -645,6 +603,9 @@
if (!planService.updateById(plan)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!smsCodeService.sendSmsCodeText(salesman.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ return R.ok("瀹℃牳鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
break;
case 3:
@@ -847,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){
@@ -860,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);
}
}
@@ -895,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