update

mec-biz/src/main/java/com/ym/mec/biz/service/UserLoginService.java

@@ -0,0 +1,11 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.auth.api.entity.SysUser;
+
+public interface UserLoginService{
+    Integer getUserId();
+
+    SysUser getUser();
+
+    SysUser queryUserById(Integer userId);
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/UserLoginServiceImpl.java

@@ -0,0 +1,42 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.service.UserLoginService;
+import com.ym.mec.common.exception.BizException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class UserLoginServiceImpl implements UserLoginService {
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Override
+    public Integer getUserId(){
+        return Optional.ofNullable(sysUserFeignService.queryUserInfo())
+                .map(SysUser::getId)
+                .orElseThrow(() -> new BizException("请登录"));
+    }
+
+    @Override
+    public SysUser getUser(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Optional.ofNullable(sysUser)
+                .map(SysUser::getId)
+                .orElseThrow(() -> new BizException("请登录"));
+        return sysUser;
+    }
+
+    @Override
+    public SysUser queryUserById(Integer userId) {
+        SysUser user = sysUserFeignService.queryUserById(userId);
+        Optional.ofNullable(user)
+                .map(SysUser::getId)
+                .orElseThrow(() -> new BizException("用户信息获取失败"));
+        return user;
+    }
+}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -1,23 +1,21 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ImUserFriendDto;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
 import com.ym.mec.biz.service.ImGroupNoticeService;
 import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.biz.service.ImUserFriendService;
+import com.ym.mec.biz.service.UserLoginService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @RequestMapping("imGroup")
@@ -35,17 +33,12 @@ public class ImGroupController extends BaseController {
 	private ImGroupNoticeService imGroupNoticeService;
 
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private UserLoginService userLoginService;
 
 	@ApiOperation("查询群列表")
 	@GetMapping(value = "/queryGroupList")
 	public Object queryGroupList(String search,String groupType) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,groupType));
+		return succeed(imGroupService.queryByUserId(userLoginService.getUserId(), search,groupType));
 	}
 
 	@ApiOperation("查询群详情")
@@ -66,28 +59,22 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询群学生列表")
 	@GetMapping(value = "/queryGroupStudentList")
 	public Object queryGroupStudentList(String imGroupId) {
-
 		return succeed(imGroupService.queryMemberById(imGroupId).stream().filter(e -> StringUtils.isBlank(e.getRoleType())).collect(Collectors.toList()));
 	}
 
 	@ApiOperation("查询群成员详情")
 	@GetMapping(value = "/queryGroupMemberDetail")
 	public Object queryGroupMemberDetail(String imGroupId, Integer userId) {
-
 		return succeed(imGroupService.queryMember(imGroupId, userId));
 	}
 
 	@ApiOperation("查询好友详情")
 	@GetMapping(value = "/queryFriendDetail")
 	public Object queryFriendDetail(Integer userId) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		ImUserFriendDto dto = imUserFriendService.queryFriendDetail(sysUser.getId(), userId);
+		ImUserFriendDto dto = imUserFriendService.queryFriendDetail(userLoginService.getUserId(), userId);
 		if (dto == null) {
 			dto = new ImUserFriendDto();
-			SysUser user = sysUserFeignService.queryUserById(userId);
+			SysUser user = userLoginService.queryUserById(userId);
 			dto.setFriend(user);
 			if (user.getUserType().contains("STUDENT")) {
 				dto.setFriendNickname(user.getUsername());
@@ -102,23 +89,13 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询好友列表")
 	@GetMapping(value = "/queryFriendList")
 	public Object queryFriendList(String search) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-
-		return succeed(imUserFriendService.queryFriendListByUserId(sysUser.getId(), search));
+		return succeed(imUserFriendService.queryFriendListByUserId(userLoginService.getUserId(), search));
 	}
 
 	@ApiOperation("查询好友中的学生列表")
 	@GetMapping(value = "/queryFriendStudentList")
 	public Object queryFriendStudentList(String search) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-
-		return succeed(imUserFriendService.queryFriendListByUserId(sysUser.getId(), search).stream().filter(e -> StringUtils.isBlank(e.getTags()))
+		return succeed(imUserFriendService.queryFriendListByUserId(userLoginService.getUserId(), search).stream().filter(e -> StringUtils.isBlank(e.getTags()))
 				.collect(Collectors.toList()));
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -12,6 +12,7 @@ import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.biz.service.ImUserFriendService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,13 +20,12 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @RequestMapping("imGroup")
@@ -51,11 +51,9 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询群列表")
 	@GetMapping(value = "/queryGroupList")
 	public HttpResponseResult<List<ImGroup>> queryGroupList(String search,String groupType) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		return succeed(imGroupService.queryByUserId(sysUser.getId(), search,groupType));
+		Integer userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).map(SysUser::getId).
+				orElseThrow(() -> new BizException("请登录"));
+		return succeed(imGroupService.queryByUserId(userId, search,groupType));
 	}
 
 	@ApiOperation("查询群详情")
@@ -103,11 +101,9 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询好友详情")
 	@GetMapping(value = "/queryFriendDetail")
 	public HttpResponseResult<ImUserFriendDto> queryFriendDetail(Integer userId) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		ImUserFriendDto dto = imUserFriendService.queryFriendDetail(sysUser.getId(), userId);
+		Integer currentUserId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).map(SysUser::getId).
+				orElseThrow(() -> new BizException("请登录"));
+		ImUserFriendDto dto = imUserFriendService.queryFriendDetail(currentUserId, userId);
 		if (dto == null) {
 			dto = new ImUserFriendDto();
 			SysUser user = sysUserFeignService.queryUserById(userId);
@@ -127,23 +123,17 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询好友列表")
 	@GetMapping(value = "/queryFriendList")
 	public HttpResponseResult<List<ImUserFriendDto>> queryFriendList(String search) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-
-		return succeed(imUserFriendService.queryFriendListByUserId(sysUser.getId(), search));
+		Integer userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).map(SysUser::getId).
+				orElseThrow(() -> new BizException("请登录"));
+		return succeed(imUserFriendService.queryFriendListByUserId(userId, search));
 	}
 
 	@ApiOperation("查询好友中的学生列表")
 	@GetMapping(value = "/queryFriendStudentList")
 	public HttpResponseResult<List<ImUserFriendDto>> queryFriendStudentList(String search) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-
-		return succeed(imUserFriendService.queryFriendListByUserId(sysUser.getId(), search).stream().filter(e -> StringUtils.isBlank(e.getTags()))
+		Integer userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).map(SysUser::getId).
+				orElseThrow(() -> new BizException("请登录"));
+		return succeed(imUserFriendService.queryFriendListByUserId(userId, search).stream().filter(e -> StringUtils.isBlank(e.getTags()))
 				.collect(Collectors.toList()));
 	}