瀏覽代碼

教务端修改群成员备注,
部分接口在修改用户名的时候同步通讯录昵称
user/setPassword

zouxuan 4 年之前
父節點
當前提交
55d7359058

+ 3 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.web.controller;
 package com.ym.mec.auth.web.controller;
 
 
+import com.ym.mec.im.WebFeignService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParams;
@@ -56,7 +57,7 @@ public class UserController extends BaseController {
 	@Autowired
 	@Autowired
 	private IdGeneratorService smsCodeService;
 	private IdGeneratorService smsCodeService;
 	@Autowired
 	@Autowired
-	private ESealPlugin eSealPlugin;
+	private WebFeignService webFeignService;
 	@Value("${message.debugMode}")
 	@Value("${message.debugMode}")
 	private boolean debugMode;
 	private boolean debugMode;
 	@Autowired
 	@Autowired
@@ -150,6 +151,7 @@ public class UserController extends BaseController {
 		}else {
 		}else {
 			sysUser.setUsername(username);
 			sysUser.setUsername(username);
 		}
 		}
+		webFeignService.updateNickName(sysUser.getId(),username);
 		if(StringUtils.isEmpty(sysUser.getImToken())){
 		if(StringUtils.isEmpty(sysUser.getImToken())){
 			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 			sysUser.setImToken(register.getToken());
 			sysUser.setImToken(register.getToken());

+ 20 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -3,6 +3,9 @@ package com.ym.mec.biz.service.impl;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +41,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 	@Autowired
 	@Autowired
 	private ImFeignService imFeignService;
 	private ImFeignService imFeignService;
 
 
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
 	@Override
 	@Override
 	public BaseDAO<Long, ImGroup> getDAO() {
 	public BaseDAO<Long, ImGroup> getDAO() {
 		return imGroupDao;
 		return imGroupDao;
@@ -120,8 +126,21 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 	}
 	}
 
 
 	@Override
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public int updateNickName(Integer userId, String nickName) {
 	public int updateNickName(Integer userId, String nickName) {
-		return imGroupDao.updateNickname(userId,nickName);
+		//修改群成员备注
+		int i = imGroupDao.updateNickname(userId, nickName);
+		//修改sysUser名称,如果包含学员的角色,那么修改userName。否则修改realName
+		SysUser sysUser = sysUserFeignService.queryUserById(userId);
+		if(sysUser.getUserType().contains("STUDENT")){
+			sysUser.setUsername(nickName);
+		}else {
+			sysUser.setRealName(nickName);
+		}
+		sysUserFeignService.updateSysUser(sysUser);
+		//同步融云基本信息
+		imFeignService.update(new ImUserModel(sysUser.getId().toString(),nickName,sysUser.getAvatar()));
+		return i;
 	}
 	}
 
 
 }
 }

+ 3 - 0
mec-client-api/src/main/java/com/ym/mec/im/WebFeignService.java

@@ -18,4 +18,7 @@ public interface WebFeignService {
 	
 	
 	@RequestMapping(value = "api/isPurchasedPracticeCourse")
 	@RequestMapping(value = "api/isPurchasedPracticeCourse")
 	Boolean isPurchasedPracticeCourse(@RequestParam("userId") Integer userId);
 	Boolean isPurchasedPracticeCourse(@RequestParam("userId") Integer userId);
+
+	@RequestMapping(value = "api/updateNickName")
+	int updateNickName(@RequestParam("userId") Integer userId,@RequestParam("nickName") String nickName);
 }
 }

+ 6 - 0
mec-client-api/src/main/java/com/ym/mec/im/fallback/WebFeignServiceFallback.java

@@ -3,6 +3,7 @@ package com.ym.mec.im.fallback;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import com.ym.mec.im.WebFeignService;
 import com.ym.mec.im.WebFeignService;
+import org.springframework.web.bind.annotation.RequestParam;
 
 
 @Component
 @Component
 public class WebFeignServiceFallback implements WebFeignService {
 public class WebFeignServiceFallback implements WebFeignService {
@@ -21,4 +22,9 @@ public class WebFeignServiceFallback implements WebFeignService {
 	public Boolean isPurchasedPracticeCourse(Integer userId) {
 	public Boolean isPurchasedPracticeCourse(Integer userId) {
 		return false;
 		return false;
 	}
 	}
+
+	@Override
+	public int updateNickName(@RequestParam("userId") Integer userId, @RequestParam("nickName") String nickName) {
+		return 0;
+	}
 }
 }

+ 9 - 0
mec-web/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.biz.service.PracticeGroupService;
 import com.ym.mec.biz.service.PracticeGroupService;
 import com.ym.mec.biz.service.PracticeLessonApplyService;
 import com.ym.mec.biz.service.PracticeLessonApplyService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.controller.BaseController;
@@ -31,6 +32,8 @@ public class APIController extends BaseController {
 	
 	
 	@Autowired
 	@Autowired
 	private PracticeGroupService practiceGroupService;
 	private PracticeGroupService practiceGroupService;
+	@Autowired
+	private ImGroupService imGroupService;
 
 
 	@GetMapping("/createCashAccount")
 	@GetMapping("/createCashAccount")
 	public Boolean createCashAccount(Integer userId) {
 	public Boolean createCashAccount(Integer userId) {
@@ -53,9 +56,15 @@ public class APIController extends BaseController {
 	public Object practiceSum() {
 	public Object practiceSum() {
 		return succeed(practiceLessonApplyService.practiceSum());
 		return succeed(practiceLessonApplyService.practiceSum());
 	}
 	}
+
 	@GetMapping("/isPurchasedPracticeCourse")
 	@GetMapping("/isPurchasedPracticeCourse")
 	public Boolean isPurchasedPracticeCourse(Integer userId) {
 	public Boolean isPurchasedPracticeCourse(Integer userId) {
 		return practiceGroupService.isPurchasedPracticeCourse(userId);
 		return practiceGroupService.isPurchasedPracticeCourse(userId);
 	}
 	}
 
 
+	@GetMapping("/updateNickName")
+	public int updateNickName(Integer userId,String nickName) {
+		return imGroupService.updateNickName(userId,nickName);
+	}
+
 }
 }