记得上下班打卡 | git大法好,push需谨慎

Commit 1bf89704 authored by anjiabin's avatar anjiabin

提交chime社交相关

parent 0502b3b9
package com.liquidnet.service.chime.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -18,6 +19,7 @@ import lombok.Data;
public class ChimeUserTagDto {
private static final long serialVersionUID = 5325511589667456214L;
@ApiModelProperty(position = 0, value = "用户ID[64]")
@JsonIgnore
private String userId;
@ApiModelProperty(position = 1, value = "标签code")
private String tagCode;
......
......@@ -24,4 +24,6 @@ public interface IChimeUserService {
ChimeUserInfoDto createChimeUserInfo(ChimeUserRegisterReqDto reqDto);
boolean updateUserTags(String userId,String tags);
ChimeUserInfoDto getUserByUserId(String userId);
}
......@@ -138,5 +138,4 @@ public class ChimePerformanceController {
PagedResult<ChimeUserInfoDto> pageInfo = chimePerformanceService.getUserListByCon(reqDto);
return ResponseDto.success(pageInfo);
}
}
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.chime.dto.ChimeUserInfoDto;
import com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto;
import com.liquidnet.service.chime.dto.ChimeUserRegisterRespDto;
import com.liquidnet.service.chime.service.IChimeUserService;
......@@ -14,10 +15,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
......@@ -83,4 +81,16 @@ public class ChimeUserController {
boolean rs = chimeUserService.updateUserTags(userId,tags);
return ResponseDto.success(rs);
}
@GetMapping("getUserByUserId")
@ApiOperation("查询单个用户信息")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "userId", value = "用户ID", required = true)
})
public ResponseDto<ChimeUserInfoDto> getUserByUserId(
@RequestParam(defaultValue = "") String userId
) {
ChimeUserInfoDto userInfoDto = chimeUserService.getUserByUserId(userId);
return ResponseDto.success(userInfoDto);
}
}
......@@ -3,6 +3,7 @@ package com.liquidnet.service.chime.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.common.third.easemob.util.EasemobUtil;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
......@@ -121,4 +122,18 @@ public class ChimeUserServiceImpl implements IChimeUserService {
}
return dataUtils.updateUserTagMapping(userId,userTagList);
}
@Override
public ChimeUserInfoDto getUserByUserId(String userId) {
ChimeUserInfoVo chimeUserInfoVo = dataUtils.getUserByUserId(userId);
if(StringUtil.isNotNull(chimeUserInfoVo)){
ChimeUserInfoDto chimeUserInfoDto = ChimeUserInfoDto.getNew();
BeanUtil.copy(chimeUserInfoVo,chimeUserInfoDto);
chimeUserInfoDto.setPassWord("123456");
//获取标签
chimeUserInfoDto.setUserTags(dataUtils.getUserTagList(userId));
return chimeUserInfoDto;
}
return null;
}
}
......@@ -2,6 +2,7 @@ package com.liquidnet.service.chime.utils;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.chime.dto.ChimeUserTagDto;
import com.liquidnet.service.chime.vo.mongo.ChimeUserInfoVo;
import com.liquidnet.service.chime.vo.mongo.ChimeUserTagsMappingVo;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
......@@ -56,6 +57,17 @@ public class DataUtils {
return rsList.size()>0;
}
public ChimeUserInfoVo getUserByUserId(String userId){
Query query = Query.query(Criteria.where("userId").is(userId));
ChimeUserInfoVo chimeUserInfoVo = mongoTemplate.findOne(query,ChimeUserInfoVo.class,ChimeUserInfoVo.class.getSimpleName());
return chimeUserInfoVo;
}
public List<ChimeUserTagDto> getUserTagList(String userId){
Query query= Query.query(Criteria.where("userId").is(userId));
return mongoTemplate.find(query, ChimeUserTagDto.class,ChimeUserTagsMappingVo.class.getSimpleName());
}
/**
* 根据订单id 获取 订单vo 详情
*
......
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