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

Skip to content

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

Merge branch 'dev' into test

parents 5716cc6c 284a1bfe
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 64 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java
View file @ 3285d101
......@@ -11,11 +11,15 @@ import java.io.Serializable;
@Data
public class AdamRealInfoVo implements Serializable, Cloneable {
private static final long serialVersionUID = -3469256375584132928L;
@ApiModelProperty(position = 10, value = "用户ID[30]")
private String uid;
@ApiModelProperty(position = 11, value = "姓名[30]")
private String name;
@ApiModelProperty(position = 12, value = "证件号[50]")
private String idCard;
@ApiModelProperty(position = 13, value = "状态:1-正常")
@ApiModelProperty(position = 13, value = "类型[1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证]")
private String type;
@ApiModelProperty(position = 14, value = "状态:1-正常")
private Integer state;
private static final AdamRealInfoVo obj = new AdamRealInfoVo();
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @ 3285d101
......@@ -5,7 +5,10 @@ public class KylinRedisConst {
public static final String PERFORMANCES = "kylin:performances:id:";
public static final String PERFORMANCES_LIST_CITYNAME = "kylin:performances:cityName:";
public static final String PERFORMANCES_LIST_ALL = "kylin:performances:cityName*";
public static final String PERFORMANCES_LIST_SYSTEM_RECOMMEND = "kylin:performances:systemRecommend";
public static final String PERFORMANCES_LIST_NOTICE = "kylin:performances:notice";
public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
public static final String PERFORMANCES_LIST_EXCLUSIVE = "kylin:performances:exclusive";
public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";
public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend:id:";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:id:";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java
View file @ 3285d101
......@@ -43,7 +43,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
long s = System.currentTimeMillis();
AdamUserInfoVo vo = mongoTemplate.findOne(query, AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) redisUtil.set(key, vo.getUid());
if (null != vo) {
val = vo.getMobile();
redisUtil.set(key, vo.getUid());
}
}
return val;
}
......@@ -68,7 +71,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
long s = System.currentTimeMillis();
AdamThirdPartInfoVo vo = mongoTemplate.findOne(query, AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) redisUtil.set(key, vo.getUid());
if (null != vo) {
val = vo.getUid();
redisUtil.set(key, vo.getUid());
}
}
return val;
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 3285d101
......@@ -364,8 +364,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
adamRealNameService.add(realName);
AdamRealInfoVo realInfoVo = AdamRealInfoVo.getNew();
realInfoVo.setUid(uid);
realInfoVo.setName(name);
realInfoVo.setIdCard(idCard);
realInfoVo.setType(realName.getType());
realInfoVo.setState(1);
long s = System.currentTimeMillis();
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java
View file @ 3285d101
......@@ -75,6 +75,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
realName.setUpdatedAt(row.getLocalDateTime(6));
AdamRealInfoVo vo = AdamRealInfoVo.getNew();
vo.setUid(uid);
vo.setType(realName.getType());
vo.setName(realName.getName());
vo.setIdCard(realName.getIdCard());
vo.setState(1);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java
View file @ 3285d101
......@@ -11,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -41,8 +40,7 @@ public class KylinBannersController {
@RequestParam() String position,
@RequestParam(defaultValue = "") String provinceName
) {
List result = new ArrayList();
result = bannersServiceImpl.blist(position, provinceName);
List<KylinBannersVo> result = bannersServiceImpl.blist(position, provinceName);
return ResponseDto.success(result);
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @ 3285d101
......@@ -160,6 +160,20 @@ public class KylinPerformancesController {
}
}
@GetMapping("roadList/{roadShowId}")
@ApiOperation("演出巡演数据")
@ApiImplicitParams({
@ApiImplicitParam(type = "path", dataType = "String", name = "roadShowId", value = "巡演id", required = true),
})
public ResponseDto<List<KylinPerformanceVo>> roadList(@PathVariable("roadShowId") String roadShowId) {
List<KylinPerformanceVo> result = kylinPerformancesService.roadList(roadShowId);
if (result != null) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取演出详情失败");
}
}
@GetMapping("partner/{performancesId}")
@ApiOperation("场次票种")
@ApiImplicitParams({
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java
View file @ 3285d101
......@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.entity.KylinBanners;
import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
import com.liquidnet.service.kylin.service.admin.IKylinBannersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
......@@ -27,13 +28,17 @@ import java.util.List;
*/
@Service
public class BannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBanners> implements IKylinBannersService {
@Value("${liquidnet.al-oss.imgUrl}")
private String imgUrl;
@Autowired
MongoTemplate mongoTemplate;
@Autowired
RedisUtil redisUtil;
public List blist(String position, String provinceName) {
public List<KylinBannersVo> blist(String position, String provinceName) {
Query query = new Query();
query.addCriteria(
Criteria.where("isOnline").is(1).and("isDeleted").is(1)
......@@ -66,12 +71,17 @@ public class BannersServiceImpl extends ServiceImpl<KylinBannersMapper, KylinBan
criteria.andOperator(mergeCriteriaTime, mergeCriteriaPromotion)
);
List bannerList = mongoTemplate.find(
List<KylinBannersVo> bannerList = mongoTemplate.find(
query,
KylinBannersVo.class,
KylinBannersVo.class.getSimpleName()
);
for (KylinBannersVo info : bannerList) {
String setCoverImg = imgUrl + info.getCoverImg();
info.setCoverImg(setCoverImg);
}
return bannerList;
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ 3285d101
......@@ -94,8 +94,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
// 推荐
int is_native = 1;
int recommend = performancesListNew.size();
if (recommend < 2) {
List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsRecommend();
if (recommend <= 2) {
List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsSystemRecommend();
if (performancesListRecommend.size() > 0) {
is_native = 0;
performancesListNew.addAll(performancesListRecommend);
......@@ -113,35 +113,11 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
}
public HashMap<String, Object> noticeList() {
// 所有城市演出
List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListAll();
// 条件整理
List<KylinPerformanceVo> toDayList = new ArrayList<>();
List<KylinPerformanceVo> threeDaysList = new ArrayList<>();
// 今天的
HashMap toDayTime = DateUtil.oneDayStartEnd();
String nowTimeTStr = (String) toDayTime.get("startStr");
String toDayEndTimeStr = (String) toDayTime.get("endStr");
// 三天的
Calendar cal = Calendar.getInstance();
cal.setTime((Date) toDayTime.get("end"));
Date beforeDayEnd = DateUtil.getBeforeDayEnd(cal, 3);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String threeDaysLaterStr = sdf.format(beforeDayEnd);
for (KylinPerformanceVo info : performancesList) {
String timeStart = info.getSellTime();
if (-1 != DateUtil.compareStrDay(timeStart, nowTimeTStr) && -1 == DateUtil.compareStrDay(timeStart, toDayEndTimeStr)) {
toDayList.add(info);
}
if (-1 != DateUtil.compareStrDay(timeStart, toDayEndTimeStr) && -1 == DateUtil.compareStrDay(timeStart, threeDaysLaterStr)) {
threeDaysList.add(info);
}
}
HashMap<String, Object> info = new HashMap<>();
info.put("toDayList", toDayList);
info.put("threeDaysList", threeDaysList);
return info;
/*if (-1 != DateUtil.compareStrDay(timeStart, toDayEndTimeStr) && -1 == DateUtil.compareStrDay(timeStart, threeDaysLaterStr)) {
threeDaysList.add(info);
}*/
HashMap<String, Object> performancesListNotice = dataUtils.getPerformancesListNotice();
return performancesListNotice;
}
public List<KylinPerformanceVo> recommendList() {
......@@ -150,15 +126,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
}
public List<KylinPerformanceVo> exclusiveList() {
// 所有城市演出
List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListAll();
List<KylinPerformanceVo> performancesListNew = new ArrayList<>();
for (KylinPerformanceVo info : performancesList) {
if (1 == info.getIsExclusive()) {
performancesListNew.add(info);
}
}
return performancesListNew;
List<KylinPerformanceVo> performancesListExclusive = dataUtils.getPerformancesListIsExclusive();
return performancesListExclusive;
}
public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom) {
......@@ -193,6 +162,11 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
return performancesInfo;
}
public List<KylinPerformanceVo> roadList(String roadShowId) {
List<KylinPerformanceVo> performancesList = dataUtils.getRoadList(roadShowId);
return performancesList;
}
public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @ 3285d101
......@@ -13,6 +13,8 @@ import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
......@@ -20,7 +22,9 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.regex.Pattern;
......@@ -145,13 +149,7 @@ public class DataUtils {
if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
} else {
KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
List<KylinPerformanceVo> roadList = new ArrayList();
if (null != performanceData.getRoadShowId() && Integer.parseInt(performanceData.getRoadShowId()) > 0) {
roadList = dataUtils.getRoadList(performanceData.getRoadShowId());
}
redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
performanceData.setRoadList(roadList); // 不一起存到演出详情
}
return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
}
......@@ -513,6 +511,7 @@ public class DataUtils {
query.fields().exclude("details");
query.fields().exclude("noticeImage");
query.fields().exclude("ticketTimeList");
query.fields().exclude("describeElectronic");
List<KylinPerformanceVo> performancesList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
redisUtil.set(redisKey, performancesList);
}
......@@ -528,6 +527,84 @@ public class DataUtils {
redisUtil.del(KylinRedisConst.ORDER_ENTITIES.concat(cityName));
}
/**
* 获取系统推荐演出列表redis
*/
public List<KylinPerformanceVo> getPerformancesListIsSystemRecommend() {
String redisKey = KylinRedisConst.PERFORMANCES_LIST_SYSTEM_RECOMMEND;
if (!redisUtil.hasKey(redisKey)) {
// 固定条件
Query query = new Query();
LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
// 排序
Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart");
Pageable pageable = PageRequest.of(0, 8, sortName);
query.with(pageable);
// 不要查询的字段
query.fields().exclude("details");
query.fields().exclude("noticeImage");
query.fields().exclude("ticketTimeList");
query.fields().exclude("describeElectronic");
// 推荐
List<KylinPerformanceVo> systemRecommendList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
redisUtil.set(redisKey, systemRecommendList);
}
return (List<KylinPerformanceVo>) redisUtil.get(redisKey);
}
/**
* 获取演出预告列表redis
*/
public HashMap<String, Object> getPerformancesListNotice() {
String redisKey = KylinRedisConst.PERFORMANCES_LIST_NOTICE;
if (!redisUtil.hasKey(redisKey)) {
// 固定条件
Query query = new Query();
LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
// 今天的
HashMap toDayTime = DateUtil.oneDayStartEnd();
String nowTimeTStr = (String) toDayTime.get("startStr");
String toDayEndTimeStr = (String) toDayTime.get("endStr");
query.addCriteria(Criteria.where("timeStart").gte(nowTimeTStr).lt(toDayEndTimeStr));
query.fields().exclude("details");
query.fields().exclude("noticeImage");
query.fields().exclude("ticketTimeList");
query.fields().exclude("describeElectronic");
List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
// 固定条件
Query queryT = new Query();
LocalDateTime nowTimeT = LocalDateTime.now();
String nowTimeStrT = nowTimeT.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT));
// 三天的
Calendar cal = Calendar.getInstance();
cal.setTime((Date) toDayTime.get("end"));
Date beforeDayEnd = DateUtil.getBeforeDayEnd(cal, 3);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String threeDaysLaterStr = sdf.format(beforeDayEnd);
queryT.addCriteria(Criteria.where("timeStart").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
queryT.fields().exclude("details");
queryT.fields().exclude("noticeImage");
queryT.fields().exclude("ticketTimeList");
queryT.fields().exclude("describeElectronic");
List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
HashMap<String, Object> info = new HashMap<>();
info.put("toDayList", toDayList);
info.put("threeDaysList", threeDaysList);
redisUtil.set(redisKey, info);
}
return (HashMap<String, Object>) redisUtil.get(redisKey);
}
/**
* 获取推荐演出列表redis
*/
......@@ -546,6 +623,7 @@ public class DataUtils {
query.fields().exclude("details");
query.fields().exclude("noticeImage");
query.fields().exclude("ticketTimeList");
query.fields().exclude("describeElectronic");
// 推荐
query.addCriteria(Criteria.where("isRecommend").is(1));
List<KylinPerformanceVo> recommendList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
......@@ -555,10 +633,27 @@ public class DataUtils {
}
/**
* 删除演出列表redis
* 获取会员专属演出列表redis
*/
public void delPerformancesListIsRecommend() {
redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_RECOMMEND);
public List<KylinPerformanceVo> getPerformancesListIsExclusive() {
String redisKey = KylinRedisConst.PERFORMANCES_LIST_EXCLUSIVE;
if (!redisUtil.hasKey(redisKey)) {
// 固定条件
Query query = new Query();
LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
// 不要查询的字段
query.fields().exclude("details");
query.fields().exclude("noticeImage");
query.fields().exclude("ticketTimeList");
query.fields().exclude("describeElectronic");
// 推荐
query.addCriteria(Criteria.where("isExclusive").is(1));
List<KylinPerformanceVo> exclusiveList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
redisUtil.set(redisKey, exclusiveList);
}
return (List<KylinPerformanceVo>) redisUtil.get(redisKey);
}
/**
......@@ -590,11 +685,4 @@ public class DataUtils {
return (List<KylinPerformanceVo>) redisUtil.get(redisKey);
}
/**
* 删除巡演列表redis
*/
public void delRoadList(String roadShowId) {
redisUtil.del(KylinRedisConst.PERFORMANCES_ROADLIST.concat(roadShowId));
}
}
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