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

Skip to content

L
liquidnet-bus-v1
Commit 6e63a6ef authored by anjiabin's avatar anjiabin
Browse files
Options

提交chime社交相关

parent 7e1dcbb9
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 18 deletions
liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/dto/PerformanceDto.java
View file @ 6e63a6ef
......@@ -3,6 +3,8 @@ package com.liquidnet.service.chime.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
......@@ -28,6 +30,8 @@ public class PerformanceDto {
private String cityName;
@ApiModelProperty(value = "在场人数")
private Integer joinUserCount;
@ApiModelProperty(value = "小头像")
private List<String> avatarImgList;
private static final PerformanceDto obj = new PerformanceDto();
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 6e63a6ef
......@@ -61,6 +61,7 @@ liquidnet:
pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
url: http://devkylin.zhengzai.tv/kylin
order:
adam:
url: http://devadam.zhengzai.tv/adam
......
liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java 0 → 100644
View file @ 6e63a6ef
package com.liquidnet.service.feign.kylin.api;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.chime.config.SecuringRequestInterceptor;
import feign.hystrix.FallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.HashMap;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: FeignKylinForChimeClient
* @Package com.liquidnet.service.feign.kylin.api
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/9/11 18:20
*/
@Component
@FeignClient(name = "liquidnet-service-kylin",
contextId = "FeignKylinForChimeClient", path = "",
url = "${liquidnet.service.kylin.url}",
fallback = FallbackFactory.Default.class,
configuration = SecuringRequestInterceptor.class)
public interface FeignKylinForChimeClient {
@GetMapping("performance/localList")
ResponseDto<HashMap<String, Object>> localList(
@RequestParam(value = "cityName",defaultValue = "") String cityName,
@RequestParam(value = "days",defaultValue = "0") int days,
@RequestParam(value = "type",defaultValue = "0") int type,
@RequestParam(value = "isDiscount",defaultValue = "") Integer isDiscount,
@RequestParam(value = "isAdvance",defaultValue = "") Integer isAdvance,
@RequestParam(value = "isExclusive",defaultValue = "") Integer isExclusive,
// 排序
@RequestParam(value = "orderBy",defaultValue = "") String orderBy,
@RequestParam(value = "sort",defaultValue = "") String sort
);
}
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/ServiceChimeApplication.java
View file @ 6e63a6ef
......@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.core.env.Environment;
import java.net.InetAddress;
import java.util.Arrays;
@Slf4j
@EnableFeignClients
@SpringBootApplication(scanBasePackages = {"com.liquidnet"})
public class ServiceChimeApplication implements CommandLineRunner {
@Autowired
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/config/SecuringRequestInterceptor.java 0 → 100644
View file @ 6e63a6ef
//package com.liquidnet.service.chime.config;
//
//import feign.RequestInterceptor;
//import feign.RequestTemplate;
//import org.springframework.stereotype.Component;
//import org.springframework.web.context.request.RequestContextHolder;
//import org.springframework.web.context.request.ServletRequestAttributes;
//import javax.servlet.http.HttpServletRequest;
//import java.util.Enumeration;
//
///**
// * @author AnJiabin <anjiabin@zhengzai.tv>
// * @version V1.0
// * @Description: 解决feign调用传递header问题
// * @class: SecuringRequestInterceptor
// * @Package com.liquidnet.service.chime.config
// * @Copyright: LightNet @ Copyright (c) 2021
// * @date 2021/9/11 19:22
// */
//@Component
//public class SecuringRequestInterceptor implements RequestInterceptor {
// @Override
// public void apply(RequestTemplate requestTemplate) {
// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder
// .getRequestAttributes();
// HttpServletRequest request = attributes.getRequest();
// Enumeration<String> headerNames = request.getHeaderNames();
// if (headerNames != null) {
// while (headerNames.hasMoreElements()) {
// String name = headerNames.nextElement();
// String values = request.getHeader(name);
// requestTemplate.header(name, values);
// }
// }
// }
//}
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/ChimePerformanceController.java
View file @ 6e63a6ef
package com.liquidnet.service.chime.controller;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.chime.dto.ChimeUserInfoDto;
......@@ -8,6 +12,8 @@ import com.liquidnet.service.chime.dto.ChimeUserListQueryReqDto;
import com.liquidnet.service.chime.dto.PerformanceDto;
import com.liquidnet.service.chime.service.IChimePerformanceService;
import com.liquidnet.service.chime.service.IChimeUserService;
import com.liquidnet.service.feign.kylin.api.FeignKylinForChimeClient;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -20,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
......@@ -42,6 +49,9 @@ public class ChimePerformanceController {
@Autowired
private IChimeUserService chimeUserService;
@Autowired
private FeignKylinForChimeClient feignKylinForChimeClient;
@GetMapping("myPerformanceList")
@ApiOperation("已购票的演出")
@ApiImplicitParams({
......@@ -78,38 +88,67 @@ public class ChimePerformanceController {
return ResponseDto.success(performanceDtoList);
}
@GetMapping("localPerformanceList")
@ApiOperation("本地最近演出列表")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称", required = true),
@ApiImplicitParam(type = "query", dataType = "int", name = "page", value = "页码"),
@ApiImplicitParam(type = "query", dataType = "int", name = "size", value = "每页数量"),
@ApiImplicitParam(type = "query", dataType = "int", name = "days", value = "时间范围 几天 今天1 三天3。。。"),
@ApiImplicitParam(type = "query", dataType = "int", name = "type", value = "演出类型 101音乐节 102小型演出(livehouse演出) 103巡演 演出类型只有这几个了"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isDiscount", value = "是否会员优惠 0 1"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isAdvance", value = "是否优先 0 1"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isExclusive", value = "是否会员专属 0 1"),
@ApiImplicitParam(type = "query", dataType = "String", name = "orderBy", value = "排序字段 时间timeStart"),
@ApiImplicitParam(type = "query", dataType = "String", name = "sort", value = "排序方式[DESC ASC]"),
})
public ResponseDto<List<PerformanceDto>> localPerformanceList(
public ResponseDto<HashMap<String, Object>> localPerformanceList(
@RequestParam(defaultValue = "") String cityName,
@RequestParam(defaultValue = "") String userId,
@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "10") int size,
@RequestParam(defaultValue = "0") int days,
@RequestParam(defaultValue = "0") int type,
@RequestParam(defaultValue = "") Integer isDiscount,
@RequestParam(defaultValue = "") Integer isAdvance,
@RequestParam(defaultValue = "") Integer isExclusive,
// 排序
@RequestParam(defaultValue = "") String orderBy,
@RequestParam(defaultValue = "") String sort
) {
List<PerformanceDto> performanceDtoList = new ArrayList<>();
for(int i=0;i<10;i++){
PerformanceDto dto = PerformanceDto.getNew();
dto.setPerformancesId(IDGenerator.get32UUID());
dto.setTitle("本地最近演出00"+(i+1));
dto.setImgPoster("https://img.zhengzai.tv/files/2021/03/09/604705d6b1147.jpeg");
dto.setTimeStart("2021-09-08 12:00:00");
dto.setTimeEnd("2021-10-08 12:00:00");
dto.setCityName("北京");
dto.setJoinUserCount(123+(i*2));
performanceDtoList.add(dto);
ResponseDto<HashMap<String, Object>> responseDto = feignKylinForChimeClient.localList(cityName, days,type,isDiscount, isAdvance, isExclusive, orderBy, sort);
if(StringUtil.isNotNull(responseDto.getData())){
String jsonStr = JSON.toJSONString(responseDto.getData().get("list"));
List<KylinPerformanceVo> kylinPerformanceVoList = JsonUtils.fromJson(jsonStr, new TypeReference<List<KylinPerformanceVo>>() {});
List<PerformanceDto> performanceDtoList = new ArrayList<>();
for(KylinPerformanceVo performanceVo:kylinPerformanceVoList){
PerformanceDto dto = PerformanceDto.getNew();
dto.setPerformancesId(IDGenerator.get32UUID());
dto.setTitle(performanceVo.getTitle());
dto.setImgPoster(performanceVo.getImgPoster());
dto.setTimeStart(performanceVo.getTimeStart());
dto.setTimeEnd(performanceVo.getTimeEnd());
dto.setCityName(performanceVo.getCityName());
dto.setJoinUserCount(123);
List<String> imgList = new ArrayList<>();
imgList.add("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
imgList.add("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
imgList.add("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
imgList.add("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
imgList.add("https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png");
dto.setAvatarImgList(imgList);
performanceDtoList.add(dto);
}
responseDto.getData().put("list",performanceDtoList);
}
return ResponseDto.success(performanceDtoList);
return responseDto;
}
@GetMapping("getUserListByCon")
@ApiOperation("查询用户列表")
@ApiImplicitParams({
......
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