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

Skip to content

L
liquidnet-bus-v1
Commit 222abf1f authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents 5572cf87 047e7660
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 591 additions and 876 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesVo.java
View file @ 222abf1f
......@@ -55,7 +55,6 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
}
private static final KylinOrderTicketEntitiesVo obj = new KylinOrderTicketEntitiesVo();
public static KylinOrderTicketEntitiesVo getNew() {
try {
return (KylinOrderTicketEntitiesVo) obj.clone();
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java
View file @ 222abf1f
......@@ -16,7 +16,7 @@ import java.util.List;
@ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
@Data
public class KylinOrderTicketVo implements Serializable {
public class KylinOrderTicketVo implements Serializable,Cloneable {
private Integer mid;
private static final long serialVersionUID = 5325511589667456213L;
@ApiModelProperty(position = 10, value = "ID")
......@@ -124,4 +124,13 @@ public class KylinOrderTicketVo implements Serializable {
public void setOrderTicketRelation(KylinOrderTicketRelations orderTicketRelation) {
BeanUtils.copyProperties(orderTicketRelation,this);
}
private static final KylinOrderTicketVo obj = new KylinOrderTicketVo();
public static KylinOrderTicketVo getNew() {
try {
return (KylinOrderTicketVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTicketVo();
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ 222abf1f
......@@ -285,7 +285,7 @@ public class PerformanceVoUtils {
ticketTimes.setUpdatedAt(updatedAt);
ticketTimeRelation.setPerformanceId(performancesId);
ticketTimeRelation.setTicketTimeRelationId(IDGenerator.nextSnowId().toString());
ticketTimeRelation.setTicketTimeRelationId(IDGenerator.nextSnowId());
ticketTimeRelation.setTimesId(ticketTimes.getTicketTimesId());
ticketTimeRelation.setCreatedAt(null);
ticketTimeRelation.setUpdatedAt(updatedAt);
......@@ -309,7 +309,8 @@ public class PerformanceVoUtils {
}
//修改票
for (KylinTicketPartnerVo ticketItem : getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
KylinTicketPartnerVo kylinTicketPartnerVo;
kylinTicketPartnerVo = mongoTemplate.findOne(
Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())),
......@@ -338,7 +339,7 @@ public class PerformanceVoUtils {
tickets.setSaleRemindMinute(60);
tickets.setUpdatedAt(updatedAt);
ticketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
ticketStatus.setTicketStatusId(IDGenerator.nextSnowId());
ticketStatus.setTicketId(tickets.getTicketsId());
ticketStatus.setStatusExchange(7);
......@@ -348,14 +349,13 @@ public class PerformanceVoUtils {
ticketRelations.setUpdatedAt(updatedAt);
ticketRelations.setTicketRelationsId(IDGenerator.nextSnowId().toString());
ticketRelations.setTicketRelationsId(IDGenerator.nextSnowId());
ticketRelations.setTicketId(tickets.getTicketsId());
ticketRelations.setUpdatedAt(updatedAt);
if (ticketItem.getStatus() == -2) {
tickets.setAdvanceMinuteMember(5);
ticketStatus.setIsMember(1);
KylinTicketPartnerVo item = kylinTicketPartnerVoList.get(0);
tickets.setAdvanceMinuteMember(ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", item.getTicketsId())).getAdvanceMinuteMember());
ticketStatus.setIsMember(item.getIsMember());
ticketRelations.setCreatedAt(LocalDateTime.now());
tickets.setCreatedAt(LocalDateTime.now());
......
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/config/RestTemplateConfig.java deleted 100644 → 0
View file @ 5572cf87
package com.liquidnet.commons.lang.config;
import org.apache.http.Header;
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.message.BasicHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Configuration
public class RestTemplateConfig {
private static final Logger logger = LoggerFactory.getLogger(RestTemplateConfig.class);
@Bean
public RestTemplate restTemplate() {
// 添加内容转换器,使用默认的内容转换器
RestTemplate restTemplate = new RestTemplate(httpRequestFactory());
// 设置编码格式为UTF-8
List<HttpMessageConverter<?>> converterList = restTemplate.getMessageConverters();
HttpMessageConverter<?> converterTarget = null;
for (HttpMessageConverter<?> item : converterList) {
if (item.getClass() == StringHttpMessageConverter.class) {
converterTarget = item;
break;
}
}
if (converterTarget != null) {
converterList.remove(converterTarget);
}
HttpMessageConverter<?> converter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
converterList.add(1, converter);
return restTemplate;
}
@Bean
public ClientHttpRequestFactory httpRequestFactory() {
return new HttpComponentsClientHttpRequestFactory(httpClient());
}
@Bean
public HttpClient httpClient() {
// 长连接保持30秒
PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(30, TimeUnit.SECONDS);
//设置整个连接池最大连接数 根据自己的场景决定
connectionManager.setMaxTotal(500);
//同路由的并发数,路由是对maxTotal的细分
connectionManager.setDefaultMaxPerRoute(500);
//requestConfig
RequestConfig requestConfig = RequestConfig.custom()
//服务器返回数据(response)的时间，超过该时间抛出read timeout
.setSocketTimeout(10000)
//连接上服务器(握手成功)的时间，超出该时间抛出connect timeout
.setConnectTimeout(5000)
//从连接池中获取连接的超时时间，超过该时间未拿到可用连接，会抛出org.apache.http.conn.ConnectionPoolTimeoutException: Timeout waiting for connection from pool
.setConnectionRequestTimeout(500)
.build();
//headers
List<Header> headers = new ArrayList<>();
headers.add(new BasicHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.16 Safari/537.36"));
headers.add(new BasicHeader("Accept-Encoding", "gzip,deflate"));
headers.add(new BasicHeader("Accept-Language", "zh-CN"));
headers.add(new BasicHeader("Connection", "Keep-Alive"));
headers.add(new BasicHeader("Content-type", "application/json;charset=UTF-8"));
return HttpClientBuilder.create()
.setDefaultRequestConfig(requestConfig)
.setConnectionManager(connectionManager)
.setDefaultHeaders(headers)
// 保持长连接配置，需要在头添加Keep-Alive
.setKeepAliveStrategy(new DefaultConnectionKeepAliveStrategy())
//重试次数，默认是3次，没有开启
.setRetryHandler(new DefaultHttpRequestRetryHandler(2, true))
.build();
}
}
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java
View file @ 222abf1f
......@@ -5,7 +5,6 @@
package com.liquidnet.commons.lang.util;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
/**
......@@ -13,146 +12,137 @@ import java.util.function.Predicate;
* @version 1.0 2015年12月01日 11:42:00
*/
public class CollectionUtil {
/**
* 构建泛型类型的HashMap,该Map的初始容量是0
*
* @param <K>
* @param <V>
* @return
*/
public static <K, V> Map<K, V> hashMap() {
return new HashMap<K, V>(0);
}
public static <K, V> Map<K, V> concurrentMap() {
return new ConcurrentHashMap<K, V>();
}
public static <E> List<E> arrayList () {
return new ArrayList<E>();
}
public static <E> List<E> arrayList (E obj) {
List<E> _list = arrayList();
_list.add(obj);
return _list;
}
public static <E> LinkedList<E> linkedList () {
return new LinkedList<E>();
}
public static <E> Set<E> hashSet () {
return new HashSet<E>();
}
public static <E> List<E> arrayList (Collection<E> c) {
return new ArrayList<E>(c);
}
public static <E> Set<E> hashSet (Collection<E> c) {
return new HashSet<E>(c);
}
@SuppressWarnings("unchecked")
public static <T> T get (Map<?, ?> map, Object obj, Class<T> clazz) {
return (T)map.get(obj);
}
public static <E> boolean isEmpty (Collection<E> c) {
return c == null || c.isEmpty();
}
/**
* 移除集合中符合条件的元素
* @param list List集合
* @param test 移除条件
* @param breakIfFind 是否在第一次移除后就停止查找
* @param <T>
*/
public static <T> void remove(List<T> list,Predicate<T> test,boolean breakIfFind){
if(list == null) {
private static final HashMap<String, String> STRING_STRING_HASH_MAP = new HashMap<>();
private static final HashMap<String, Object> STRING_OBJECT_HASH_MAP = new HashMap<>();
private static final LinkedList<String> STRING_LINKED_LIST = new LinkedList<>();
private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
public static HashMap<String, String> mapStringString() {
return (HashMap<String, String>) STRING_STRING_HASH_MAP.clone();
}
public static HashMap<String, Object> mapStringObject() {
return (HashMap<String, Object>) STRING_OBJECT_HASH_MAP.clone();
}
public static LinkedList<String> linkedListString() {
return (LinkedList<String>) STRING_LINKED_LIST.clone();
}
public static LinkedList<Object[]> linkedListObjectArr() {
return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone();
}
public static ArrayList<Object> arrayListObject() {
return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone();
}
@SuppressWarnings("unchecked")
public static <T> T get(Map<?, ?> map, Object obj, Class<T> clazz) {
return (T) map.get(obj);
}
public static <E> boolean isEmpty(Collection<E> c) {
return c == null || c.isEmpty();
}
/**
* 移除集合中符合条件的元素
*
* @param list List集合
* @param test 移除条件
* @param breakIfFind 是否在第一次移除后就停止查找
* @param <T>
*/
public static <T> void remove(List<T> list, Predicate<T> test, boolean breakIfFind) {
if (list == null) {
return;
}
Iterator<T> it = list.iterator();
while (it.hasNext()){
if(test.test(it.next())){
it.remove();
if (breakIfFind) {
break;
}
}
}
}
/**
* 遍历全部元素,并移除其中符合条件的元素
* @param list List集合
* @param test 移除条件
* @param <T>
*/
public static <T> void remove(List<T> list,Predicate<T> test){
remove(list,test,false);
}
/**
* 遍历全部元素,并移除其中与目标对象相同的元素
* @param list List集合
* @param targetElement 目标对象
* @param <T>
*/
public static <T> void remove(List<T> list, T targetElement) {
remove(list, (Predicate<T>) t -> t.equals(targetElement));
}
/**
* 遍历全部元素,并移除其中的null元素
* @param list List集合
* @param <T>
*/
public static <T> void removeNull(List<T> list) {
remove(list, (Predicate<T>) t -> t == null);
}
/**
* 遍历map中的全部value,并且移除符合条件的元素
* @param map Map集合
* @param test 移除条件
* @param <V>
*/
public static <V> void remove(Map<?, V> map, Predicate<V> test) {
if(map == null) {
Iterator<T> it = list.iterator();
while (it.hasNext()) {
if (test.test(it.next())) {
it.remove();
if (breakIfFind) {
break;
}
}
}
}
/**
* 遍历全部元素,并移除其中符合条件的元素
*
* @param list List集合
* @param test 移除条件
* @param <T>
*/
public static <T> void remove(List<T> list, Predicate<T> test) {
remove(list, test, false);
}
/**
* 遍历全部元素,并移除其中与目标对象相同的元素
*
* @param list List集合
* @param targetElement 目标对象
* @param <T>
*/
public static <T> void remove(List<T> list, T targetElement) {
remove(list, (Predicate<T>) t -> t.equals(targetElement));
}
/**
* 遍历全部元素,并移除其中的null元素
*
* @param list List集合
* @param <T>
*/
public static <T> void removeNull(List<T> list) {
remove(list, (Predicate<T>) t -> t == null);
}
/**
* 遍历map中的全部value,并且移除符合条件的元素
*
* @param map Map集合
* @param test 移除条件
* @param <V>
*/
public static <V> void remove(Map<?, V> map, Predicate<V> test) {
if (map == null) {
return;
}
Iterator<V> it = map.values().iterator();
while (it.hasNext()) {
if (test.test(it.next())) {
it.remove();
}
}
}
/**
* 遍历map中的全部value,并且移除与目标对象相同的元素
* @param map Map集合
* @param targetElement 目标对象
* @param <V>
*/
public static <V> void remove(Map<?, V> map, V targetElement) {
remove(map, (Predicate<V>) v -> v.equals(targetElement));
}
/**
* 遍历map中的全部value,并且移除其中的null值元素
* @param map Map集合
* @param <V>
*/
public static <V> void removeNull(Map<?, V> map) {
remove(map, (Predicate<V>) v -> v == null);
}
Iterator<V> it = map.values().iterator();
while (it.hasNext()) {
if (test.test(it.next())) {
it.remove();
}
}
}
/**
* 遍历map中的全部value,并且移除与目标对象相同的元素
*
* @param map Map集合
* @param targetElement 目标对象
* @param <V>
*/
public static <V> void remove(Map<?, V> map, V targetElement) {
remove(map, (Predicate<V>) v -> v.equals(targetElement));
}
/**
* 遍历map中的全部value,并且移除其中的null值元素
*
* @param map Map集合
* @param <V>
*/
public static <V> void removeNull(Map<?, V> map) {
remove(map, (Predicate<V>) v -> v == null);
}
}
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpOrderUtil.java deleted 100644 → 0
View file @ 5572cf87
package com.liquidnet.commons.lang.util;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.List;
import java.util.Map;
@Component
public class HttpOrderUtil {
@Autowired
private RestTemplate restTemplate;
/**
* get请求
*
* @param url
* @param params 请求参数
* @return
*/
public String get(String url, MultiValueMap<String, String> params) {
return get(url, params, null);
}
/**
* get请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @return
*/
public String get(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
return request(url, params, headers, HttpMethod.GET);
}
/**
* post请求
*
* @param url
* @param params 请求参数
* @return
*/
public String post(String url, MultiValueMap<String, String> params) {
return post(url, params, null);
}
/**
* post请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @return
*/
public String post(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
return request(url, params, headers, HttpMethod.POST);
}
/**
* put请求
*
* @param url
* @param params 请求参数
* @return
*/
public String put(String url, MultiValueMap<String, String> params) {
return put(url, params, null);
}
/**
* put请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @return
*/
public String put(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
return request(url, params, headers, HttpMethod.PUT);
}
/**
* delete请求
*
* @param url
* @param params 请求参数
* @return
*/
public String delete(String url, MultiValueMap<String, String> params) {
return delete(url, params, null);
}
/**
* delete请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @return
*/
public String delete(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
return request(url, params, headers, HttpMethod.DELETE);
}
/**
* 表单请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @param method 请求方式
* @return
*/
public String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
if (params == null) {
params = new LinkedMultiValueMap<>();
}
return request(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
}
/**
* http请求
*
* @param url
* @param params 请求参数
* @param headers 请求头
* @param method 请求方式
* @param mediaType 参数类型
* @return
*/
public String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
if (url == null || url.trim().isEmpty()) {
return null;
}
// header
HttpHeaders httpHeaders = new HttpHeaders();
if (headers != null) {
httpHeaders.addAll(headers);
}
HttpEntity<Object> httpEntity;
if (headers != null) {
// header
httpHeaders = new HttpHeaders();
httpHeaders.addAll(headers);
httpHeaders.setContentType(mediaType);
httpEntity = new HttpEntity(params, httpHeaders);
} else {
httpEntity = new HttpEntity(params, null);
}
// 提交方式：表单、json
ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
return response.getBody();
}
private final String PHP_API_KEY = "R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V";
public String postToPhpApi(String url, MultiValueMap<String, String> params) {
params.add("sign", processForPhpApi(params).concat("&key=").concat(PHP_API_KEY).toUpperCase());
return post(url, params, null);
}
private String processForPhpApi(MultiValueMap<String, String> map) {
StringBuilder sb = new StringBuilder();
for (Map.Entry<String, List<String>> entry : map.entrySet()) {
sb.append(entry.getKey()).append("=").append(entry.getValue().get(0)).append("&");
}
String targetStr = sb.substring(0, sb.length() - 1);
try {
targetStr = URLDecoder.decode(targetStr, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
targetStr = targetStr.replace("%3D", "=").replace("%26", "&");
return targetStr;
}
}
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java
View file @ 222abf1f
......@@ -11,6 +11,11 @@ import java.util.List;
import java.util.Map;
public class HttpUtil {
private static RestTemplate restTemplate;
static {
restTemplate = new RestTemplate();
}
/**
* get请求
......@@ -142,7 +147,7 @@ public class HttpUtil {
}
HttpEntity<Object> httpEntity = new HttpEntity(params, httpHeaders);
RestTemplate restTemplate = new RestTemplate();
// RestTemplate restTemplate = new RestTemplate();
// 提交方式：表单、json
ResponseEntity<String> response = restTemplate.exchange(url, method, httpEntity, String.class);
return response.getBody();
......@@ -170,4 +175,9 @@ public class HttpUtil {
targetStr = targetStr.replace("%3D", "=").replace("%26", "&");
return targetStr;
}
public static void main(String[] args) {
String s = HttpUtil.get("www.baidu.com", null);
System.out.println(s);
}
}
liquidnet-bus-do/liquidnet-service-dragon-do/src/main/java/com/liquidnet/service/dragon/dto/DragonOrdersDto.java
View file @ 222abf1f
......@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
* @date 2021/7/13 19:36
*/
@Data
public class DragonOrdersDto implements Serializable {
public class DragonOrdersDto implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
......@@ -103,4 +103,14 @@ public class DragonOrdersDto implements Serializable {
* deleted_at
*/
private LocalDateTime deletedAt;
private static final DragonOrdersDto obj = new DragonOrdersDto();
public static DragonOrdersDto getNew() {
try {
return (DragonOrdersDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new DragonOrdersDto();
}
}
}
liquidnet-bus-do/liquidnet-service-dragon-do/src/main/java/com/liquidnet/service/dragon/entity/DragonOrders.java
View file @ 222abf1f
......@@ -19,10 +19,9 @@ import java.time.LocalDateTime;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class DragonOrders implements Serializable {
private static final long serialVersionUID = 1L;
public class DragonOrders implements Serializable, Cloneable {
private static final long serialVersionUID = -4897000205961106873L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
......@@ -116,5 +115,15 @@ public class DragonOrders implements Serializable {
*/
private LocalDateTime deletedAt;
private static final DragonOrders obj = new DragonOrders();
public static DragonOrders getNew() {
try {
return (DragonOrders) obj.clone();
} catch (CloneNotSupportedException e) {
return new DragonOrders();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketEntities.java
View file @ 222abf1f
......@@ -140,4 +140,13 @@ public class KylinOrderTicketEntities implements Serializable {
isPayment, updatedAt, orderId,updateTime,createTime
};
}
private static final KylinOrderTicketEntities obj = new KylinOrderTicketEntities();
public static KylinOrderTicketEntities getNew() {
try {
return (KylinOrderTicketEntities) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTicketEntities();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketRelations.java
View file @ 222abf1f
......@@ -92,4 +92,12 @@ public class KylinOrderTicketRelations implements Serializable {
};
}
private static final KylinOrderTicketRelations obj = new KylinOrderTicketRelations();
public static KylinOrderTicketRelations getNew() {
try {
return (KylinOrderTicketRelations) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTicketRelations();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketStatus.java
View file @ 222abf1f
......@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderTicketStatus implements Serializable {
public class KylinOrderTicketStatus implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -103,4 +103,13 @@ public class KylinOrderTicketStatus implements Serializable {
status, updatedAt, orderId
};
}
private static final KylinOrderTicketStatus obj = new KylinOrderTicketStatus();
public static KylinOrderTicketStatus getNew() {
try {
return (KylinOrderTicketStatus) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTicketStatus();
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java
View file @ 222abf1f
......@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderTickets implements Serializable {
public class KylinOrderTickets implements Serializable ,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -259,4 +259,13 @@ public class KylinOrderTickets implements Serializable {
updatedAt, orderTicketsId
};
}
private static final KylinOrderTickets obj = new KylinOrderTickets();
public static KylinOrderTickets getNew() {
try {
return (KylinOrderTickets) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderTickets();
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ 222abf1f
......@@ -174,7 +174,7 @@ public class AdamLoginController {
// rabbitTemplate.convertAndSend(MQConst.EX_LNS_SMS_SENDER, MQConst.RK_SMS_CODE, smsMessage.toJson());
ObjectNode msgNode = JsonUtils.OM().createObjectNode();
msgNode.put("code", smsCode);
boolean sendRst = smsProcessor.send(mobile, SmsEnum.ADSignName.M02.getVal(), SmsEnum.ADTemplate.SMS_109535335.name(), msgNode.asText());
boolean sendRst = smsProcessor.send(mobile, SmsEnum.ADSignName.M02.getVal(), SmsEnum.ADTemplate.SMS_109535335.name(), msgNode.toString());
if (sendRst) {
adamRdmService.setSmsCodeByMobile(mobile, smsCode);
......@@ -443,7 +443,7 @@ public class AdamLoginController {
}
private String ssoProcess(AdamUserInfoVo userInfoVo) {
Map<String, Object> claimsMap = new HashMap<>();
Map<String, Object> claimsMap = CollectionUtil.mapStringObject();
claimsMap.put("sub", userInfoVo.getUid());
claimsMap.put("mobile", userInfoVo.getMobile());
claimsMap.put("nickname", userInfoVo.getNickname());
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 222abf1f
......@@ -4,10 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.constant.LnsEnum;
import com.liquidnet.commons.lang.constant.LnsRegex;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.AdamUserInfoParam;
import com.liquidnet.service.adam.dto.vo.*;
......@@ -288,7 +285,7 @@ public class AdamUserController {
public ResponseDto<Map<String, Object>> info() {
String currentUid = CurrentUtil.getCurrentUid();
Map<String, Object> map = new HashMap<>();
Map<String, Object> map = CollectionUtil.mapStringObject();
AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
userInfoVo.setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
map.put("userInfo", userInfoVo);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 222abf1f
......@@ -197,8 +197,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
* 2-使用会员码(购买的) 仅限从未购买过会员的用户使用，需要填写地址
* 3-使用礼包码(赠送的) 仅限从未购买过会员的用户使用，不需要填写地址
*/
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> operationObjs = new LinkedList<>(), updateMemberOrderObjs = new LinkedList<>();
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(),
updateMemberOrderObjs = CollectionUtil.linkedListObjectArr();
LocalDateTime now = LocalDateTime.now();
if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
AdamUserMemberVo existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid());
......@@ -347,9 +348,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initMemberOrderVo.setSource(CurrentUtil.getCliSource());
initMemberOrderVo.setVersion(CurrentUtil.getCliVersion());
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> updateMemberCodeObjs = new LinkedList<>(),
initMemberOrderObjs = new LinkedList<>(), upsertUserMemberObjs = new LinkedList<>();
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> updateMemberCodeObjs = CollectionUtil.linkedListObjectArr(),
initMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
upsertUserMemberObjs = CollectionUtil.linkedListObjectArr();
AdamUserMemberVo upsertUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
if (null != upsertUserMemberVo) {
upsertUserMemberVo.setState(1);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java
View file @ 222abf1f
package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.core.JwtValidator;
import com.liquidnet.commons.lang.util.BsonUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamUserInfo;
import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserInfoService;
import com.liquidnet.service.base.SqlMapping;
......@@ -27,7 +25,6 @@ import org.springframework.util.DigestUtils;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
......@@ -73,8 +70,9 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> updateUserObjs = new LinkedList<>(), updateUserInfoObjs = new LinkedList<>();
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> updateUserObjs = CollectionUtil.linkedListObjectArr(),
updateUserInfoObjs = CollectionUtil.linkedListObjectArr();
s = System.currentTimeMillis();
toMqSqls.add(SqlMapping.get("adam_user.complete"));
......@@ -134,7 +132,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
}
private String flushSsoProcess(AdamUserInfoVo userInfoVo) {
Map<String, Object> claimsMap = new HashMap<>();
Map<String, Object> claimsMap = CollectionUtil.mapStringObject();
claimsMap.put("sub", userInfoVo.getUid());
claimsMap.put("mobile", userInfoVo.getMobile());
claimsMap.put("nickname", userInfoVo.getNickname());
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 222abf1f
......@@ -37,9 +37,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import java.time.LocalDateTime;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.liquidnet.service.adam.constant.AdamRedisConst.LOCK_KEY_UREGISTER;
......@@ -96,8 +94,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
adamRdmService.setUidByMobile(mobile, userInfoVo.getUid());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> initUserObjs = new LinkedList<>(), initUserInfoObjs = new LinkedList<>();
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
initUserInfoObjs = CollectionUtil.linkedListObjectArr();
s = System.currentTimeMillis();
toMqSqls.add(SqlMapping.get("adam_user.add"));
......@@ -129,8 +128,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
long s = System.currentTimeMillis();
uid = adamRdmService.getUidByMobile(param.getMobile());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> initUserObjs = new LinkedList<>(), initThirdPartObjs = new LinkedList<>();
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
initThirdPartObjs = CollectionUtil.linkedListObjectArr();
if (StringUtils.isEmpty(uid)) {// 手机号未注册
userInfoVo = AdamUserInfoVo.getNew();
......@@ -289,10 +289,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void close(String uid) {
LocalDateTime now = LocalDateTime.now();
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> objsUser = new LinkedList<>(),
objsThirdPart = new LinkedList<>(),
objsAddresses = new LinkedList<>();
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> objsUser = CollectionUtil.linkedListObjectArr(),
objsThirdPart = CollectionUtil.linkedListObjectArr(),
objsAddresses = CollectionUtil.linkedListObjectArr();
long s = System.currentTimeMillis();
AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/biz/DragonServiceCommonBiz.java
View file @ 222abf1f
......@@ -38,7 +38,7 @@ public class DragonServiceCommonBiz {
public DragonOrders buildPayOrders(DragonPayBaseReqDto dragonPayBaseReqDto, DragonPayBaseRespDto respDto){
//构造订单
DragonOrders orders = new DragonOrders();
DragonOrders orders = DragonOrders.getNew();
// orders.setMid();
orders.setOrderId(IDGenerator.nextTimeId());
orders.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode()));
......@@ -58,7 +58,7 @@ public class DragonServiceCommonBiz {
orders.setCreatedAt(LocalDateTime.now());
// orders.setUpdatedAt();
DragonOrdersDto ordersDto = new DragonOrdersDto();
DragonOrdersDto ordersDto = DragonOrdersDto.getNew();
BeanUtil.copy(orders,ordersDto);
long startTime = System.currentTimeMillis();
//放到redis缓存中
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/biz/AlipayBiz.java
View file @ 222abf1f
......@@ -14,6 +14,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.dragon.channel.alipay.req.AlipayTradePayReq;
import com.liquidnet.service.dragon.channel.alipay.sign.MD5;
import com.liquidnet.service.dragon.utils.ObjectUtil;
import com.liquidnet.service.dragon.utils.PayAlipayUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
......@@ -37,7 +38,7 @@ public class AlipayBiz{
* @param alipayTradePayReq
* @return
*/
public static Map<String, Object> tradeWapPay(AlipayTradePayReq alipayTradePayReq) {
public static Map<String, Object> tradeWapPay_yace(AlipayTradePayReq alipayTradePayReq) {
log.info("AlipayBiz.tradeWapPay-->> req : {}",alipayTradePayReq.toString());
String timeExpress = "5m";// 支付超时，线下扫码交易定义为5分钟
......@@ -78,13 +79,13 @@ public class AlipayBiz{
}
}
public static Map<String, Object> tradeWapPay_backup(AlipayTradePayReq alipayTradePayReq) {
public static Map<String, Object> tradeWapPay(AlipayTradePayReq alipayTradePayReq) {
log.info("AlipayBiz.tradeWapPay-->> req : {}",alipayTradePayReq.toString());
String timeExpress = "5m";// 支付超时，线下扫码交易定义为5分钟
AlipayClient alipayClient = PayAlipayUtils.getInstance().getHttpClient();
SortedMap<String, Object> paramMap = new TreeMap<>();
SortedMap<String, Object> paramMap = ObjectUtil.cloneSortedMapStringAndObj();
paramMap.put("product_code", alipayTradePayReq.getProductCode());
paramMap.put("total_amount", alipayTradePayReq.getTotalAmount().toString());
paramMap.put("subject", alipayTradePayReq.getSubject());
......@@ -96,8 +97,8 @@ public class AlipayBiz{
AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
request.setNotifyUrl(alipayTradePayReq.getNotifyUrl());
// request.setTimestamp(DateUtil.now());
log.info("bizContent :{}", JSONObject.toJSONString(paramMap));
request.setBizContent(JSONObject.toJSONString(paramMap));
log.info("bizContent :{}", JsonUtils.toJson(paramMap));
request.setBizContent(JsonUtils.toJson(paramMap));
try {
long startTime = System.currentTimeMillis();
AlipayTradeWapPayResponse response = alipayClient.sdkExecute(request);
......@@ -109,7 +110,7 @@ public class AlipayBiz{
return responseJSON;
} catch (AlipayApiException e) {
log.error("支付宝支付异常:{}", e);
JSONObject resultJSON = new JSONObject();
JSONObject resultJSON = ObjectUtil.cloneJsonObjectObj();
resultJSON.put("outTradeNo", alipayTradePayReq.getOutTradeNo());
resultJSON.put("totalAmount", alipayTradePayReq.getTotalAmount().toString());
resultJSON.put("errorCode", "9999");
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/DataUtils.java
View file @ 222abf1f
......@@ -14,14 +14,13 @@ public class DataUtils {
private long keyExpireTime = 3600*24*7;
public void createPayOrder(String code, DragonOrdersDto ordersDto) {
if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_CODE + code)) {
redisUtil.set(DragonConstant.REDIS_KET_PAY_CODE + code, ordersDto,keyExpireTime);
}
redisUtil.set(DragonConstant.REDIS_KET_PAY_CODE + code, ordersDto,keyExpireTime);
}
public DragonOrdersDto getPayOrderByCode(String code) {
if (redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_CODE + code)) {
return (DragonOrdersDto) redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
Object obj = redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
if(obj!=null){
return (DragonOrdersDto) obj;
}
return null;
}
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/MqHandleUtil.java
View file @ 222abf1f
......@@ -32,7 +32,7 @@ public class MqHandleUtil {
*/
public boolean sendNotifyErrorQueue(PayNotifyReqBo payNotifyReqBo,String queueKey) {
try {
HashMap<String, String> map = new HashMap<>();
HashMap<String, String> map = ObjectUtil.hashMapStringAndString;
map.put("message", payNotifyReqBo.toString());
MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(queueKey);
stringRedisTemplate.opsForStream().add(record);
......@@ -52,13 +52,13 @@ public class MqHandleUtil {
*/
public boolean sendMySqlRedis(String sql, Object[] data , String redisKey) {
try {
LinkedList<String> sqls = new LinkedList<>();
LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
sqls.add(sql);
LinkedList<Object[]> sqlsData = new LinkedList();
LinkedList<Object[]> sqlsData = ObjectUtil.cloneLinkedListObj();
sqlsData.add(data);
String sqlData = SqlMapping.gets(sqls, sqlsData);
HashMap<String, String> map = new HashMap<>();
HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
map.put("message", sqlData);
MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(redisKey);
stringRedisTemplate.opsForStream().add(record);
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/ObjectUtil.java 0 → 100644
View file @ 222abf1f
package com.liquidnet.service.dragon.utils;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.request.AlipayTradeWapPayRequest;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.SortedMap;
import java.util.TreeMap;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: ObjectUtil
* @Package com.liquidnet.service.dragon.utils
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/7/21 16:00
*/
@Component
public class ObjectUtil {
public static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
public static final LinkedList<String> linkedListStr = new LinkedList<String>();
public static final HashMap<String, String> hashMapStringAndString = new HashMap<>();
public static final SortedMap<String, Object> sortedMapStringAndObj = new TreeMap<>();
public static final AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
public static final JSONObject jsonObjectObj = new JSONObject();
public static LinkedList<Object[]> cloneLinkedListObj() {
linkedListObj.clear();
return linkedListObj;
}
public static LinkedList<String> cloneLinkedListStr() {
linkedListStr.clear();
return linkedListStr;
}
public static HashMap<String, String> cloneHashMapStringAndString() {
hashMapStringAndString.clear();
return hashMapStringAndString;
}
public static SortedMap<String, Object> cloneSortedMapStringAndObj() {
sortedMapStringAndObj.clear();
return sortedMapStringAndObj;
}
public static AlipayTradeWapPayRequest cloneAlipayTradeWapPayRequest() {
return alipayTradeWapPayRequest;
}
public static JSONObject cloneJsonObjectObj() {
return jsonObjectObj;
}
}
liquidnet-bus-service/liquidnet-service-example/liquidnet-service-example-impl/pom.xml
View file @ 222abf1f
......@@ -21,18 +21,18 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-account</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-sequence</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.liquidnet</groupId>-->
<!-- <artifactId>liquidnet-api-feign-account</artifactId>-->
<!-- <version>1.0-SNAPSHOT</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.liquidnet</groupId>-->
<!-- <artifactId>liquidnet-api-feign-sequence</artifactId>-->
<!-- <version>1.0-SNAPSHOT</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-common-cache-redisson</artifactId>
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties
View file @ 222abf1f
......@@ -35,28 +35,6 @@
20029=未选择支付方式
20030=查看失败
#APP PARTNER
20101=添加失败
20102=删除失败
20103=修改失败
20104=查询失败
20105=创建失败
20106=不可删除
20107=复制失败
20108=上线失败
20109=下线失败
20110=不可上线
20111=不可下线
20112=不可修改
20113=未创建场次
20114=有场次未创建票种
20115=提交失败
20116=不可撤回
20117=撤回失败
20118=日期有误
#APP JDM
20201=
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java
View file @ 222abf1f
package com.liquidnet.service.order.controller;
import com.liquidnet.commons.lang.util.HttpOrderUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.codec.annotation.DecryptAndVerify;
import com.liquidnet.service.base.codec.vo.EncryptedReq;
import com.liquidnet.service.kylin.dto.param.PayAgainParam;
import com.liquidnet.service.kylin.dto.param.PayOrderParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderDtoParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.returns.*;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
......@@ -19,7 +16,6 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import sun.net.www.http.HttpClient;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/DataUtils.java
View file @ 222abf1f
......@@ -53,14 +53,16 @@ public class DataUtils {
}
public List<KylinOrderListVo> getOrderList(String userId) {
if (redisUtil.hasKey(KylinRedisConst.ORDER_LIST + userId)) {
Object obj = redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
if (obj!=null) {
return (List<KylinOrderListVo>)obj;
} else {
List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
.with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
return voList;
}
return (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
}
/**
......@@ -70,14 +72,16 @@ public class DataUtils {
* @return
*/
public KylinOrderTicketVo getOrderTicketVo(String orderId) {
if (redisUtil.hasKey(KylinRedisConst.ORDER + orderId)) {
Object obj = redisUtil.get(KylinRedisConst.ORDER + orderId);
if (obj!=null) {
return (KylinOrderTicketVo) obj;
} else {
KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
ticketData.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
redisUtil.set(KylinRedisConst.ORDER + orderId, ticketData);
return ticketData;
}
return (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
}
/**
......@@ -190,12 +194,14 @@ public class DataUtils {
* @return
*/
public KylinPerformanceVo getPerformanceVo(String performanceId) {
if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
if (obj!=null) {
return (KylinPerformanceVo)obj;
} else {
KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
return performanceData;
}
return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
}
public void delOrderRefundVoByOrderId(String orderId) {
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/ObjectUtil.java 0 → 100644
View file @ 222abf1f
package com.liquidnet.service.order.utils;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.mongodb.BasicDBObject;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: ObjectUtil
* @Package com.liquidnet.service.dragon.utils
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/7/21 16:00
*/
@Component
public class ObjectUtil {
public static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
public static final LinkedList<String> linkedListStr = new LinkedList<String>();
public static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
public static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
public static final List<AdamEntersVo> arrayListObject = new ArrayList<>();
public static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
public static final BasicDBObject basicDBObject = new BasicDBObject();
public static final Object[] objectsArray = new Object[100];
public static LinkedList<Object[]> cloneLinkedListObj() {
linkedListObj.clear();
return linkedListObj;
}
public static LinkedList<String> cloneLinkedListStr() {
linkedListStr.clear();
return linkedListStr;
}
public static HashMap<String, String> cloneHashMapStringAndString() {
hashMapStringAndString.clear();
return hashMapStringAndString;
}
public static HashMap<String, Object> cloneHashMapStringAndObject() {
hashMapStringAndObject.clear();
return hashMapStringAndObject;
}
public static List<AdamEntersVo> cloneArrayListObject() {
arrayListObject.clear();
return arrayListObject;
}
public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
linkedMultiValueMapStringAndString.clear();
return linkedMultiValueMapStringAndString;
}
public static Object[] cloneObjectsArray() {
return objectsArray.clone();
}
public static BasicDBObject cloneBasicDBObject() {
basicDBObject.clear();
return basicDBObject;
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/errors.properties
View file @ 222abf1f
......@@ -9,4 +9,24 @@
#APP PARTNER
20101=添加失败
20102=删除失败
20103=修改失败
20104=查询失败
20105=创建失败
20106=不可删除
20107=复制失败
20108=上线失败
20109=下线失败
20110=不可上线
20111=不可下线
20112=不可修改
20113=未创建场次
20114=有场次未创建票种
20115=提交失败
20116=不可撤回
20117=撤回失败
20118=日期有误
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