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

Skip to content

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

fix:kylin new优化;

parent 02af3785
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 180 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderListVo.java
View file @ e8a4fca6
package com.liquidnet.service.kylin.dto.vo.returns;
import com.liquidnet.service.kylin.entity.KylinBannersRelations;
import lombok.Data;
import java.io.Serializable;
......
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java
View file @ e8a4fca6
/**
* $Id: CollectionUtil.java 3776 2016-03-10 06:43:12Z lizhongmin $
* Copyright(C) 2014-2020 easegame, All Rights Reserved.
*/
package com.liquidnet.commons.lang.util;
import org.springframework.util.LinkedMultiValueMap;
......@@ -9,16 +5,14 @@ import org.springframework.util.LinkedMultiValueMap;
import java.util.*;
import java.util.function.Predicate;
/**
* @author <a href="mailto:wangwei@kowlone.com">kowlone</a>
* @version 1.0 2015年12月01日 11:42:00
*/
public class CollectionUtil {
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 HashMap<String, Integer> STRING_INTEGER_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 LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
private static final ArrayList<String> STRING_ARRAY_LIST = new ArrayList<>();
private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
......@@ -30,6 +24,10 @@ public class CollectionUtil {
return (HashMap<String, Object>) STRING_OBJECT_HASH_MAP.clone();
}
public static HashMap<String, Integer> mapStringInteger() {
return (HashMap<String, Integer>) STRING_INTEGER_HASH_MAP.clone();
}
public static LinkedList<String> linkedListString() {
return (LinkedList<String>) STRING_LINKED_LIST.clone();
}
......@@ -42,6 +40,10 @@ public class CollectionUtil {
return (LinkedMultiValueMap<String, String>) STRING_STRING_LINKED_MULTI_VALUE_MAP.clone();
}
public static ArrayList<String> arrayListString() {
return (ArrayList<String>) STRING_ARRAY_LIST.clone();
}
public static ArrayList<Object> arrayListObject() {
return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone();
}
......
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java
View file @ e8a4fca6
/**
* $Id$
* Copyright(C) 2015-2020 kowlone - internet center, All Rights Reserved.
*/
package com.liquidnet.commons.lang.util;
import org.apache.commons.lang3.StringUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.chrono.ChronoLocalDate;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
/**
* @author <a href="kowlone2006@163.com">kowlone</a>
* @version 1.0 2015年10月16日 13:32:00
*/
public abstract class DateUtil {
public static final String DATE_FULL_STR = "yyyy-MM-dd HH:mm:ss";
public static final String DATE_SMALL_STR = "yyyy-MM-dd";
public static final SimpleDateFormat SDF_YMD_HMS = new SimpleDateFormat(DATE_FULL_STR);
public static final SimpleDateFormat SDF_YMD = new SimpleDateFormat(DATE_SMALL_STR);
public static final DateTimeFormatter DTF_YMD_HMS = DateTimeFormatter.ofPattern(DATE_FULL_STR);
/**
* 日期格式化器
*/
......@@ -277,26 +275,8 @@ public abstract class DateUtil {
* 比较日期
*/
public static int compareStrDay(String date1, String date2) {
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime date1L = LocalDateTime.parse(date1, df);
LocalDateTime date2L = LocalDateTime.parse(date2, df);
if (date1L.isAfter(date2L)) {// 大于
return 1;
} else if (date1L.isBefore(date2L)) { //小于
return -1;
} else { // 相等
return 0;
}
}
/**
* 比较日期
*/
public static int compareStrDayyyyMMdd(String date1, String date2) {
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime date1L = LocalDateTime.parse(date1, df);
LocalDateTime date2L = LocalDateTime.parse(date2, df);
LocalDateTime date1L = LocalDateTime.parse(date1, DTF_YMD_HMS);
LocalDateTime date2L = LocalDateTime.parse(date2, DTF_YMD_HMS);
if (date1L.isAfter(date2L)) {// 大于
return 1;
......@@ -380,8 +360,7 @@ public abstract class DateUtil {
* 返回当前时间 yyyy-MM-dd HH:mm:ss
*/
public static String getNowTime() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String time = sdf.format(new Date());
String time = SDF_YMD_HMS.format(new Date());
return time;
}
......@@ -434,8 +413,7 @@ public abstract class DateUtil {
calendar.set(Calendar.SECOND, 0);
Date start = calendar.getTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startStr = sdf.format(start);
String startStr = SDF_YMD_HMS.format(start);
datas.put("start", start);
datas.put("startStr", startStr);
......@@ -443,7 +421,7 @@ public abstract class DateUtil {
calendar.add(Calendar.SECOND, -1);
Date end = calendar.getTime();
String endStr = sdf.format(end);
String endStr = SDF_YMD_HMS.format(end);
datas.put("end", end);
datas.put("endStr", endStr);
......@@ -453,14 +431,13 @@ public abstract class DateUtil {
// 获取当月第一天 jiangxiulong
public static String getMonthFirst() {
//规定返回日期格式
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
Date theDate = calendar.getTime();
GregorianCalendar gcLast = (GregorianCalendar) Calendar.getInstance();
gcLast.setTime(theDate);
//设置为第一天
gcLast.set(Calendar.DAY_OF_MONTH, 1);
String dayFirst = sf.format(gcLast.getTime());
String dayFirst = SDF_YMD.format(gcLast.getTime());
//打印本月第一天
return dayFirst;
}
......@@ -477,8 +454,7 @@ public abstract class DateUtil {
//设置日期为本月最大日期
calendar.set(Calendar.DATE, calendar.getActualMaximum(calendar.DATE));
//设置日期格式
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
String dayLast = sf.format(calendar.getTime());
String dayLast = SDF_YMD.format(calendar.getTime());
return dayLast + " 23:59:59";
}
......@@ -486,10 +462,9 @@ public abstract class DateUtil {
// 获取某月最后一天 jiangxiulong
public static String getMonthLast(String month) {
// String 转 Date
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date monthDate = null;
try {
monthDate = simpleDateFormat.parse(month);
monthDate = SDF_YMD.parse(month);
} catch (Exception e) {
return "";
}
......@@ -499,53 +474,11 @@ public abstract class DateUtil {
//设置日期为本月最大日期
calendar.set(Calendar.DATE, calendar.getActualMaximum(calendar.DATE));
//设置日期格式
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
String dayLast = sf.format(calendar.getTime());
String dayLast = SDF_YMD.format(calendar.getTime());
return dayLast + " 23:59:59";
}
public static void main(String[] args) {
//
// Calendar calendarBefore = Calendar.getInstance();
// System.out.println(new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(
// DateUtil.getBeforeDayBegin(calendarBefore,-1)));
// Calendar calendarEnd = Calendar.getInstance();
// System.out.println(new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(
// DateUtil.getBeforeDayEnd(calendarEnd,-1)));
// long dayNum = DateUtil.intervalHours(DateUtil.parse("2016-08-31 18:02:00", "yyyy-MM-dd HH:mm:ss"), new Date());
// System.out.print("dayNum=======" + dayNum);
// Set<String> holidays = new HashSet<>();
// holidays.add("20160416");
// holidays.add("20160417");
// Date d = DateUtil.reduceDay(DateUtil.now(),3,holidays);
// System.out.println(d);
// DateUtil.getWeekend(2017).forEach((date)->{
// System.out.println(DateUtil.format(date,Formatter.yyyy_MM_dd));
// });
// try{
// DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
// long now = System.currentTimeMillis();
// Calendar calendar = Calendar.getInstance();
// calendar.setTimeInMillis(now);
// System.out.println(now + " = " + formatter.format(calendar.getTime()));
// // 日期转换为毫秒 两个日期想减得到天数
// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// String start="2011-09-20 12:30:45";
// String end ="2011-10-20 6:30:00";
// //得到毫秒数
// long timeStart=sdf.parse(start).getTime();
// long timeEnd =sdf.parse(end).getTime();
// //两个日期想减得到天数
// long dayCount= (timeEnd-timeStart)/(24*3600*1000);
// System.out.println(dayCount);
// }catch(Exception e){
//
// }
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/ObjectUtil.java
View file @ e8a4fca6
......@@ -15,12 +15,12 @@ public class ObjectUtil {
private static final PagedResult<AdamDisposedVo> adamDisposedVoPagedResult = new PagedResult<>();
private static final PagedResult<AdamDisposedUserVo> adamDisposedUserVoPagedResult = new PagedResult<>();
public static List<AdamTagParentVo> getAdamTagParentVoArrayList() {
return (List<AdamTagParentVo>) adamTagParentVoArrayList.clone();
public static ArrayList<AdamTagParentVo> getAdamTagParentVoArrayList() {
return (ArrayList<AdamTagParentVo>) adamTagParentVoArrayList.clone();
}
public static List<AdamTagVo> getAdamTagVoArrayList() {
return (List<AdamTagVo>) adamTagVoArrayList.clone();
public static ArrayList<AdamTagVo> getAdamTagVoArrayList() {
return (ArrayList<AdamTagVo>) adamTagVoArrayList.clone();
}
public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ e8a4fca6
......@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.controller;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.PayAgainParam;
......@@ -101,7 +102,7 @@ public class KylinOrderTicketsController {
@RequestParam(value = "picList", required = false) String picList) {
String orderRefundId = orderTicketsService.sendOrderRefund(orderId, orderTicketEntitiesId, reason, picList);
if (orderRefundId.length() > 10) {
HashMap<String, String> map = new HashMap<String, String>();
HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("orderRefundsId", orderRefundId);
return ResponseDto.success(map);
} else {
......@@ -130,7 +131,7 @@ public class KylinOrderTicketsController {
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap> orderUnPayCount() {
Integer unPayCount = orderTicketsService.orderUnPayCount().getData();
HashMap<String, Integer> map = new HashMap<>();
HashMap<String, Integer> map = CollectionUtil.mapStringInteger();
map.put("unPayCount", unPayCount);
return ResponseDto.success(map);
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinStationController.java
View file @ e8a4fca6
......@@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.util.CollectionUtils;
import org.springframework.util.DigestUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
......@@ -45,10 +44,10 @@ import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@Api(tags = "验票")
......@@ -524,8 +523,8 @@ public class KylinStationController {
return ResponseDto.success(stationLoginVo);
}
private static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) {
Map<Object, Boolean> seen = new ConcurrentHashMap<>();
return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
}
// private static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) {
// Map<Object, Boolean> seen = new ConcurrentHashMap<>();
// return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
// }
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/FieldsServiceImpl.java
View file @ e8a4fca6
package com.liquidnet.service.kylin.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
import com.liquidnet.service.kylin.entity.KylinFields;
import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
import com.liquidnet.service.kylin.service.KylinFieldsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
......@@ -31,7 +29,7 @@ public class FieldsServiceImpl implements KylinFieldsService {
@Override
public HashMap<String,Object> fieldList(int page, int size, int city_id) {
HashMap<String,Object> info = new HashMap<>();
HashMap<String,Object> info = CollectionUtil.mapStringObject();
// 排序 分页
Pageable pageable = PageRequest.of(0, size, Sort.by(Sort.Direction.DESC, "createdAt"));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ e8a4fca6
......@@ -24,6 +24,7 @@ import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.liquidnet.service.kylin.utils.ObjectUtil;
import com.liquidnet.service.kylin.utils.OrderUtils;
import com.liquidnet.service.kylin.utils.QueueUtils;
import com.mongodb.BasicDBObject;
......@@ -205,7 +206,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
}
List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
List<OrderRefundListVo> orderRefundListVos = ObjectUtil.getOrderRefundListVoArrayList();
BigDecimal lockPrice = BigDecimal.valueOf(0.00);
for (KylinOrderRefundsVo item : orderRefundsVoList) {
OrderRefundListVo data = OrderRefundListVo.getNew();
......@@ -287,7 +288,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return ResponseDto.failure(ErrorMapping.get("20003"));
}
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
List<KylinOrderTicketEntitiesPreRefundVo> kylinOrderTicketEntitiesPreRefundVos = new ArrayList<>();
List<KylinOrderTicketEntitiesPreRefundVo> kylinOrderTicketEntitiesPreRefundVos = ObjectUtil.getKylinOrderTicketEntitiesPreRefundVoArrayList();
// 数据脱敏
for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
KylinOrderTicketEntitiesPreRefundVo refundVo = KylinOrderTicketEntitiesPreRefundVo.getNew();
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ e8a4fca6
package com.liquidnet.service.kylin.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.CommonConst;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.DistanceUtil;
import com.liquidnet.service.base.UserPathDto;
......@@ -10,10 +10,9 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import com.liquidnet.service.kylin.service.IKylinPerformancesService;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.liquidnet.service.kylin.utils.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -27,7 +26,6 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
......@@ -61,8 +59,8 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
Integer isRecommend = 1;
// 判断搜索 处理新数据
List<KylinPerformanceVo> performancesListNew = new ArrayList<>();
List<String> performancesIds = new ArrayList<>();
List<KylinPerformanceVo> performancesListNew = ObjectUtil.getKylinPerformanceVoArrayList();
List<String> performancesIds = CollectionUtil.arrayListString();
for (KylinPerformanceVo info : performancesList) {
boolean isShow = true;
if (type > 0) {
......@@ -89,8 +87,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
Calendar cal = Calendar.getInstance();
cal.setTime((Date) toDayTime.get("start"));
Date beforeDayEnd = DateUtil.getBeforeDayBegin(cal, days);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String daysLaterStr = sdf.format(beforeDayEnd);
String daysLaterStr = DateUtil.SDF_YMD_HMS.format(beforeDayEnd);
if (-1 == DateUtil.compareStrDay(timeStart, nowTimeTStr) || -1 == DateUtil.compareStrDay(daysLaterStr, timeStart)) {
isShow = false;
}
......@@ -121,7 +118,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
performancesListNew = checkAppStatus(performancesListNew);
// 组合数据
HashMap<String, Object> info = new HashMap<>();
HashMap<String, Object> info = CollectionUtil.mapStringObject();
info.put("is_native", is_native); // 本地演出少是否推荐了其他演出 0有推荐 1没有
info.put("recommend", recommend); // 从第几个开始是其他推荐演出 后台设置的那个推荐
info.put("total", 0);
......@@ -142,7 +139,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
toDayList = checkAppStatus(toDayList);
threeDaysList = checkAppStatus(threeDaysList);
HashMap<String, Object> newList = new HashMap<>();
HashMap<String, Object> newList = CollectionUtil.mapStringObject();
newList.put("toDayList", toDayList);
newList.put("threeDaysList", threeDaysList);
return newList;
......@@ -198,7 +195,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
if (null != ticketTimesList) {
for (KylinTicketTimesVo partner : ticketTimesList) {
List<KylinTicketVo> ticketList = partner.getTicketList();
List<KylinTicketVo> ticketListNew = new ArrayList<>();
List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
for (KylinTicketVo ticket : ticketList) {
int status = checkTicketStatus(ticket);
ticket.setStatus(status);
......@@ -220,14 +217,14 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
}
KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
HashMap<String, Object> info = new HashMap();
HashMap<String, Object> info = CollectionUtil.mapStringObject();
info.put("city_name", performancesInfo.getCityName());
info.put("field_name", performancesInfo.getFieldName());
info.put("title", performancesInfo.getTitle());
info.put("appStatus", performancesInfo.getAppStatus());
info.put("buySwitch", dataUtils.getSwitch());
HashMap result = new HashMap();
HashMap<String, Object> result = CollectionUtil.mapStringObject();
result.put("performancesInfo", info);
result.put("ticketTimesList", ticketTimesList);
......@@ -235,7 +232,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
}
public List<KylinPerformanceVo> performanceList(String... performancesIds) {
List<KylinPerformanceVo> performanceList = new ArrayList<>();
List<KylinPerformanceVo> performanceList = ObjectUtil.getKylinPerformanceVoArrayList();
for (String id : performancesIds) {
KylinPerformanceVo info = dataUtils.getPerformanceVo(id);
performanceList.add(info);
......@@ -272,7 +269,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
String yearMonthDayStart = yearMonthDay.concat(" 00:00:00");
String yearMonthDayEnd = yearMonthDay.concat(" 23:59:59");
List<KylinPerformanceVo> performancesListNew = new ArrayList();
List<KylinPerformanceVo> performancesListNew = ObjectUtil.getKylinPerformanceVoArrayList();
for (KylinPerformanceVo info : performancesList) {
String timeStart = info.getTimeStart();
if (-1 != DateUtil.compareStrDay(timeStart, yearMonthDayStart) && 1 != DateUtil.compareStrDay(timeStart, yearMonthDayEnd)) {
......@@ -337,7 +334,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
}
}
HashMap info = new HashMap();
HashMap<String, Object> info = CollectionUtil.mapStringObject();
info.put("total", count);
info.put("list", list);
......@@ -374,7 +371,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
}
public List<KylinPerformanceVo> checkAppStatus(List<KylinPerformanceVo> list) {
List<KylinPerformanceVo> newList = new ArrayList<>();
List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
if (!CollectionUtils.isEmpty(list)) {
String nowTimeStr = DateUtil.getNowTime();
for (KylinPerformanceVo info : list) {
......@@ -411,10 +408,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {
if (null != info) {
List<KylinTicketTimesVo> ticketTimeList = info.getTicketTimeList();
List<KylinTicketTimesVo> ticketTimeListNew = new ArrayList<>();
List<KylinTicketTimesVo> ticketTimeListNew = ObjectUtil.getKylinTicketTimesVoArrayList();
for (KylinTicketTimesVo ticketTime : ticketTimeList) {
List<KylinTicketVo> ticketList = ticketTime.getTicketList();
List<KylinTicketVo> ticketListNew = new ArrayList<>();
List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
for (KylinTicketVo ticket : ticketList) {
int status = checkTicketStatus(ticket);
ticket.setStatus(status);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ e8a4fca6
......@@ -76,7 +76,7 @@ public class KylinRefundsStatusServiceImpl {
/*kylinOrderTicketStatusMapper.update(orderStatusTable, new UpdateWrapper<KylinOrderTicketStatus>()
.eq("order_id", orderTicketsId));*/
KylinOrderTicketVo kylinOrderTicketVo = new KylinOrderTicketVo();
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3);
kylinOrderTicketVo.setUpdatedAt(nowTimeStr);
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
......@@ -93,12 +93,12 @@ public class KylinRefundsStatusServiceImpl {
entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
entitiesTable.setUpdatedAt(nowTime);
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
LinkedList<Object[]> sqlsDataB = new LinkedList<>();
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
for (String v : ticketEntityIds) {
sqlsDataB.add(new Object[]{
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v, orderInfo.getChangeDate(), orderInfo.getChangeDate()
......@@ -140,7 +140,7 @@ public class KylinRefundsStatusServiceImpl {
/*int rows = kylinOrderRefundsMapper.insert(kylinOrderRefunds);*/
KylinOrderRefundsVo orderRefundsVo = new KylinOrderRefundsVo();
KylinOrderRefundsVo orderRefundsVo = KylinOrderRefundsVo.getNew();
BeanUtils.copyProperties(kylinOrderRefunds, orderRefundsVo);
mongoTemplate.insert(orderRefundsVo, KylinOrderRefundsVo.class.getSimpleName());
......@@ -148,7 +148,7 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
kylinOrderRefundEntities.setOrderRefundsId(orderRefundsId);
kylinOrderRefundEntities.setCreatedAt(LocalDateTime.now());
LinkedList<Object[]> sqlsDataD = new LinkedList<>();
LinkedList<Object[]> sqlsDataD = CollectionUtil.linkedListObjectArr();
for (int i = 0; i <= ticketEntityIds.size() - 1; i++) {
String orderRefundsEntitiesId = IDGenerator.nextSnowId();
kylinOrderRefundEntities.setOrderRefundsEntitiesId(orderRefundsEntitiesId);
......@@ -161,15 +161,15 @@ public class KylinRefundsStatusServiceImpl {
});
/*int rowsR = kylinOrderRefundsEntitiesMapper.insert(kylinOrderRefundEntities);*/
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo();
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew();
BeanUtils.copyProperties(kylinOrderRefundEntities, orderRefundEntitiesVo);
mongoTemplate.insert(orderRefundEntitiesVo, KylinOrderRefundEntitiesVo.class.getSimpleName());
}
//mq更改数据库
LinkedList<String> sqls = new LinkedList<>();
LinkedList<Object[]> sqlsDataA = new LinkedList<>();
LinkedList<Object[]> sqlsDataC = new LinkedList<>();
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("kylin_order_ticket_status.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_ticket_entities.overtimeRefund"));
......@@ -214,7 +214,7 @@ public class KylinRefundsStatusServiceImpl {
orderStatusTable.setUpdatedAt(time);
KylinOrderTicketVo kylinOrderTicketVo = new KylinOrderTicketVo();
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3);
kylinOrderTicketVo.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(time));
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
......@@ -232,7 +232,7 @@ public class KylinRefundsStatusServiceImpl {
entitiesTable.setUpdatedAt(time);
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
......@@ -267,7 +267,7 @@ public class KylinRefundsStatusServiceImpl {
}
kylinOrderRefunds.setCreatedAt(time);
KylinOrderRefundsVo orderRefundsVo = new KylinOrderRefundsVo();
KylinOrderRefundsVo orderRefundsVo = KylinOrderRefundsVo.getNew();
BeanUtils.copyProperties(kylinOrderRefunds, orderRefundsVo);
orderRefundsVo.setCreatedAt(time);
orderRefundsVo.setApplicantAt(time);
......@@ -283,7 +283,7 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefundEntities.setOrderTicketEntitiesId(orderEntitiesId);
kylinOrderRefundEntities.setCreatedAt(time);
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo();
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew();
BeanUtils.copyProperties(kylinOrderRefundEntities, orderRefundEntitiesVo);
orderRefundEntitiesVo.setCreatedAt(strTime);
mongoTemplate.insert(orderRefundEntitiesVo, KylinOrderRefundEntitiesVo.class.getSimpleName());
......@@ -302,12 +302,12 @@ public class KylinRefundsStatusServiceImpl {
dataUtils.delOrderRefundVoByOrderId(orderInfo.getOrderTicketsId());
//MQ
LinkedList<String> sqls = new LinkedList<>();
LinkedList<Object[]> sqlsDataA = new LinkedList<>();
LinkedList<Object[]> sqlsDataB = new LinkedList<>();
LinkedList<Object[]> sqlsDataC = new LinkedList<>();
LinkedList<Object[]> sqlsDataD = new LinkedList<>();
LinkedList<Object[]> sqlsDataE = new LinkedList<>();
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataD = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataE = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("kylin_order_ticket_status.refund"));
sqls.add(SqlMapping.get("kylin_order_ticket_entities.refund"));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @ e8a4fca6
package com.liquidnet.service.kylin.utils;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
......@@ -259,8 +260,7 @@ public class DataUtils {
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);
String threeDaysLaterStr = DateUtil.SDF_YMD_HMS.format(beforeDayEnd);
queryT.addCriteria(Criteria.where("sellTime").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
queryT.fields().exclude("details");
......@@ -269,7 +269,7 @@ public class DataUtils {
queryT.fields().exclude("describeElectronic");
List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
HashMap<String, Object> info = new HashMap<>();
HashMap<String, Object> info = CollectionUtil.mapStringObject();
info.put("toDayList", toDayList);
info.put("threeDaysList", threeDaysList);
redisUtil.set(redisKey, info);
......@@ -379,7 +379,7 @@ public class DataUtils {
if (obj != null) {
return (List<KylinOrderRefundsVo>) obj;
} else {
List<KylinOrderRefundsVo> orderRefundsVoList = new ArrayList<>();
List<KylinOrderRefundsVo> orderRefundsVoList = ObjectUtil.getKylinOrderRefundsVoArrayList();
List<KylinOrderRefundsVo> data = mongoTemplate.find(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderRefundsVo.class, KylinOrderRefundsVo.class.getSimpleName());
for (KylinOrderRefundsVo item : data) {
List<KylinOrderRefundEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderRefundsId").is(item.getOrderRefundsId())), KylinOrderRefundEntitiesVo.class, KylinOrderRefundEntitiesVo.class.getSimpleName());
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/ObjectUtil.java
View file @ e8a4fca6
package com.liquidnet.service.kylin.utils;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinStationPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinStationTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.returns.*;
import com.mongodb.client.model.WriteModel;
import org.bson.Document;
import java.util.ArrayList;
import java.util.List;
public class ObjectUtil {
private static final ArrayList<KylinStationPerformanceVo> kylinStationPerformanceVoArrayList = new ArrayList<>();
private static final ArrayList<KylinTicketVo> kylinTicketVoArrayList = new ArrayList<>();
private static final ArrayList<KylinStationTicketVo> kylinStationTicketVoArrayList = new ArrayList<>();
private static final ArrayList<WriteModel<Document>> writeModelDocumentArrayList = new ArrayList<>();
private static final ArrayList<OrderRefundListVo> orderRefundListVoArrayList = new ArrayList<>();
private static final ArrayList<KylinOrderTicketEntitiesPreRefundVo> kylinOrderTicketEntitiesPreRefundVoArrayList = new ArrayList<>();
private static final ArrayList<KylinPerformanceVo> kylinPerformanceVoArrayList = new ArrayList<>();
private static final ArrayList<KylinTicketTimesVo> kylinTicketTimesVoArrayList = new ArrayList<>();
private static final ArrayList<KylinOrderRefundsVo> kylinOrderRefundsVoArrayList = new ArrayList<>();
private static final ArrayList<KylinOrderListVo> kylinOrderListVoArrayList = new ArrayList<>();
private static final PagedResult<KylinStationPerformanceVo> kylinStationPerformanceVoPagedResult = new PagedResult<>();
public static List<KylinStationPerformanceVo> getKylinStationPerformanceVoArrayList() {
return (List<KylinStationPerformanceVo>) kylinStationPerformanceVoArrayList.clone();
public static ArrayList<KylinStationPerformanceVo> getKylinStationPerformanceVoArrayList() {
return (ArrayList<KylinStationPerformanceVo>) kylinStationPerformanceVoArrayList.clone();
}
public static List<KylinTicketVo> getKylinTicketVoArrayList() {
return (List<KylinTicketVo>) kylinTicketVoArrayList.clone();
public static ArrayList<KylinTicketVo> getKylinTicketVoArrayList() {
return (ArrayList<KylinTicketVo>) kylinTicketVoArrayList.clone();
}
public static List<KylinStationTicketVo> getKylinStationTicketVoArrayList() {
return (List<KylinStationTicketVo>) kylinStationTicketVoArrayList.clone();
public static ArrayList<KylinStationTicketVo> getKylinStationTicketVoArrayList() {
return (ArrayList<KylinStationTicketVo>) kylinStationTicketVoArrayList.clone();
}
public static List<WriteModel<Document>> getWriteModelDocumentArrayList() {
return (List<WriteModel<Document>>) writeModelDocumentArrayList.clone();
public static ArrayList<WriteModel<Document>> getWriteModelDocumentArrayList() {
return (ArrayList<WriteModel<Document>>) writeModelDocumentArrayList.clone();
}
public static ArrayList<OrderRefundListVo> getOrderRefundListVoArrayList() {
return (ArrayList<OrderRefundListVo>) orderRefundListVoArrayList.clone();
}
public static ArrayList<KylinOrderTicketEntitiesPreRefundVo> getKylinOrderTicketEntitiesPreRefundVoArrayList() {
return (ArrayList<KylinOrderTicketEntitiesPreRefundVo>) kylinOrderTicketEntitiesPreRefundVoArrayList.clone();
}
public static ArrayList<KylinPerformanceVo> getKylinPerformanceVoArrayList() {
return (ArrayList<KylinPerformanceVo>) kylinPerformanceVoArrayList.clone();
}
public static ArrayList<KylinTicketTimesVo> getKylinTicketTimesVoArrayList() {
return (ArrayList<KylinTicketTimesVo>) kylinTicketTimesVoArrayList.clone();
}
public static ArrayList<KylinOrderRefundsVo> getKylinOrderRefundsVoArrayList() {
return (ArrayList<KylinOrderRefundsVo>) kylinOrderRefundsVoArrayList.clone();
}
public static ArrayList<KylinOrderListVo> getKylinOrderListVoArrayList() {
return kylinOrderListVoArrayList;
}
public static PagedResult<KylinStationPerformanceVo> getKylinStationPerformanceVoPagedResult() {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/OrderUtils.java
View file @ e8a4fca6
package com.liquidnet.service.kylin.utils;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@Component
......@@ -31,9 +20,9 @@ public class OrderUtils {
* @param orderId 订单id [需要新增或者修改的订单id]
*/
public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
List<KylinOrderListVo> vo = new ArrayList<>();
List<KylinOrderListVo> redisVo = new ArrayList();
KylinOrderListVo voItem = new KylinOrderListVo();
List<KylinOrderListVo> vo = ObjectUtil.getKylinOrderListVoArrayList();
List<KylinOrderListVo> redisVo = ObjectUtil.getKylinOrderListVoArrayList();
KylinOrderListVo voItem = KylinOrderListVo.getNew();
KylinOrderTicketVo data;
if (dataSingle == null) {
data = dataUtils.getOrderTicketVo(orderId);
......
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