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

Commit f884b8ff authored by 胡佳晨's avatar 胡佳晨

去掉 new

parent 9c60ab24
......@@ -7,7 +7,7 @@ import lombok.Data;
import java.util.List;
@Data
public class KylinPerformanceMisVo {
public class KylinPerformanceMisVo implements Cloneable{
//演出数据
@ApiModelProperty(value = "主键id")
......@@ -128,4 +128,12 @@ public class KylinPerformanceMisVo {
@ApiModelProperty(value = "场次数据")
private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
private static final KylinPerformanceMisVo obj = new KylinPerformanceMisVo();
public static KylinPerformanceMisVo getNew() {
try {
return (KylinPerformanceMisVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinPerformanceMisVo();
}
}
}
......@@ -2,6 +2,7 @@ package com.liquidnet.commons.lang.util;
import org.springframework.util.LinkedMultiValueMap;
import java.math.BigDecimal;
import java.util.*;
import java.util.function.Predicate;
......@@ -14,6 +15,7 @@ public class CollectionUtil {
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<>();
private static final ArrayList<BigDecimal> BIGDECIMAL_ARRAY_LIST = new ArrayList<>();
public static HashMap<String, String> mapStringString() {
......@@ -36,6 +38,10 @@ public class CollectionUtil {
return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone();
}
public static ArrayList<BigDecimal> arrayListBigDeciaml() {
return (ArrayList<BigDecimal>) BIGDECIMAL_ARRAY_LIST.clone();
}
public static LinkedMultiValueMap<String, String> linkedMultiValueMapStringString() {
return (LinkedMultiValueMap<String, String>) STRING_STRING_LINKED_MULTI_VALUE_MAP.clone();
}
......
package com.liquidnet.service.merchant.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import com.liquidnet.service.kylin.entity.KylinBuyNotice;
import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
import com.liquidnet.service.merchant.util.RedisMerchantUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
......
......@@ -35,7 +35,6 @@ import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
......@@ -413,7 +412,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
return ResponseDto.failure(ErrorMapping.get(20104));
}
List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList();
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = ObjectUtil.getTicketTimesTicketCreatePartnerVoList();
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew();
BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
......@@ -576,7 +575,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
List<PerformancePartnerVo> performancePartnerVo = mongoMerchantUtils.getPerformancePartnerList(query);
query.with(pageable);
//处理Vo
List<KylinPerformancePartnerListVo> voList = new ArrayList<>();
List<KylinPerformancePartnerListVo> voList = ObjectUtil.getKylinPerformancePartnerListVo();
for (PerformancePartnerVo item : performancePartnerVo) {
KylinPerformancePartnerListVo voData = KylinPerformancePartnerListVo.getNew();
voData.setStatus0Data(item);
......
package com.liquidnet.service.merchant.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ErrorMapping;
......@@ -11,8 +10,6 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.KylinTicketTimes;
import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.merchant.util.*;
import lombok.extern.slf4j.Slf4j;
......
......@@ -12,20 +12,15 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.merchant.constant.MerchantAuthorizationConst;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPerformanceVo;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPermissionsVo;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
import org.springframework.data.mongodb.core.aggregation.LookupOperation;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
......@@ -81,7 +76,7 @@ public class MongoMerchantUtils {
public void updateTicketTimesPartnerVo(KylinTicketTimesPartnerVo data) {
Query query = Query.query(Criteria.where("ticketTimesId").is(data.getTicketTimesId()));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data));
BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(),
objectTicketVo
......@@ -98,7 +93,7 @@ public class MongoMerchantUtils {
public void updateTicketPartnerVo(KylinTicketPartnerVo data) {
Query query = Query.query(Criteria.where("ticketsId").is(data.getTicketsId()));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data));
BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(),
objectTicketVo
......@@ -107,7 +102,7 @@ public class MongoMerchantUtils {
public void submitTicketByTimes(KylinTicketPartnerVo data) {
Query query = Query.query(Criteria.where("timesId").is(data.getTimesId()).and("status").nin(-2, 7));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data));
BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(),
objectTicketVo
......@@ -138,7 +133,7 @@ public class MongoMerchantUtils {
public void updatePerformancePartnerVoById(PerformancePartnerVo data) {
Query query = Query.query(Criteria.where("performancesId").is(data.getPerformancesId()));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data));
BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(),
objectTicketVo
......@@ -147,7 +142,7 @@ public class MongoMerchantUtils {
public void updateSubmitTicketVoById(KylinTicketPartnerVo data) {
Query query = Query.query(Criteria.where("ticketsId").is(data.getTicketsId()).and("status").in(3, 6, 8, 9, 10));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(data));
BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
query.getQueryObject(),
objectTicketVo
......@@ -203,7 +198,7 @@ public class MongoMerchantUtils {
}
public Document getObjectTicketVo(HashMap<String, Object> map, String ticketsId) {
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject objectTicketVo = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
Document docTicket = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
objectTicketVo,
......@@ -271,7 +266,7 @@ public class MongoMerchantUtils {
);
AggregationResults<PerformancePartnerListDao> outputType = mongoTemplate.aggregate(aggregation, KylinOrderTicketVo.class.getSimpleName(), PerformancePartnerListDao.class);
List<PerformancePartnerListDao> dataList = new ArrayList(outputType.getMappedResults());
List<PerformancePartnerListDao> list = new ArrayList();
List<PerformancePartnerListDao> list = ObjectUtil.getPerformancePartnerListDaoArrayList();
for (KylinPerformanceVo item : performanceVos) {
boolean findData = false;
PerformancePartnerListDao dao = PerformancePartnerListDao.getNew();
......
package com.liquidnet.service.merchant.util;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancePartnerListVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
import com.liquidnet.service.merchant.dto.vo.*;
import com.mongodb.BasicDBObject;
......@@ -21,6 +24,22 @@ public class ObjectUtil {
private static final BasicDBObject basicDBObject = new BasicDBObject();
private static final ArrayList<PerformancePartnerListDao> performancePartnerListDaoArrayList = new ArrayList<>();
private static final ArrayList<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<>();
private static final ArrayList<KylinPerformancePartnerListVo> performancePartnerListVo = new ArrayList<>();
public static ArrayList<PerformancePartnerListDao> getPerformancePartnerListDaoArrayList() {
return (ArrayList<PerformancePartnerListDao>) performancePartnerListDaoArrayList.clone();
}
public static ArrayList<KylinPerformancePartnerListVo> getKylinPerformancePartnerListVo() {
return (ArrayList<KylinPerformancePartnerListVo>) performancePartnerListVo.clone();
}
public static ArrayList<TicketTimesTicketCreatePartnerVo> getTicketTimesTicketCreatePartnerVoList() {
return (ArrayList<TicketTimesTicketCreatePartnerVo>) ticketTimesTicketCreatePartnerVoList.clone();
}
public static ArrayList<MerchantStationsVo> getMerchantStationsVosArrayList() {
return (ArrayList<MerchantStationsVo>) merchantStationsVosArrayList.clone();
}
......
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