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

Skip to content

L
liquidnet-bus-v1
Commit 7b9ebf63 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 33945611 df0daec6
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 120 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectInfoVo.java
View file @ 7b9ebf63
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ApiModel(value = "AdamCollectInfoVo", description = "演出详情") @ApiModel(value = "AdamCollectInfoVo", description = "详情")
@Data @Data
public class AdamCollectInfoVo implements Serializable, Cloneable { public class AdamCollectInfoVo implements Serializable, Cloneable {
private static final long serialVersionUID = 5217696983635918221L; private static final long serialVersionUID = 5217696983635918221L;
...@@ -16,69 +16,83 @@ public class AdamCollectInfoVo implements Serializable, Cloneable { ...@@ -16,69 +16,83 @@ public class AdamCollectInfoVo implements Serializable, Cloneable {
private String title; private String title;
@ApiModelProperty(value = "演出图片") @ApiModelProperty(value = "演出图片")
private String imgPoster; private String imgPoster;
// @ApiModelProperty(value = "支付倒计时")
// private Integer payCountdownMinute;
// @ApiModelProperty(value = "演出批文地址")
// private String approvalUrl;
@ApiModelProperty(value = "101音乐节 102小型演出(livehouse演出) 103巡演") @ApiModelProperty(value = "101音乐节 102小型演出(livehouse演出) 103巡演")
// @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演") // @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private int type; private int type;
@ApiModelProperty(value = "演出开始时间") @ApiModelProperty(value = "演出开始时间")
private String timeStart; private String timeStart;
@ApiModelProperty(value = "演出结束时间") // @ApiModelProperty(value = "演出结束时间")
private String timeEnd; // private String timeEnd;
@ApiModelProperty(value = "停售时间") // @ApiModelProperty(value = "停售时间")
private String stopSellTime; // private String stopSellTime;
@ApiModelProperty(value = "价格") @ApiModelProperty(value = "价格")
private String price; private String price;
@ApiModelProperty(value = "开售时间") // @ApiModelProperty(value = "开售时间")
private String sellTime; // private String sellTime;
@ApiModelProperty(value = "城市id") // @ApiModelProperty(value = "会员开售时间")
private Integer cityId; // private String sellMemberTime;
// @ApiModelProperty(value = "城市id")
// private Integer cityId;
@ApiModelProperty(value = "城市名称") @ApiModelProperty(value = "城市名称")
private String cityName; private String cityName;
@ApiModelProperty(value = "场地id") // @ApiModelProperty(value = "场地id")
private String fieldId; // private String fieldId;
@ApiModelProperty(value = "场地名称") @ApiModelProperty(value = "场地名称")
private String fieldName; private String fieldName;
@ApiModelProperty(value = "经度") // @ApiModelProperty(value = "经度")
private String longitude; // private String longitude;
@ApiModelProperty(value = "纬度") // @ApiModelProperty(value = "纬度")
private String latitude; // private String latitude;
@ApiModelProperty(value = "场地距离当前位置距离") // @ApiModelProperty(value = "场地距离当前位置距离")
private String diffDistance; // private String diffDistance;
@ApiModelProperty(value = "搭售id") // @ApiModelProperty(value = "搭售id")
private String projectId; // private String projectId;
@ApiModelProperty(value = "巡演id") // @ApiModelProperty(value = "巡演id")
private String roadShowId; // private String roadShowId;
// OSS // // OSS
@ApiModelProperty(value = "演出详情") // @ApiModelProperty(value = "演出详情")
private String details; // private String details;
// OSS // // OSS
@ApiModelProperty(value = "购票须知") // @ApiModelProperty(value = "购票须知")
private String noticeImage; // private String noticeImage;
@ApiModelProperty(value = "推荐顺序 0为不推荐") // @ApiModelProperty(value = "推荐顺序 0为不推荐")
private Integer isRecommend; // private Integer isRecommend;
@ApiModelProperty(value = "状态") // @ApiModelProperty(value = "状态")
private Integer appStatus; // private Integer appStatus;
@ApiModelProperty(value = "是否可买") // @ApiModelProperty(value = "是否可买")
private Integer statusSell; // private Integer statusSell;
@ApiModelProperty(value = "是否关联会员") @ApiModelProperty(value = "是否关联会员")
private Integer isMember; private Integer isMember;
@ApiModelProperty(value = "是否开启缺票登记") // @ApiModelProperty(value = "是否开启缺票登记")
private Integer isLackRegister; // private Integer isLackRegister;
@ApiModelProperty(value = "是否实名") // @ApiModelProperty(value = "是否实名")
private Integer isTrueName; // private Integer isTrueName;
@ApiModelProperty(value = "限购张数") // @ApiModelProperty(value = "限购张数")
private Integer limitCount; // private Integer limitCount;
@ApiModelProperty(value = "会员限购张数") // @ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember; // private Integer limitCountMember;
@ApiModelProperty(value = "是否专属") @ApiModelProperty(value = "是否专属")
private Integer isExclusive; private Integer isExclusive;
@ApiModelProperty(value = "是否优惠") @ApiModelProperty(value = "是否优惠")
private Integer isDiscount; private Integer isDiscount;
@ApiModelProperty(value = "是否提前") @ApiModelProperty(value = "是否提前")
private Integer isAdvance; private Integer isAdvance;
@ApiModelProperty(value = "文案") // @ApiModelProperty(value = "是否同步大麦 0 1")
private String message; // private Integer sysDamai;
// @ApiModelProperty(value = "文案")
// private String message;
// @ApiModelProperty(value = "演出公告")
// private String notice;
// @ApiModelProperty(value = "是否显示")
// private Integer isShow;
// @ApiModelProperty(value = "场次")
// private List<KylinTicketTimesVo> ticketTimeList;
private static final AdamCollectInfoVo obj = new AdamCollectInfoVo(); private static final AdamCollectInfoVo obj = new AdamCollectInfoVo();
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java
View file @ 7b9ebf63
...@@ -16,7 +16,7 @@ public interface IAdamCollectionService { ...@@ -16,7 +16,7 @@ public interface IAdamCollectionService {
void add(AdamCollectBaseVo collectVo); void add(AdamCollectBaseVo collectVo);
AdamCollectBaseVo query(String uid, String type, String contentId); boolean exists(String uid, String type, String contentId);
void del(String uid, String type, String... contentIds); void del(String uid, String type, String... contentIds);
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java
View file @ 7b9ebf63
package com.liquidnet.service.adam.service; package com.liquidnet.service.adam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.entity.AdamDisposed;
/** /**
* <p> * <p>
...@@ -19,7 +17,7 @@ public interface IAdamDisposedService { ...@@ -19,7 +17,7 @@ public interface IAdamDisposedService {
void add(AdamDisposedBaseVo disposedBaseVo); void add(AdamDisposedBaseVo disposedBaseVo);
AdamDisposedBaseVo query(String uid, String type, String contentId); boolean exists(String uid, String type, String contentId);
void del(String uid, String type, String... contentId); void del(String uid, String type, String... contentId);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @ 7b9ebf63
...@@ -50,8 +50,9 @@ public class AdamCollectionController { ...@@ -50,8 +50,9 @@ public class AdamCollectionController {
@RequestParam String contentId) { @RequestParam String contentId) {
String currentUid = CurrentUtil.getCurrentUid(); String currentUid = CurrentUtil.getCurrentUid();
AdamCollectBaseVo existVo = adamCollectionService.query(currentUid, type, contentId); if (adamCollectionService.exists(currentUid, type, contentId)) {
if (null != existVo) return ResponseDto.success(); return ResponseDto.success();
}
AdamCollectBaseVo collectVo = AdamCollectBaseVo.getNew(); AdamCollectBaseVo collectVo = AdamCollectBaseVo.getNew();
collectVo.setType(type); collectVo.setType(type);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java
View file @ 7b9ebf63
...@@ -51,8 +51,9 @@ public class AdamDisposedController { ...@@ -51,8 +51,9 @@ public class AdamDisposedController {
@RequestParam String contentId) { @RequestParam String contentId) {
String currentUid = CurrentUtil.getCurrentUid(); String currentUid = CurrentUtil.getCurrentUid();
AdamDisposedBaseVo existVo = adamDisposedService.query(currentUid, type, contentId); if (adamDisposedService.exists(currentUid, type, contentId)) {
if (null != existVo) return ResponseDto.success(); return ResponseDto.success();
}
AdamDisposedBaseVo disposedBaseVo = AdamDisposedBaseVo.getNew(); AdamDisposedBaseVo disposedBaseVo = AdamDisposedBaseVo.getNew();
disposedBaseVo.setType(type); disposedBaseVo.setType(type);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
View file @ 7b9ebf63
...@@ -490,7 +490,7 @@ public class AdamRdmService { ...@@ -490,7 +490,7 @@ public class AdamRdmService {
/* ========================================================== | Other micro-service data inquiry */ /* ========================================================== | Other micro-service data inquiry */
public KylinPerformanceVo kylinPerformanceVos(String performancesId) { public KylinPerformanceVo kylinPerformanceVo(String performancesId) {
return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performancesId); return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performancesId);
} }
} }
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @ 7b9ebf63
...@@ -25,6 +25,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; ...@@ -25,6 +25,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.LinkedList; import java.util.LinkedList;
...@@ -69,10 +70,11 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService { ...@@ -69,10 +70,11 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
} }
@Override @Override
public AdamCollectBaseVo query(String uid, String type, String contentId) { public boolean exists(String uid, String type, String contentId) {
return mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type) return mongoTemplate.exists(
.and("contentId").is(contentId).and("state").is(1)), Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
AdamCollectBaseVo.class, AdamCollectBaseVo.class.getSimpleName()); AdamCollectBaseVo.class.getSimpleName()
);
} }
@Override @Override
...@@ -105,7 +107,9 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService { ...@@ -105,7 +107,9 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) { public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1)); Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName()); long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamCollectVo> voPageInfo = null; PageInfo<AdamCollectVo> voPageInfo = null;
if (count > 0) { if (count > 0) {
...@@ -113,31 +117,58 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService { ...@@ -113,31 +117,58 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
query.with(pageable); query.with(pageable);
s = System.currentTimeMillis();
List<AdamCollectVo> collectVoList = mongoTemplate.find(query, AdamCollectVo.class, AdamCollectBaseVo.class.getSimpleName()); List<AdamCollectVo> collectVoList = mongoTemplate.find(query, AdamCollectVo.class, AdamCollectBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
try {
String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]); if (!CollectionUtils.isEmpty(collectVoList)) {
// try {
ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = feignKylinPerformanceClient.performanceList(contentIds); // String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]);
//
if (performanceVoListDto.isSuccess()) { // ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = feignKylinPerformanceClient.performanceList(contentIds);
List<KylinPerformanceVo> kylinPerformanceVoList = performanceVoListDto.getData(); //
// if (performanceVoListDto.isSuccess()) {
collectVoList.forEach(v -> { // List<KylinPerformanceVo> kylinPerformanceVoList = performanceVoListDto.getData();
kylinPerformanceVoList.forEach(vl -> { //
if (vl.getPerformancesId().equals(v.getContentId())) { // collectVoList.forEach(v -> {
AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew(); // kylinPerformanceVoList.forEach(vl -> {
BeanUtils.copyProperties(vl, collectInfoVo); // if (vl.getPerformancesId().equals(v.getContentId())) {
v.setContentInfo(collectInfoVo); // AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
} // BeanUtils.copyProperties(vl, collectInfoVo);
}); // v.setContentInfo(collectInfoVo);
}); // }
} else { // });
log.info("Failed:{}.API.performanceList(...) for AdamCollection:{}", feignKylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson()); // });
} // } else {
} catch (Exception e) { // log.info("Failed:{}.API.performanceList(...) for AdamCollection:{}", feignKylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
log.error("Exception:{}.API.performanceList(...) for AdamCollection", feignKylinPerformanceClient.getClass().getSimpleName(), e); // }
// } catch (Exception e) {
// log.error("Exception:{}.API.performanceList(...) for AdamCollection", feignKylinPerformanceClient.getClass().getSimpleName(), e);
// }
s = System.currentTimeMillis();
collectVoList.forEach(r -> {
AdamCollectInfoVo vo = AdamCollectInfoVo.getNew();
KylinPerformanceVo performanceVo = adamRdmService.kylinPerformanceVo(r.getContentId());
if (null != performanceVo) {
// BeanUtils.copyProperties(performanceVo, vo);
vo.setPerformancesId(performanceVo.getPerformancesId());
vo.setTitle(performanceVo.getTitle());
vo.setImgPoster(performanceVo.getImgPoster());
vo.setType(performanceVo.getType());
vo.setTimeStart(performanceVo.getTimeStart());
vo.setPrice(performanceVo.getPrice());
vo.setCityName(performanceVo.getCityName());
vo.setFieldName(performanceVo.getFieldName());
vo.setIsMember(performanceVo.getIsMember());
vo.setIsExclusive(performanceVo.getIsExclusive());
vo.setIsDiscount(performanceVo.getIsDiscount());
vo.setIsAdvance(performanceVo.getIsAdvance());
}
r.setContentInfo(vo);
});
log.debug("#COL.RDS.K耗时:{}ms", System.currentTimeMillis() - s);
} }
voPageInfo = PageInfo.of(collectVoList); voPageInfo = PageInfo.of(collectVoList);
voPageInfo.setTotal(count); voPageInfo.setTotal(count);
} else { } else {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @ 7b9ebf63
...@@ -52,8 +52,8 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService { ...@@ -52,8 +52,8 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
/* ---------------- 外部服务API ---------------- */ /* ---------------- 外部服务API ---------------- */
@Autowired // @Autowired
FeignKylinPerformanceClient kylinPerformanceClient; // FeignKylinPerformanceClient kylinPerformanceClient;
@Override @Override
public void add(AdamDisposedBaseVo vo) { public void add(AdamDisposedBaseVo vo) {
...@@ -72,10 +72,11 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService { ...@@ -72,10 +72,11 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
} }
@Override @Override
public AdamDisposedBaseVo query(String uid, String type, String contentId) { public boolean exists(String uid, String type, String contentId) {
return mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type) return mongoTemplate.exists(
.and("contentId").is(contentId).and("state").is(1)), Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
AdamDisposedBaseVo.class, AdamDisposedBaseVo.class.getSimpleName()); AdamDisposedBaseVo.class.getSimpleName()
);
} }
@Override @Override
...@@ -108,51 +109,79 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService { ...@@ -108,51 +109,79 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
public PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) { public PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1)); Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName()); long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamDisposedVo> voPageInfo = null; PageInfo<AdamDisposedVo> voPageInfo = null;
if (count > 0) { if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"))); query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
s = System.currentTimeMillis();
List<AdamDisposedVo> disposedVoList = mongoTemplate.find(query, AdamDisposedVo.class, AdamDisposedBaseVo.class.getSimpleName()); List<AdamDisposedVo> disposedVoList = mongoTemplate.find(query, AdamDisposedVo.class, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (!CollectionUtils.isEmpty(disposedVoList)) { if (!CollectionUtils.isEmpty(disposedVoList)) {
List<KylinPerformanceVo> kylinPerformanceVoList = null; // List<KylinPerformanceVo> kylinPerformanceVoList = null;
try { // try {
String[] contentIds = disposedVoList.stream().map(AdamDisposedVo::getContentId).toArray(a -> new String[disposedVoList.size()]); // String[] contentIds = disposedVoList.stream().map(AdamDisposedVo::getContentId).toArray(a -> new String[disposedVoList.size()]);
//
ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds); // ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
//
if (performanceVoListDto.isSuccess()) { // if (performanceVoListDto.isSuccess()) {
kylinPerformanceVoList = performanceVoListDto.getData(); // kylinPerformanceVoList = performanceVoListDto.getData();
} else { // } else {
log.info("Failed:{}.API.performanceList(...) for AdamDisposedVo:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson()); // log.info("Failed:{}.API.performanceList(...) for AdamDisposedVo:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
// }
// } catch (Exception e) {
// log.error("Exception:{}.API.performanceList(...) for AdamDisposedVo >> {}", kylinPerformanceClient.getClass().getSimpleName(), e.getLocalizedMessage());
// }
//
// if (!CollectionUtils.isEmpty(kylinPerformanceVoList)) {
// kylinPerformanceVoList.forEach(pv -> {
// disposedVoList.forEach(v -> {
// if (pv.getPerformancesId().equals(v.getContentId())) {
// AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
// BeanUtils.copyProperties(pv, collectInfoVo);
// v.setContentInfo(collectInfoVo);
// }
//
// PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
//
// if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
// });
// });
// } else {
// disposedVoList.forEach(v -> {
// PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
//
// if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
// });
// }
s = System.currentTimeMillis();
disposedVoList.forEach(r -> {
AdamCollectInfoVo vo = AdamCollectInfoVo.getNew();
KylinPerformanceVo performanceVo = adamRdmService.kylinPerformanceVo(r.getContentId());
if (null != performanceVo) {
// BeanUtils.copyProperties(performanceVo, vo);
vo.setPerformancesId(performanceVo.getPerformancesId());
vo.setTitle(performanceVo.getTitle());
vo.setImgPoster(performanceVo.getImgPoster());
vo.setType(performanceVo.getType());
vo.setTimeStart(performanceVo.getTimeStart());
vo.setPrice(performanceVo.getPrice());
vo.setCityName(performanceVo.getCityName());
vo.setFieldName(performanceVo.getFieldName());
vo.setIsMember(performanceVo.getIsMember());
vo.setIsExclusive(performanceVo.getIsExclusive());
vo.setIsDiscount(performanceVo.getIsDiscount());
vo.setIsAdvance(performanceVo.getIsAdvance());
} }
} catch (Exception e) { r.setContentInfo(vo);
log.error("Exception:{}.API.performanceList(...) for AdamDisposedVo >> {}", kylinPerformanceClient.getClass().getSimpleName(), e.getLocalizedMessage()); PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, r.getContentId(), 1, 3);
} if (disposedUserVoPageInfo.getTotal() > 0) r.setUserVos(disposedUserVoPageInfo.getList());
});
if (!CollectionUtils.isEmpty(kylinPerformanceVoList)) { log.debug("#DIS.RDS.MDB.K耗时:{}ms", System.currentTimeMillis() - s);
kylinPerformanceVoList.forEach(pv -> {
disposedVoList.forEach(v -> {
if (pv.getPerformancesId().equals(v.getContentId())) {
AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
BeanUtils.copyProperties(pv, collectInfoVo);
v.setContentInfo(collectInfoVo);
}
PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
});
});
} else {
disposedVoList.forEach(v -> {
PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
});
}
} }
voPageInfo = PageInfo.of(disposedVoList); voPageInfo = PageInfo.of(disposedVoList);
...@@ -168,13 +197,17 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService { ...@@ -168,13 +197,17 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
public PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) { public PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("type").is(type).and("contentId").is(contentId).and("state").is(1)); Query query = Query.query(Criteria.where("type").is(type).and("contentId").is(contentId).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName()); long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamDisposedUserVo> voPageInfo = null; PageInfo<AdamDisposedUserVo> voPageInfo = null;
if (count > 0) { if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"))); query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
s = System.currentTimeMillis();
List<AdamDisposedUserVo> disposedUserVoList = mongoTemplate.find(query, AdamDisposedUserVo.class, AdamDisposedBaseVo.class.getSimpleName()); List<AdamDisposedUserVo> disposedUserVoList = mongoTemplate.find(query, AdamDisposedUserVo.class, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
voPageInfo = PageInfo.of(disposedUserVoList); voPageInfo = PageInfo.of(disposedUserVoList);
voPageInfo.setTotal(count); voPageInfo.setTotal(count);
......
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