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

Skip to content

L
liquidnet-bus-v1
Commit 3a3fe559 authored by anjiabin's avatar anjiabin
Browse files
Options

提交chime社交相关

parent e59d1ef0
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 51 deletions
liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/service/IChimeUserService.java
View file @ 3a3fe559
......@@ -3,6 +3,7 @@ package com.liquidnet.service.chime.service;
import com.liquidnet.service.chime.dto.ChimeUserInfoDto;
import com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto;
import com.liquidnet.service.chime.dto.ChimeUserUpdateReqDto;
import com.liquidnet.service.chime.vo.mongo.ChimeUserInfoVo;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
......@@ -15,7 +16,7 @@ import com.liquidnet.service.chime.dto.ChimeUserUpdateReqDto;
*/
public interface IChimeUserService {
ChimeUserInfoDto createChimeUserInfo(ChimeUserRegisterReqDto reqDto);
ChimeUserInfoVo createChimeUserInfo(ChimeUserRegisterReqDto reqDto);
boolean updateUserInfo(ChimeUserUpdateReqDto reqDto);
......
liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/vo/mongo/ChimeUserInfoVo.java
View file @ 3a3fe559
......@@ -30,6 +30,10 @@ public class ChimeUserInfoVo {
private Boolean isOnLine;
@ApiModelProperty(position = 9,value = "用户标签")
private List<ChimeUserTagsMappingVo> userTagsVoList;
@ApiModelProperty(position = 15, value = "创建时间")
private String createdAt;
@ApiModelProperty(position = 15, value = "更新时间")
private String updatedAt;
private static final ChimeUserInfoVo obj = new ChimeUserInfoVo();
public static ChimeUserInfoVo getNew() {
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/biz/ChimeUserBiz.java
View file @ 3a3fe559
......@@ -9,7 +9,6 @@ import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoReq;
import com.liquidnet.service.adam.dto.vo.AdamTagVo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.chime.dto.ChimeJoinUserCountDto;
import com.liquidnet.service.chime.dto.ChimeUserTagDto;
import com.liquidnet.service.chime.dto.PerformanceDto;
import com.liquidnet.service.chime.utils.DataUtils;
import com.liquidnet.service.chime.utils.ObjectUtil;
......@@ -81,29 +80,29 @@ public class ChimeUserBiz {
* @param tags
* @return
*/
public List<ChimeUserTagDto> buildUserTagDtoList(String userId, String tags){
List<AdamTagVo> userTagVoList = ObjectUtil.getAdamTagVoArrayList();
List<ChimeUserTagDto> userTagDtoList = ObjectUtil.getChimeUserTagDtoList();
if(StringUtil.isNotEmpty(tags)){
ObjectMapper mapper = new ObjectMapper();
try {
userTagVoList = mapper.readValue(tags, new TypeReference<List<AdamTagVo>>() {});
} catch (JsonProcessingException e) {
e.printStackTrace();
log.error("createChimeUserInfo msg:{}",e.getMessage());
log.error("createChimeUserInfo error : ",e);
return null;
}
}
//设置用户id
userTagVoList.parallelStream().forEach(vo -> {
ChimeUserTagDto userTagDto = ChimeUserTagDto.getNew();
userTagDto.setTagCode(vo.getVal());
userTagDto.setTagDesc(vo.getDesc());
userTagDtoList.add(userTagDto);
});
return userTagDtoList;
}
// public List<ChimeUserTagDto> buildUserTagDtoList(String userId, String tags){
// List<AdamTagVo> userTagVoList = ObjectUtil.getAdamTagVoArrayList();
// List<ChimeUserTagDto> userTagDtoList = ObjectUtil.getChimeUserTagDtoList();
// if(StringUtil.isNotEmpty(tags)){
// ObjectMapper mapper = new ObjectMapper();
// try {
// userTagVoList = mapper.readValue(tags, new TypeReference<List<AdamTagVo>>() {});
// } catch (JsonProcessingException e) {
// e.printStackTrace();
// log.error("createChimeUserInfo msg:{}",e.getMessage());
// log.error("createChimeUserInfo error : ",e);
// return null;
// }
// }
// //设置用户id
// userTagVoList.parallelStream().forEach(vo -> {
// ChimeUserTagDto userTagDto = ChimeUserTagDto.getNew();
// userTagDto.setTagCode(vo.getVal());
// userTagDto.setTagDesc(vo.getDesc());
// userTagDtoList.add(userTagDto);
// });
// return userTagDtoList;
// }
/**
* 演出voList转换为DtoList
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/ChimeUserController.java
View file @ 3a3fe559
......@@ -3,10 +3,10 @@ package com.liquidnet.service.chime.controller;
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.ChimeUserUpdateReqDto;
import com.liquidnet.service.chime.service.IChimeUserService;
import com.liquidnet.service.chime.vo.mongo.ChimeUserInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -60,8 +60,8 @@ public class ChimeUserController {
reqDto.setUserId(userId);
reqDto.setSex(sex);
reqDto.setTags(tags);
ChimeUserInfoDto chimeUserInfoDto = chimeUserService.createChimeUserInfo(reqDto);
if(StringUtil.isNull(chimeUserInfoDto)){
ChimeUserInfoVo chimeUserInfoVo = chimeUserService.createChimeUserInfo(reqDto);
if(StringUtil.isNull(chimeUserInfoVo)){
return ResponseDto.failure("chime创建社交用户失败！");
}
return ResponseDto.success("创建成功！");
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/service/impl/ChimeUserServiceImpl.java
View file @ 3a3fe559
......@@ -7,7 +7,6 @@ import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.chime.biz.ChimeUserBiz;
import com.liquidnet.service.chime.dto.ChimeUserInfoDto;
import com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto;
import com.liquidnet.service.chime.dto.ChimeUserTagDto;
import com.liquidnet.service.chime.dto.ChimeUserUpdateReqDto;
import com.liquidnet.service.chime.service.IChimeUserService;
import com.liquidnet.service.chime.utils.DataUtils;
......@@ -17,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -42,19 +42,21 @@ public class ChimeUserServiceImpl implements IChimeUserService {
@Override
public ChimeUserInfoDto createChimeUserInfo(ChimeUserRegisterReqDto reqDto) {
public ChimeUserInfoVo createChimeUserInfo(ChimeUserRegisterReqDto reqDto) {
try {
ChimeUserInfoDto chimeUserInfoDto = ChimeUserInfoDto.getNew();
ChimeUserInfoVo chimeUserInfoVo = ChimeUserInfoVo.getNew();
if(StringUtil.isNotNull(reqDto)){
chimeUserInfoDto.setUserId(reqDto.getUserId());
chimeUserInfoDto.setSex(chimeUserBiz.getSexDesc(reqDto.getSex()));
chimeUserInfoDto.setJoinPerformanceId("-1");
List<ChimeUserTagDto> userTagList = chimeUserBiz.buildUserTagDtoList(reqDto.getUserId(), reqDto.getTags());
chimeUserInfoDto.setUserTags(userTagList);
chimeUserInfoVo.setUserId(reqDto.getUserId());
chimeUserInfoVo.setSex(chimeUserBiz.getSexDesc(reqDto.getSex()));
chimeUserInfoVo.setJoinPerformanceId("-1");
List<ChimeUserTagsMappingVo> userTagList = chimeUserBiz.buildUserTagVoList(reqDto.getUserId(), reqDto.getTags());
chimeUserInfoVo.setUserTagsVoList(userTagList);
chimeUserInfoVo.setCreatedAt(LocalDateTime.now().toString());
chimeUserInfoVo.setUpdatedAt(null);
//插入mongo
dataUtils.createChimeUser(chimeUserInfoDto);
dataUtils.createChimeUser(chimeUserInfoVo);
}
return chimeUserInfoDto;
return chimeUserInfoVo;
} catch (Exception e) {
log.error("创建社交用户异常 e：{}",e.getMessage());
}
......@@ -70,6 +72,7 @@ public class ChimeUserServiceImpl implements IChimeUserService {
chimeUserInfoVo.setUserId(reqDto.getUserId());
chimeUserInfoVo.setUserTagsVoList(userTagList);
chimeUserInfoVo.setSex(chimeUserBiz.getSexDesc(reqDto.getSex()));
chimeUserInfoVo.setUpdatedAt(LocalDateTime.now().toString());
dataUtils.updateChimeUser(chimeUserInfoVo);
} catch (Exception e) {
e.printStackTrace();
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/utils/DataUtils.java
View file @ 3a3fe559
package com.liquidnet.service.chime.utils;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.chime.constant.ChimeConstant;
import com.liquidnet.service.chime.dto.ChimeJoinUserCountDto;
import com.liquidnet.service.chime.dto.ChimeUserInfoDto;
import com.liquidnet.service.chime.dto.ChimeUserTagDto;
import com.liquidnet.service.chime.vo.mongo.ChimeUserInfoVo;
import com.liquidnet.service.chime.vo.mongo.ChimeUserTagsMappingVo;
......@@ -36,11 +34,9 @@ public class DataUtils {
/**
* 注册社交用户
* @param chimeUserInfoDto
* @param chimeUserInfoVo
*/
public void createChimeUser(ChimeUserInfoDto chimeUserInfoDto){
ChimeUserInfoVo chimeUserInfoVo = ChimeUserInfoVo.getNew();
BeanUtil.copy(chimeUserInfoDto,chimeUserInfoVo);
public void createChimeUser(ChimeUserInfoVo chimeUserInfoVo){
chimeUserInfoVo.setMid(ChimeConstant.getNewUserId());
chimeUserInfoVo.setIsOnLine(true);
mongoTemplate.save(chimeUserInfoVo,ChimeUserInfoVo.class.getSimpleName());
......@@ -63,6 +59,7 @@ public class DataUtils {
Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(chimeUserInfoVo)));
update.set("sex", chimeUserInfoVo.getSex());
update.set("userTagsVoList", chimeUserInfoVo.getUserTagsVoList());
update.set("updatedAt", chimeUserInfoVo.getUpdatedAt());
UpdateResult result = mongoTemplate.updateFirst(query,update,ChimeUserInfoVo.class,ChimeUserInfoVo.class.getSimpleName());
log.info("updateChimeUser result:{}",result.toString());
}
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/test/java/com/liquidnet/service/chime/test/TestDataUtils.java
View file @ 3a3fe559
......@@ -98,17 +98,17 @@ public class TestDataUtils {
int num = i+1;
Future future = executorService.submit(new Callable(){
public Object call() throws Exception {
ChimeUserInfoDto chimeUserInfoVo = ChimeUserInfoDto.getNew();
ChimeUserInfoVo chimeUserInfoVo = ChimeUserInfoVo.getNew();
chimeUserInfoVo.setUserId("TEST"+ IDGenerator.nextTimeId());
chimeUserInfoVo.setPassWord("123456");
// chimeUserInfoVo.setPassWord("123456");
chimeUserInfoVo.setSex("男");
// chimeUserInfoVo.setUserName("TestName"+num);
// chimeUserInfoVo.setUserMobile("1381111"+num);
chimeUserInfoVo.setAvatar("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
chimeUserInfoVo.setUserCover("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
chimeUserInfoVo.setBirthday("2021-09-01");
chimeUserInfoVo.setSignature("测试签名");
chimeUserInfoVo.setArea("山西省 太原市 迎泽区");
// chimeUserInfoVo.setAvatar("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
// chimeUserInfoVo.setUserCover("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
// chimeUserInfoVo.setBirthday("2021-09-01");
// chimeUserInfoVo.setSignature("测试签名");
// chimeUserInfoVo.setArea("山西省 太原市 迎泽区");
chimeUserInfoVo.setJoinPerformanceId("-1");
// easemobUtil.createUser(chimeUserInfoVo.getUserId(),chimeUserInfoVo.getPassWord());
dataUtils.createChimeUser(chimeUserInfoVo);
......
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