Skip to content

X
xyqb-user2
Commit 10f070f1 authored by 唐峰's avatar 唐峰
Browse files
Options

旧接口头像兼容处理

parent dc11c6d7
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 5 deletions
src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/UserCenterController.java
View file @ 10f070f1
......@@ -8,6 +8,7 @@ import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.entity.UserInfoEntity;
import cn.quantgroup.xyqb.model.JsonResult;
import cn.quantgroup.xyqb.model.UserInfoEntityBean;
import cn.quantgroup.xyqb.repository.IUserInfoRepository;
import cn.quantgroup.xyqb.service.user.IUserService;
import cn.quantgroup.xyqb.util.TenantUtil;
......@@ -16,7 +17,13 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.web.bind.annotation.*;
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.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
......@@ -44,8 +51,9 @@ public class UserCenterController implements IBaseController {
if (userId == null) {
return JsonResult.buildErrorStateResult("用户 ID 不能为空", null);
}
//UserAttached userAttached = userCenterService.searchUserAttachedByUserId(userId,tenantId);
UserInfoEntity userAttached = userInfoRepository.findByUserIdAndTenantId(userId, tenantId);
return JsonResult.buildSuccessResultGeneric(userAttached);
return JsonResult.buildSuccessResultGeneric(UserInfoEntityBean.covert(userAttached));
}
/**
......@@ -70,8 +78,9 @@ public class UserCenterController implements IBaseController {
if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
tenantId = TenantUtil.TENANT_DEFAULT;
}
//List<UserAttached> userAttachedList = userCenterService.searchUserAttachedListByUserId(userIds, tenantId);
List<UserInfoEntity> userInfoEntityList = userInfoRepository.findByTenantIdAndUserIdIn(tenantId,userIds);
return JsonResult.buildSuccessResultGeneric(userInfoEntityList);
return JsonResult.buildSuccessResultGeneric(UserInfoEntityBean.covert(userInfoEntityList));
}
......@@ -91,6 +100,13 @@ public class UserCenterController implements IBaseController {
if (null == userId || userId == 0L) {
return JsonResult.buildErrorStateResult("该用户不存在", null);
}
/*UserAttached userAttached = userCenterService.searchUserAttachedByUserId(userId,tenantId);
if (null != userAttached) {
log.info("获取用户昵称:{}", userAttached.getNick());
return JsonResult.buildSuccessResult(null, userAttached.getNick());
}*/
UserInfoEntity userInfoEntity = userInfoRepository.findByUserIdAndTenantId(userId,tenantId);
if (null != userInfoEntity) {
return JsonResult.buildSuccessResult(null, userInfoEntity.getNickName());
......@@ -115,6 +131,8 @@ public class UserCenterController implements IBaseController {
if (null == userId || userId == 0L) {
return JsonResult.buildErrorStateResult("该用户不存在", null);
}
/*UserAttached userAttached = userCenterService.saveUserNick(userId, nick,tenantId);
return JsonResult.buildSuccessResult(null, userAttached.getNick());*/
UserInfoEntity userInfoEntity = userInfoRepository.findByUserIdAndTenantId(userId,tenantId);
if(userInfoEntity ==null){
userInfoEntity = new UserInfoEntity();
......@@ -131,6 +149,9 @@ public class UserCenterController implements IBaseController {
if (null == userId || userId == 0L) {
return JsonResult.buildErrorStateResult("该用户不存在", null);
}
/*UserAttached userAttached = userCenterService.saveUserNick(userId, nick,tenantId);
return JsonResult.buildSuccessResult(null, userAttached.getNick());*/
UserInfoEntity userInfoEntity = userInfoRepository.findByUserIdAndTenantId(userId,tenantId);
if(userInfoEntity ==null){
userInfoEntity = new UserInfoEntity();
......@@ -151,6 +172,13 @@ public class UserCenterController implements IBaseController {
if (null == userId || userId == 0L) {
return JsonResult.buildErrorStateResult("该用户不存在", null);
}
/*UserAttached userAttached = userCenterService.saveUserAvatar(userId, avatarUrl,tenantId);
if (null == userAttached) {
log.error("保存用户头像昵称失败.");
return JsonResult.buildErrorStateResult("信息保存失败,请稍后再试.", null);
}
return JsonResult.buildSuccessResult("保存成功", userAttached);*/
UserInfoEntity userInfoEntity = userInfoRepository.findByUserIdAndTenantId(userId,tenantId);
if(userInfoEntity ==null){
userInfoEntity = new UserInfoEntity();
......@@ -160,7 +188,7 @@ public class UserCenterController implements IBaseController {
userInfoEntity.setPhoto(avatarUrl);
userInfoRepository.save(userInfoEntity);
return JsonResult.buildSuccessResult("保存成功", userInfoEntity);
return JsonResult.buildSuccessResult("保存成功", UserInfoEntityBean.covert(userInfoEntity));
}
/**
......@@ -183,6 +211,13 @@ public class UserCenterController implements IBaseController {
if (StringUtils.isBlank(avatarUrl)) {
avatarUrl = Constants.UserAvatar.AVATAR_DEFAULT;
}
/*UserAttached userAttached = userCenterService.saveUserAvatar(userId, avatarUrl,tenantId);
if (null == userAttached) {
log.error("保存用户头像昵称失败.");
return JsonResult.buildErrorStateResult("信息保存失败,请稍后再试.", null);
}
return JsonResult.buildSuccessResult("保存成功", userAttached);*/
UserInfoEntity userInfoEntity = userInfoRepository.findByUserIdAndTenantId(userId,tenantId);
if(userInfoEntity ==null){
userInfoEntity = new UserInfoEntity();
......@@ -192,7 +227,7 @@ public class UserCenterController implements IBaseController {
userInfoEntity.setPhoto(avatarUrl);
userInfoRepository.save(userInfoEntity);
return JsonResult.buildSuccessResult("保存成功", userInfoEntity);
return JsonResult.buildSuccessResult("保存成功", UserInfoEntityBean.covert(userInfoEntity));
}
/**
......@@ -255,4 +290,11 @@ public class UserCenterController implements IBaseController {
return null == user ? null : user.getId();
}
/*@GetMapping("/attach/listLimit/{id}")
public JsonResult queryUserAttachListLimit(@PathVariable Long id) {
//默认羊小咩租户
List<UserAttached> userAttachedList = userCenterService.queryUserAttachListLimit(id);
return JsonResult.buildSuccessResultGeneric(userAttachedList);
}*/
}
src/main/java/cn/quantgroup/xyqb/model/UserInfoEntityBean.java 0 → 100644
View file @ 10f070f1
package cn.quantgroup.xyqb.model;
import cn.quantgroup.xyqb.entity.UserInfoEntity;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import lombok.Data;
import javax.persistence.Column;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @Describe:
* @Created by tangfeng 2023/7/20 20:58
*/
@Data
public class UserInfoEntityBean extends UserInfoEntity {
/**
* 头像历史版本兼容
*/
private String avatar;
/**
* 昵称历史版本兼容
*/
private String nick;
public static UserInfoEntityBean covert(UserInfoEntity bean) {
if (bean == null) {
return null;
}
UserInfoEntityBean userInfoEntityBean = JSONObject.parseObject(JSON.toJSONString(bean), UserInfoEntityBean.class);
userInfoEntityBean.setAvatar(bean.getPhoto());
userInfoEntityBean.setNick(bean.getNickName());
return userInfoEntityBean;
}
public static List<UserInfoEntityBean> covert(List<UserInfoEntity> beans) {
if (beans == null) {
return null;
}
Map<Long, UserInfoEntity> userIdEntityMap = beans.stream().collect(Collectors.toMap(UserInfoEntity::getUserId, Function.identity(), (K1, K2) -> K1));
List<UserInfoEntityBean> list = JSONObject.parseObject(JSON.toJSONString(beans), new TypeReference<List<UserInfoEntityBean>>(){});
list.stream().forEach(userInfoEntityBean->{
UserInfoEntity bean = userIdEntityMap.get(userInfoEntityBean.getUserId());
userInfoEntityBean.setAvatar(bean.getPhoto());
userInfoEntityBean.setNick(bean.getNickName());
});
return list;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment