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

Skip to content

L
liquidnet-bus-v1
Commit e69bcdde authored by 张国柄's avatar 张国柄
Browse files
Options

fix:用户中心.入场人调整MDB存储及MQ;

parent 5f23dfa1
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 280 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamDisposedParam.java
View file @ e69bcdde
......@@ -8,7 +8,7 @@ import lombok.Data;
@Data
public class AdamDisposedParam implements java.io.Serializable {
private static final long serialVersionUID = 7397579764049783649L;
@ApiModelProperty(position = 11, required = true, value = "内容ID[64]", example = "Swagger")
@ApiModelProperty(position = 11, required = true, value = "内容ID[64]")
private String contentId;
@ApiModelProperty(position = 12, required = true, value = "内容类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG")
private String type;
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamEntersParam.java
View file @ e69bcdde
......@@ -13,7 +13,7 @@ public class AdamEntersParam implements java.io.Serializable {
private static final long serialVersionUID = 8628253022063935727L;
@ApiModelProperty(position = 10, required = false, value = "入场人ID，编辑时必传[50]")
private String entersId;
@ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "Swagger")
@ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "测试")
@Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2～20位汉字")
private String name;
@ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000")
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamEntersResult.java
View file @ e69bcdde
......@@ -8,7 +8,7 @@ import lombok.Data;
@Data
public class AdamEntersResult implements java.io.Serializable {
private static final long serialVersionUID = 3219448286221952517L;
@ApiModelProperty(position = 10, required = true, value = "入场人名称[50]", example = "Swagger")
@ApiModelProperty(position = 10, required = true, value = "入场人名称[50]", example = "测试")
private String name;
@ApiModelProperty(position = 11, required = true, value = "入场人手机号[11]", example = "13100000000")
private String mobile;
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamEntersVo.java
View file @ e69bcdde
package com.liquidnet.service.adam.dto.vo;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.entity.AdamEnters;
import io.swagger.annotations.ApiModel;
......@@ -12,16 +13,23 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -9143065766410946012L;
@ApiModelProperty(position = 10, value = "入场人ID[64]")
private String entersId;
@ApiModelProperty(position = 11, value = "入场人名称[50]")
@ApiModelProperty(position = 11, value = "用户ID[50]")
private String uid;
@ApiModelProperty(position = 12, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
private Integer type;
@ApiModelProperty(position = 13, value = "姓名[50]")
private String name;
@ApiModelProperty(position = 12, value = "入场人手机号[11]")
@ApiModelProperty(position = 14, value = "手机号[11]")
private String mobile;
@ApiModelProperty(position = 13, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
private Integer type;
@ApiModelProperty(position = 14, value = "入场人证件号[11]")
@ApiModelProperty(position = 15, value = "证件号[11]")
private String idCard;
@ApiModelProperty(position = 15, value = "是否为默认:0-否,1-是")
@ApiModelProperty(position = 16, value = "默认:0-否,1-是")
private Boolean isDefault;
@ApiModelProperty(position = 17, value = "状态:0-INIT,1-NORMAL,2-INVALID")
private Integer state;
private String createdAt;
private String updatedAt;
private String deletedAt;
private static final AdamEntersVo obj = new AdamEntersVo();
......@@ -37,11 +45,16 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
public AdamEntersVo copy(AdamEnters source) {
if (null == source) return this;
this.setEntersId(source.getEntersId());
this.setUid(source.getUid());
this.setType(source.getType());
this.setName(SensitizeUtil.chineseName(source.getName()));
this.setIdCard(SensitizeUtil.custom(source.getIdCard(), 3, 2));
this.setMobile(SensitizeUtil.custom(source.getMobile(), 3, 4));
this.setType(source.getType());
this.setIdCard(SensitizeUtil.custom(source.getIdCard(), 3, 2));
this.setIsDefault(source.getIsDefault());
this.setState(source.getState());
this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getCreatedAt()));
this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getUpdatedAt()));
this.setDeletedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getDeletedAt()));
return this;
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamEntersService.java
View file @ e69bcdde
package com.liquidnet.service.adam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.dto.AdamEntersParam;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.entity.AdamEnters;
import java.util.List;
/**
* <p>
......@@ -14,16 +11,12 @@ import java.util.List;
* @author liquidnet
* @since 2021-04-28
*/
public interface IAdamEntersService extends IService<AdamEnters> {
// List<AdamEnters> queryByUid(String uid);
void add(AdamEnters info);
// AdamEnters query(String uid, String entersId);
public interface IAdamEntersService {
String add(AdamEntersParam parameter);
void def(String uid, String entersId);
void edit(AdamEnters info);
void edit(AdamEntersParam parameter);
void remove(String uid, String entersId);
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java
View file @ e69bcdde
......@@ -38,21 +38,21 @@ public interface IAdamRdmService {
void delThirdPartVoListByUid(String uid);
boolean setEntersByUid(String uid, List<AdamEnters> list);
boolean setEntersVoByUid(String uid, List<AdamEntersVo> list);
List<AdamEnters> getEntersByUid(String uid);
List<AdamEntersVo> getEntersVoByUid(String uid);
AdamEnters getEntersByUidEntersId(String uid, String entersId);
AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId);
void delEntersByUid(String uid);
void delEntersVoByUid(String uid);
boolean setAddressesByUid(String uid, List<AdamAddressesVo> list);
boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list);
List<AdamAddressesVo> getAddressesByUid(String uid);
List<AdamAddressesVo> getAddressesVoByUid(String uid);
AdamAddressesVo getAddressesByUidAddressesId(String uid, String addressesId);
AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId);
void delAddressesByUid(String uid);
void delAddressesVoByUid(String uid);
boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java
View file @ e69bcdde
......@@ -52,7 +52,7 @@ public class AdamAddressesController {
@ApiOperation(value = "收获地址列表")
@GetMapping("list")
public ResponseDto<List<AdamAddressesVo>> list() {
return ResponseDto.success(adamRdmService.getAddressesByUid(CurrentUtil.getCurrentUid()));
return ResponseDto.success(adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid()));
}
@ApiOperationSupport(order = 3)
......@@ -61,7 +61,7 @@ public class AdamAddressesController {
public ResponseDto<Object> def(@NotBlank @PathVariable String addrId) {
String currentUid = CurrentUtil.getCurrentUid();
AdamAddressesVo vo = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(currentUid, addrId);
if (null == vo) return ResponseDto.failure(ErrorMapping.get("10106"));
if (!vo.getIsDefault()) adamAddressesService.def(currentUid, addrId);
......@@ -76,7 +76,12 @@ public class AdamAddressesController {
if (StringUtils.isBlank(parameter.getAddressesId())) {
return ResponseDto.failure(ErrorMapping.get("10016"));
}
if (null == adamRdmService.getAddressesVoByUidAddressesId(CurrentUtil.getCurrentUid(), parameter.getAddressesId())) {
return ResponseDto.failure(ErrorMapping.get("10106"));
}
adamAddressesService.edit(parameter);
return ResponseDto.success();
}
......@@ -86,10 +91,11 @@ public class AdamAddressesController {
public ResponseDto<Object> del(@NotBlank @PathVariable String addrId) {
String currentUid = CurrentUtil.getCurrentUid();
AdamAddressesVo vo = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(currentUid, addrId);
if (null == vo) return ResponseDto.failure(ErrorMapping.get("10106"));
adamAddressesService.remove(currentUid, addrId);
return ResponseDto.success();
}
......@@ -98,7 +104,7 @@ public class AdamAddressesController {
@PostMapping("query/{id}")
public ResponseDto<AdamAddressesVo> query(@NotBlank @PathVariable(name = "id") String addrId,
@RequestParam(required = false) String uid) {
AdamAddressesVo vo = adamRdmService.getAddressesByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
return null == vo ? ResponseDto.failure(ErrorMapping.get("10106")) : ResponseDto.success(vo);
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @ e69bcdde
......@@ -50,32 +50,14 @@ public class AdamEntersController {
@ApiOperation(value = "添加入场人")
@PostMapping("add")
public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
AdamEnters addInfo = new AdamEnters();
BeanUtils.copyProperties(parameter, addInfo);
addInfo.setUid(currentUid);
addInfo.setEntersId(String.valueOf(IDGenerator.nextSnowId()));
addInfo.setCreatedAt(LocalDateTime.now());
addInfo.setState(1);
adamEntersService.add(addInfo);
return ResponseDto.success(addInfo.getEntersId());
return ResponseDto.success(adamEntersService.add(parameter));
}
@ApiOperationSupport(order = 2)
@ApiOperation(value = "入场人列表")
@GetMapping("list")
public ResponseDto<List<AdamEntersVo>> list() {
String currentUid = CurrentUtil.getCurrentUid();
List<AdamEntersVo> voList = new ArrayList<>();
adamRdmService.getEntersByUid(currentUid).forEach(i -> {
voList.add(AdamEntersVo.getNew().copy(i));
});
return ResponseDto.success(voList);
return ResponseDto.success(adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid()));
}
@ApiOperationSupport(order = 3)
......@@ -83,10 +65,11 @@ public class AdamEntersController {
@PostMapping("def/{entersId}")
public ResponseDto<Object> def(@NotBlank @PathVariable String entersId) {
String currentUid = CurrentUtil.getCurrentUid();
AdamEnters enters = adamRdmService.getEntersByUidEntersId(currentUid, entersId);
if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
if (!enters.getIsDefault()) {
AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
if (null == vo) return ResponseDto.failure(ErrorMapping.get("10105"));
if (!vo.getIsDefault()) {
adamEntersService.def(currentUid, entersId);
}
return ResponseDto.success();
......@@ -99,18 +82,11 @@ public class AdamEntersController {
if (StringUtils.isBlank(parameter.getEntersId())) {
return ResponseDto.failure(ErrorMapping.get("10015"));
}
String currentUid = CurrentUtil.getCurrentUid();
AdamEnters enters = adamRdmService.getEntersByUidEntersId(currentUid, parameter.getEntersId());
if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
AdamEnters updateInfo = new AdamEnters();
BeanUtils.copyProperties(parameter, updateInfo);
updateInfo.setUpdatedAt(LocalDateTime.now());
updateInfo.setUid(currentUid);
updateInfo.setState(1);
if (null == adamRdmService.getEntersVoByUidEntersId(CurrentUtil.getCurrentUid(), parameter.getEntersId())) {
return ResponseDto.failure(ErrorMapping.get("10105"));
}
adamEntersService.edit(updateInfo);
adamEntersService.edit(parameter);
return ResponseDto.success();
}
......@@ -121,10 +97,11 @@ public class AdamEntersController {
public ResponseDto<Object> del(@NotBlank @PathVariable String entersId) {
String currentUid = CurrentUtil.getCurrentUid();
AdamEnters enters = adamRdmService.getEntersByUidEntersId(currentUid, entersId);
AdamEntersVo enters = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
adamEntersService.remove(currentUid, entersId);
return ResponseDto.success();
}
......@@ -132,10 +109,9 @@ public class AdamEntersController {
@ApiOperation(value = "入场人详情")
@PostMapping("query/{entersId}")
public ResponseDto<AdamEntersVo> query(@NotBlank @PathVariable String entersId,
@NotBlank @RequestParam(required = false) String uid) {
AdamEnters info = adamRdmService.getEntersByUidEntersId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, entersId);
return null == info ? ResponseDto.failure(ErrorMapping.get(10105)) : ResponseDto.success(AdamEntersVo.getNew().copy(info));
@RequestParam(required = false) String uid) {
AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, entersId);
return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
}
@ApiOperationSupport(order = 7)
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @ e69bcdde
......@@ -49,12 +49,11 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public String add(AdamAddressesParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
List<AdamAddressesVo> vos = adamRdmService.getAddressesByUid(currentUid);
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
AdamAddressesVo vo = AdamAddressesVo.getNew();
BeanUtils.copyProperties(parameter, vo);
vo.setAddressesId(String.valueOf(IDGenerator.nextSnowId()));
......@@ -72,7 +71,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
);
vos.add(vo);
adamRdmService.setAddressesByUid(currentUid, vos);
adamRdmService.setAddressesVoByUid(currentUid, vos);
return vo.getAddressesId();
}
......@@ -82,8 +81,8 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
LinkedList<Object[]> toMqObjs = new LinkedList<>();
List<AdamAddressesVo> addressesList = adamRdmService.getAddressesByUid(uid);
if (addressesList.size() > 1) {// 取消原默认
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
if (vos.size() > 1) {// 取消原默认
AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
unDeaultVo.setIsDefault(false);
unDeaultVo.setUpdatedAt(nowStr);
......@@ -97,8 +96,8 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
toMqObjs.add(new Object[]{unDeaultVo.getIsDefault(), now, unDefaultVoAfter.getAddressesId()});
addressesList.removeIf(r -> r.getAddressesId().equals(unDefaultVoAfter.getAddressesId()));
addressesList.add(unDefaultVoAfter);
vos.removeIf(r -> r.getAddressesId().equals(unDefaultVoAfter.getAddressesId()));
vos.add(unDefaultVoAfter);
}
}
{// 设置新默认
......@@ -115,13 +114,15 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
toMqObjs.add(new Object[]{defaultVo.getIsDefault(), now, addressesId});
addressesList.removeIf(r -> r.getAddressesId().equals(defaultVoAfter.getAddressesId()));
addressesList.add(defaultVoAfter);
vos.removeIf(r -> r.getAddressesId().equals(defaultVoAfter.getAddressesId()));
vos.add(defaultVoAfter);
}
}
if (!CollectionUtils.isEmpty(toMqObjs)) {
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.update.is_default", toMqObjs));
adamRdmService.setAddressesByUid(uid, addressesList);
adamRdmService.setAddressesVoByUid(uid, vos);
}
}
@Override
......@@ -140,20 +141,18 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
);
if (null != doc) {
updateVo = BsonUtil.toBean(doc, AdamAddressesVo.class);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamAddressesVo> list = adamRdmService.getAddressesByUid(currentUid);
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.edit",
updateVo.getName(), updateVo.getPhone(), updateVo.getProvince(), updateVo.getCity(), updateVo.getCounty(), updateVo.getAddress(), now, updateVo.getAddressesId()
)
);
list.removeIf(r -> r.getAddressesId().equals(parameter.getAddressesId()));
list.add(updateVo);
adamRdmService.setAddressesByUid(currentUid, list);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
vos.removeIf(r -> r.getAddressesId().equals(parameter.getAddressesId()));
vos.add(updateVo);
adamRdmService.setAddressesVoByUid(currentUid, vos);
}
}
......@@ -175,30 +174,29 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
List<AdamAddressesVo> list = adamRdmService.getAddressesByUid(uid);
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.remove", now, now, addressesId)
);
list.removeIf(r -> r.getAddressesId().equals(addressesId));
adamRdmService.setAddressesByUid(uid, list);
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
vos.removeIf(r -> r.getAddressesId().equals(addressesId));
adamRdmService.setAddressesVoByUid(uid, vos);
}
}
@Override
public AdamAddressesVo queryDefault(String uid) {
List<AdamAddressesVo> vos = adamRdmService.getAddressesByUid(uid);
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
if (!CollectionUtils.isEmpty(vos)) {
AdamAddressesVo defaultAddr = null;
AdamAddressesVo defaultVo = null;
for (AdamAddressesVo vo : vos) {
if (vo.getIsDefault()) {
return vo;
}
defaultAddr = null == defaultAddr ? vo :
vo.getCreatedAt().compareTo(defaultAddr.getCreatedAt()) > 0 ? vo : defaultAddr;
defaultVo = null == defaultVo ? vo :
vo.getCreatedAt().compareTo(defaultVo.getCreatedAt()) > 0 ? vo : defaultVo;
}
return defaultAddr;
return defaultVo;
}
return null;
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @ e69bcdde
package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.BsonUtil;
import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.AdamEntersParam;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.entity.AdamEnters;
import com.liquidnet.service.adam.mapper.AdamEntersMapper;
import com.liquidnet.service.adam.service.IAdamEntersService;
import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.base.SqlMapping;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import com.mongodb.client.result.UpdateResult;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
......@@ -27,8 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
......@@ -42,9 +37,7 @@ import java.util.List;
*/
@Slf4j
@Service
public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnters> implements IAdamEntersService {
@Autowired
AdamEntersMapper adamEntersMapper;
public class AdamEntersServiceImpl implements IAdamEntersService {
@Autowired
MongoConverter mongoConverter;
@Autowired
......@@ -54,196 +47,162 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
@Autowired
IAdamRdmService adamRdmService;
// @Override
// public List<AdamEnters> queryByUid(String uid) {
// List<AdamEnters> infoList = new ArrayList<>();
//
// Map<Object, Object> objectMap = redisUtil.hmget(AdamRedisConst.INFO_ENTERS.concat(uid));
//
// if (CollectionUtils.isEmpty(objectMap)) {
// infoList = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)), AdamEnters.class, AdamEnters.class.getSimpleName());
// } else {
// Collection<Object> values = objectMap.values();
// for (Object o : values) {
// infoList.add((AdamEnters) o);
// }
// }
//
// return infoList;
// }
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void add(AdamEnters info) {
List<AdamEnters> entersList = adamRdmService.getEntersByUid(info.getUid());
info.setIsDefault(CollectionUtils.isEmpty(entersList));
mongoTemplate.insert(info, AdamEnters.class.getSimpleName());
List<Object> paramList = new ArrayList<>();
paramList.add(info.getEntersId());
paramList.add(info.getUid());
paramList.add(info.getType());
paramList.add(info.getName());
paramList.add(info.getMobile());
paramList.add(info.getIdCard());
paramList.add(info.getIsDefault());
paramList.add(info.getState());
paramList.add(info.getCreatedAt());
paramList.add(info.getUpdatedAt());
paramList.add(info.getDeletedAt());
paramList.add(info.getComment());
String mqMsg = SqlMapping.get("adam_enters.add", paramList.toArray());
log.info("mq.sql:{}", mqMsg);
public String add(AdamEntersParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
AdamEntersVo vo = AdamEntersVo.getNew();
BeanUtils.copyProperties(parameter, vo);
vo.setEntersId(String.valueOf(IDGenerator.nextSnowId()));
vo.setUid(currentUid);
vo.setIsDefault(CollectionUtils.isEmpty(vos));
vo.setState(1);
vo.setCreatedAt(nowStr);
mongoTemplate.insert(vo, AdamEntersVo.class.getSimpleName());
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
mqMsg);
SqlMapping.get("adam_enters.add",
vo.getEntersId(), vo.getUid(), vo.getType(), vo.getName(), vo.getMobile(), vo.getIdCard(), vo.getIsDefault(), vo.getState(), now
)
);
entersList.add(info);
adamRdmService.setEntersByUid(info.getUid(), entersList);
vos.add(vo);
adamRdmService.setEntersVoByUid(currentUid, vos);
return vo.getEntersId();
}
// @Override
// public AdamEnters query(String uid, String entersId) {
// AdamEnters info = (AdamEnters) redisUtil.hget(AdamRedisConst.INFO_ENTERS.concat(uid), entersId);
//
// if (null == info) {
// info = mongoTemplate.findOne(
// Query.query(Criteria.where("entersId").is(entersId).and("state").is(1).and("uid").is(uid)),
// AdamEnters.class, AdamEnters.class.getSimpleName());
//
// if (null != info) redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(uid), entersId, info);
// }
// return info;
// }
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void def(String uid, String entersId) {
LocalDateTime now = LocalDateTime.now();
LinkedList<Object[]> linkedList = new LinkedList<>();
List<AdamEnters> entersList = adamRdmService.getEntersByUid(uid);
if (entersList.size() > 1) {// 取消原默认
AdamEnters unDeaultEnters = new AdamEnters();
unDeaultEnters.setIsDefault(false);
unDeaultEnters.setUpdatedAt(now);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(unDeaultEnters));
Document doc = mongoTemplate.getCollection(AdamEnters.class.getSimpleName()).findOneAndUpdate(
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
LinkedList<Object[]> toMqObjs = new LinkedList<>();
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
if (vos.size() > 1) {// 取消原默认
AdamEntersVo unDeaultVo = AdamEntersVo.getNew();
unDeaultVo.setIsDefault(false);
unDeaultVo.setUpdatedAt(nowStr);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("state").is(1).and("isDefault").is(true)).getQueryObject(),
object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
new Document("$set", Document.parse(JsonUtils.toJson(unDeaultVo))),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
AdamEnters enters = BsonUtil.toBean(doc, AdamEnters.class);
AdamEntersVo unDeaultVoAfter = BsonUtil.toBean(doc, AdamEntersVo.class);
List<Object> paramList = new ArrayList<>();
paramList.add(unDeaultEnters.getIsDefault());
paramList.add(unDeaultEnters.getUpdatedAt());
paramList.add(enters.getEntersId());
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// SqlMapping.get("adam_enters.update.is_default", paramList.toArray()));
linkedList.add(paramList.toArray());
toMqObjs.add(new Object[]{unDeaultVo.getIsDefault(), now, unDeaultVoAfter.getEntersId()});
entersList.removeIf(r -> r.getEntersId().equals(enters.getEntersId()));
entersList.add(enters);
vos.removeIf(r -> r.getEntersId().equals(unDeaultVoAfter.getEntersId()));
vos.add(unDeaultVoAfter);
}
}
{// 设置新默认
AdamEnters defaultEnters = new AdamEnters();
defaultEnters.setIsDefault(true);
defaultEnters.setUpdatedAt(now);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(defaultEnters));
Document doc = mongoTemplate.getCollection(AdamEnters.class.getSimpleName()).findOneAndUpdate(
AdamEntersVo defaultVo = AdamEntersVo.getNew();
defaultVo.setIsDefault(true);
defaultVo.setUpdatedAt(nowStr);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("entersId").is(entersId)).getQueryObject(),
object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
new Document("$set", Document.parse(JsonUtils.toJson(defaultVo))),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
AdamEnters enters = BsonUtil.toBean(doc, AdamEnters.class);
if (null != doc) {
AdamEntersVo defaultVoAfter = BsonUtil.toBean(doc, AdamEntersVo.class);
List<Object> paramList = new ArrayList<>();
paramList.add(defaultEnters.getIsDefault());
paramList.add(defaultEnters.getUpdatedAt());
paramList.add(entersId);
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// SqlMapping.get("adam_enters.update.is_default", paramList.toArray()));
linkedList.add(paramList.toArray());
toMqObjs.add(new Object[]{defaultVo.getIsDefault(), now, entersId});
entersList.removeIf(r -> r.getEntersId().equals(enters.getEntersId()));
vos.removeIf(r -> r.getEntersId().equals(defaultVoAfter.getEntersId()));
entersList.add(enters);
vos.add(defaultVoAfter);
}
}
if (!CollectionUtils.isEmpty(toMqObjs)) {
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.update.is_default", toMqObjs));
adamRdmService.setEntersVoByUid(uid, vos);
}
adamRdmService.setEntersByUid(uid, entersList);
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// SqlMapping.get("adam_enters.update.is_default", linkedList));
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void edit(AdamEnters info) {
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(info));
Document doc = mongoTemplate.getCollection(AdamEnters.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("entersId").is(info.getEntersId())).getQueryObject(),
object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
public void edit(AdamEntersParam parameter) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamEntersVo updateVo = AdamEntersVo.getNew();
BeanUtils.copyProperties(parameter, updateVo);
updateVo.setUpdatedAt(nowStr);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("entersId").is(parameter.getEntersId())).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(updateVo))),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
updateVo = BsonUtil.toBean(doc, AdamEntersVo.class);
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.edit",
updateVo.getType(), updateVo.getName(), updateVo.getMobile(), updateVo.getIdCard(), updateVo.getIsDefault(), updateVo.getState(), now, updateVo.getEntersId()
)
);
String currentUid = CurrentUtil.getCurrentUid();
List<Object> paramList = new ArrayList<>();
paramList.add(info.getType());
paramList.add(info.getName());
paramList.add(info.getMobile());
paramList.add(info.getIdCard());
paramList.add(info.getIsDefault());
paramList.add(info.getState());
paramList.add(info.getUpdatedAt());
paramList.add(info.getEntersId());
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// SqlMapping.get("adam_enters.edit", paramList.toArray()));
List<AdamEnters> entersList = adamRdmService.getEntersByUid(info.getUid());
entersList.removeIf(r -> r.getEntersId().equals(info.getEntersId()));
entersList.add(info);
adamRdmService.setEntersByUid(info.getUid(), entersList);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
vos.removeIf(r -> r.getEntersId().equals(parameter.getEntersId()));
vos.add(updateVo);
adamRdmService.setEntersVoByUid(currentUid, vos);
}
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void remove(String uid, String entersId) {
AdamEnters enters = new AdamEnters();
enters.setUpdatedAt(LocalDateTime.now());
enters.setDeletedAt(enters.getUpdatedAt());
enters.setState(2);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(enters));
UpdateResult updateResult = mongoTemplate.getCollection(AdamEnters.class.getSimpleName())
.updateOne(Query.query(Criteria.where("entersId").is(entersId)).getQueryObject(), object);
List<Object> paramList = new ArrayList<>();
paramList.add(enters.getUpdatedAt());
paramList.add(enters.getDeletedAt());
paramList.add(entersId);
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// SqlMapping.get("adam_enters.remove", paramList.toArray()));
List<AdamEnters> entersList = adamRdmService.getEntersByUid(uid);
entersList.removeIf(r -> r.getEntersId().equals(entersId));
adamRdmService.setEntersByUid(uid, entersList);
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamEntersVo removeVo = AdamEntersVo.getNew();
removeVo.setState(2);
removeVo.setIsDefault(false);
removeVo.setUpdatedAt(nowStr);
removeVo.setDeletedAt(nowStr);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("entersId").is(entersId)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(removeVo))),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.remove", now, now, entersId)
);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
vos.removeIf(r -> r.getEntersId().equals(entersId));
adamRdmService.setEntersVoByUid(uid, vos);
}
}
@Override
public AdamEntersVo queryDefault(String uid) {
List<AdamEnters> list = adamRdmService.getEntersByUid(uid);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
if (!CollectionUtils.isEmpty(list)) {
AdamEnters defaultVo = null;
for (AdamEnters l : list) {
if (l.getIsDefault()) {
return AdamEntersVo.getNew().copy(l);
if (!CollectionUtils.isEmpty(vos)) {
AdamEntersVo defaultVo = null;
for (AdamEntersVo vo : vos) {
if (vo.getIsDefault()) {
return vo;
}
defaultVo = null == defaultVo ? l :
l.getCreatedAt().isAfter(defaultVo.getCreatedAt()) ? l : defaultVo;
defaultVo = null == defaultVo ? vo :
vo.getCreatedAt().compareTo(defaultVo.getCreatedAt()) > 0 ? vo : defaultVo;
}
return AdamEntersVo.getNew().copy(defaultVo);
return defaultVo;
}
return null;
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java
View file @ e69bcdde
......@@ -135,16 +135,18 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
}
@Override
public boolean setEntersByUid(String uid, List<AdamEnters> list) {
public boolean setEntersVoByUid(String uid, List<AdamEntersVo> list) {
return redisUtil.set(AdamRedisConst.INFO_ENTERS.concat(uid), list);
}
@Override
public List<AdamEnters> getEntersByUid(String uid) {
public List<AdamEntersVo> getEntersVoByUid(String uid) {
String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
List<AdamEnters> entersList = (List<AdamEnters>) redisUtil.get(rk);
List<AdamEntersVo> entersList = (List<AdamEntersVo>) redisUtil.get(rk);
if (CollectionUtils.isEmpty(entersList)) {
entersList = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)), AdamEnters.class, AdamEnters.class.getSimpleName());
entersList = mongoTemplate.find(
Query.query(Criteria.where("uid").is(uid).and("state").is(1)), AdamEntersVo.class, AdamEntersVo.class.getSimpleName()
);
if (!CollectionUtils.isEmpty(entersList)) redisUtil.set(rk, entersList);
}
......@@ -152,26 +154,22 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
}
@Override
public AdamEnters getEntersByUidEntersId(String uid, String entersId) {
List<AdamEnters> entersList = this.getEntersByUid(uid);
if (!CollectionUtils.isEmpty(entersList))
for (AdamEnters r : entersList)
if (entersId.equals(r.getEntersId())) return r;
return null;
public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
}
@Override
public void delEntersByUid(String uid) {
public void delEntersVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_ENTERS.concat(uid));
}
@Override
public boolean setAddressesByUid(String uid, List<AdamAddressesVo> list) {
public boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list) {
return redisUtil.set(AdamRedisConst.INFO_ADDRESSES.concat(uid), list);
}
@Override
public List<AdamAddressesVo> getAddressesByUid(String uid) {
public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
List<AdamAddressesVo> list = (List<AdamAddressesVo>) redisUtil.get(rk);
if (CollectionUtils.isEmpty(list)) {
......@@ -184,12 +182,12 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
}
@Override
public AdamAddressesVo getAddressesByUidAddressesId(String uid, String addressesId) {
return this.getAddressesByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
return this.getAddressesVoByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
}
@Override
public void delAddressesByUid(String uid) {
public void delAddressesVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_ADDRESSES.concat(uid));
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ e69bcdde
......@@ -283,7 +283,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
/* ---------------------- 收货地址信息 */
adamRdmService.delAddressesByUid(uid);
adamRdmService.delAddressesVoByUid(uid);
AdamAddresses closeAddresses = new AdamAddresses();
closeAddresses.setUpdatedAt(now);
......@@ -294,7 +294,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
// TODO: 2021/5/30 mdb + mq to sql
/* ---------------------- 入场人信息 */
adamRdmService.delEntersByUid(uid);
adamRdmService.delEntersVoByUid(uid);
AdamEnters closeEnters = new AdamEnters();
closeEnters.setUpdatedAt(LocalDateTime.now());
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties
View file @ e69bcdde
......@@ -19,7 +19,7 @@ adam_addresses.update.is_default=UPDATE adam_addresses SET is_default=?, updated
adam_addresses.remove=UPDATE adam_addresses SET is_default=0, `state`=2, updated_at=?, deleted_at=? where addresses_id=?
# ----------------------------------------------------
adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at, updated_at, deleted_at, `comment`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?)
adam_enters.edit=UPDATE adam_enters SET `type`=?, `name`=?, mobile=?, id_card=?, is_default=?, `state`=?, updated_at=? where enters_id=?
adam_enters.update.is_default=UPDATE adam_enters set is_default=?, updated_at=? where enters_id=?
adam_enters.remove=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
......
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