群聊

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -1,23 +1,23 @@
 package com.yonge.cooleshow.teacher.controller;
 
 
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupResultDto;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.utils.validator.ValidationKit;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 即时通讯群组(ImGroup)表控制层
@@ -35,14 +35,13 @@ public class ImGroupController extends BaseController {
     @Resource
     private ImGroupService imGroupService;
     @Resource
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @ApiOperation("创建群聊")
     @PostMapping(value = "/create")
     public HttpResponseResult create(@Valid @RequestBody ImGroup imGroup, BindingResult bindingResult) throws Exception {
         ValidationKit.ignoreFields(bindingResult,"id");
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        imGroup.setCreateBy(sysUser.getId());
+        imGroup.setCreateBy(sysUserService.getUserId());
         imGroupService.create(imGroup);
         return succeed();
     }
@@ -64,8 +63,7 @@ public class ImGroupController extends BaseController {
     @PostMapping(value = "/queryAll")
     public HttpResponseResult<List<ImGroup>> queryAll(@Valid @RequestBody ImGroupSearchDto imGroupSearchDto, BindingResult bindingResult) throws Exception {
         ValidationKit.ignoreFields(bindingResult,"createUserId");
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        imGroupSearchDto.setUserId(sysUser.getId());
+        imGroupSearchDto.setUserId(sysUserService.getUserId());
         return succeed(imGroupService.queryAll(imGroupSearchDto));
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupMemberAuditController.java

@@ -1,14 +1,12 @@
 package com.yonge.cooleshow.teacher.controller;
 
 
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupMemberAudit;
 import com.yonge.cooleshow.biz.dal.enums.AuditStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.queryInfo.ImGroupMemberAuditQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.ImGroupMemberAuditService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
@@ -41,14 +39,13 @@ public class ImGroupMemberAuditController extends BaseController {
     @Resource
     private ImGroupMemberAuditService imGroupMemberAuditService;
     @Resource
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @ApiOperation("申请入群")
     @PostMapping(value = "/apply")
     public HttpResponseResult apply(@Valid @RequestBody ImGroupMemberAudit imGroupMemberAudit) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
         imGroupMemberAudit.setRoleType(ImGroupMemberRoleType.TEACHER);
-        imGroupMemberAudit.setUserId(sysUser.getId());
+        imGroupMemberAudit.setUserId(sysUserService.getUserId());
         imGroupMemberAuditService.apply(imGroupMemberAudit);
         return succeed();
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImUserFriendController.java

@@ -3,10 +3,9 @@ package com.yonge.cooleshow.teacher.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.*;
@@ -33,7 +32,7 @@ public class ImUserFriendController extends BaseController {
     @Resource
     private ImUserFriendService imUserFriendService;
     @Resource
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @SuppressWarnings("unchecked")//因为返回是集合，这里提示你集合内容较多排序可能回耗费性能
     @ApiImplicitParams({
@@ -42,10 +41,9 @@ public class ImUserFriendController extends BaseController {
     @ApiOperation("获取通讯录成员列表")
     @PostMapping(value = "/queryAll")
     public HttpResponseResult<List<ImUserFriend>> queryAll(@RequestBody Map<String, Object> params) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
         Object search = params.get("search");
         List<ImUserFriend> record = imUserFriendService.list(Wrappers.<ImUserFriend>query().lambda()
-                .eq(ImUserFriend::getUserId, sysUser.getId())
+                .eq(ImUserFriend::getUserId, sysUserService.getUserId())
                 .and(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
                         e -> e.eq(ImUserFriend::getFriendId, search)
                                 .or().like(ImUserFriend::getFriendNickname, search))
@@ -58,5 +56,6 @@ public class ImUserFriendController extends BaseController {
     public HttpResponseResult<ImUserFriend> getDetail(@ApiParam(value = "用户编号", required = true) @PathVariable("userId") Long userId) throws Exception {
         return succeed(imUserFriendService.getDetail(userId));
     }
+
 }