|
|
@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -10,11 +11,15 @@ 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.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
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.entity.ImGroup;
|
|
|
import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
|
|
|
import com.ym.mec.biz.service.ImGroupNoticeService;
|
|
|
import com.ym.mec.biz.service.ImGroupService;
|
|
|
@@ -56,6 +61,13 @@ public class ImGroupController extends BaseController {
|
|
|
return succeed(imGroupService.get(imGroupId));
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation("修改群信息")
|
|
|
+ @PostMapping(value = "/updateImGroup")
|
|
|
+ public Object updateImGroup(@RequestBody ImGroup imGroup) {
|
|
|
+ imGroup.setUpdateTime(new Date());
|
|
|
+ return succeed(imGroupService.update(imGroup));
|
|
|
+ }
|
|
|
+
|
|
|
@ApiOperation("查询群成员列表")
|
|
|
@GetMapping(value = "/queryGroupMemberList")
|
|
|
public Object queryGroupMemberList(Long imGroupId) {
|
|
|
@@ -85,7 +97,19 @@ public class ImGroupController extends BaseController {
|
|
|
return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
}
|
|
|
|
|
|
- return succeed(imUserFriendService.queryFriendDetail(sysUser.getId(), userId));
|
|
|
+ ImUserFriendDto dto = imUserFriendService.queryFriendDetail(sysUser.getId(), userId);
|
|
|
+ if (dto == null) {
|
|
|
+ dto = new ImUserFriendDto();
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
+ dto.setFriend(user);
|
|
|
+ if (user.getUserType().contains("TEACHER")) {
|
|
|
+ dto.setFriendNickname(user.getRealName());
|
|
|
+ } else {
|
|
|
+ dto.setFriendNickname(user.getUsername());
|
|
|
+ }
|
|
|
+ dto.setFriendId(userId);
|
|
|
+ }
|
|
|
+ return succeed(dto);
|
|
|
}
|
|
|
|
|
|
@ApiOperation("查询好友列表")
|
yonge