From ea85cc2dd034540151074a66192e3198b1303a8c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 08 十一月 2022 10:31:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index dd2ba66..45603f1 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -11,12 +11,17 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.controller.result.CstmrFollowerTableVo;
import com.zy.crm.manager.entity.Cstmr;
+import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
+import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
import com.zy.crm.system.entity.Dic;
+import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DicService;
+import com.zy.crm.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -181,7 +186,7 @@
*/
@PostMapping(value = "/cstmr/excel/import/auth")
@ManagerAuth(memo = "鐢叉柟鍗曚綅Excel瀵煎叆")
- @Transactional
+// @Transactional
public R cstmrExcelImport(MultipartFile file) throws IOException {
InputStream inStream = file.getInputStream();
String fileMime = file.getContentType();
@@ -210,7 +215,8 @@
String uuid = dataFormatter.formatCellValue(row.getCell(0));
if (!Cools.isEmpty(uuid)) {
if (cstmrService.selectByUuid(hostId, uuid) != null) {
- throw new CoolException(uuid + "瀹㈡埛浠ｅ彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+// throw new CoolException(uuid + "瀹㈡埛浠ｅ彿宸插瓨鍦紝璇烽噸鏂板鍏�");
+ continue;
} else {
cstmr.setUuid(uuid);
}
@@ -290,4 +296,60 @@
}
+ /******************************** 璺熻繘浜� ***************************************/
+
+ @Autowired
+ private CstmrFollService cstmrFollService;
+ @Autowired
+ private UserService userService;
+
+ @RequestMapping(value = "/cstmr/followers/table/auth")
+ @ManagerAuth
+ public R cstmrFollowersTable(@RequestParam("cstmrId") Long cstmrId) {
+ List<CstmrFoll> cstmrFolls = cstmrFollService.selectList(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId));
+ List<CstmrFollowerTableVo> result = new ArrayList<>();
+ for (CstmrFoll cstmrFoll : cstmrFolls) {
+ User user = userService.selectById(cstmrFoll.getUserId());
+ CstmrFollowerTableVo vo = new CstmrFollowerTableVo();
+ vo.setUserId(user.getId());
+ vo.setUserName(user.getNickname());
+ result.add(vo);
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping(value = "/cstmr/followers/add/auth")
+ @ManagerAuth
+ @Transactional
+ public R cstmrFollowersAdd(@RequestParam("cstmrId") Long cstmrId,
+ @RequestParam("followerIds[]") Long[] followerIds) {
+ if (Cools.isEmpty(cstmrId, followerIds)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ for (Long userId : followerIds) {
+ if (cstmrFollService.selectCount(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId).eq("user_id", userId)) == 0) {
+ CstmrFoll cstmrFoll = new CstmrFoll();
+ cstmrFoll.setCstmrId(cstmrId);
+ cstmrFoll.setUserId(userId);
+ if (!cstmrFollService.insert(cstmrFoll)) {
+ throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @RequestMapping(value = "/cstmr/followers/remove/auth")
+ @ManagerAuth
+ public R cstmrFollowersRemove(@RequestParam("cstmrId") Long cstmrId,
+ @RequestParam("userId") Long userId) {
+ if (Cools.isEmpty(cstmrId, userId)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (!cstmrFollService.delete(new EntityWrapper<CstmrFoll>().eq("cstmr_id", cstmrId).eq("user_id", userId))) {
+ throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1