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

Commit 930fd01f authored by 张国柄's avatar 张国柄

opt;

parent 047e7660
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
*/ */
package com.liquidnet.commons.lang.util; package com.liquidnet.commons.lang.util;
import org.springframework.util.LinkedMultiValueMap;
import java.util.*; import java.util.*;
import java.util.function.Predicate; import java.util.function.Predicate;
...@@ -16,6 +18,7 @@ public class CollectionUtil { ...@@ -16,6 +18,7 @@ public class CollectionUtil {
private static final HashMap<String, Object> STRING_OBJECT_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<String> STRING_LINKED_LIST = new LinkedList<>();
private static final LinkedList<Object[]> OBJECTS_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<Object> OBJECT_ARRAY_LIST = new ArrayList<>(); private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
...@@ -35,6 +38,10 @@ public class CollectionUtil { ...@@ -35,6 +38,10 @@ public class CollectionUtil {
return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone(); return (LinkedList<Object[]>) OBJECTS_LINKED_LIST.clone();
} }
public static LinkedMultiValueMap<String, String> linkedMultiValueMapStringString() {
return (LinkedMultiValueMap<String, String>) STRING_STRING_LINKED_MULTI_VALUE_MAP.clone();
}
public static ArrayList<Object> arrayListObject() { public static ArrayList<Object> arrayListObject() {
return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone(); return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone();
} }
......
...@@ -3,10 +3,7 @@ package com.liquidnet.service.adam.service.impl; ...@@ -3,10 +3,7 @@ package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.exception.LiquidnetServiceException; import com.liquidnet.common.exception.LiquidnetServiceException;
import com.liquidnet.common.mq.constant.MQConst; import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.BsonUtil; import com.liquidnet.commons.lang.util.*;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.AdamAddressesParam; import com.liquidnet.service.adam.dto.AdamAddressesParam;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo; import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import com.liquidnet.service.adam.entity.AdamAddresses; import com.liquidnet.service.adam.entity.AdamAddresses;
...@@ -91,7 +88,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -91,7 +88,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
public void def(String uid, String addressesId) { public void def(String uid, String addressesId) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
LinkedList<Object[]> toMqObjs = new LinkedList<>(); LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid); List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
if (vos.size() > 1) {// 取消原默认 if (vos.size() > 1) {// 取消原默认
// AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew(); // AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.impl; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.impl;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.common.mq.constant.MQConst; import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo; import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo; import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo; import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
...@@ -77,7 +78,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService { ...@@ -77,7 +78,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
AdamCollectBaseVo.class.getSimpleName() AdamCollectBaseVo.class.getSimpleName()
); );
if (deleteResult.getDeletedCount() > 0) { if (deleteResult.getDeletedCount() > 0) {
LinkedList<Object[]> toMqObjs = new LinkedList<>(); LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
for (String c : contentIds) { for (String c : contentIds) {
toMqObjs.add(new Object[]{now, uid, c}); toMqObjs.add(new Object[]{now, uid, c});
} }
......
...@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.impl; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.common.mq.constant.MQConst; import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo; import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
...@@ -85,7 +86,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService { ...@@ -85,7 +86,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
AdamDisposedBaseVo.class.getSimpleName() AdamDisposedBaseVo.class.getSimpleName()
); );
if (deleteResult.getDeletedCount() > 0) { if (deleteResult.getDeletedCount() > 0) {
LinkedList<Object[]> toMqObjs = new LinkedList<>(); LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
for (String c : contentIds) { for (String c : contentIds) {
toMqObjs.add(new Object[]{now, uid, c}); toMqObjs.add(new Object[]{now, uid, c});
} }
......
...@@ -110,7 +110,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -110,7 +110,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
public void def(String uid, String entersId) { public void def(String uid, String entersId) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
LinkedList<Object[]> toMqObjs = new LinkedList<>(); LinkedList<Object[]> toMqObjs = CollectionUtil.linkedListObjectArr();
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid); List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
if (vos.size() > 1) {// 取消原默认 if (vos.size() > 1) {// 取消原默认
// AdamEntersVo unDeaultVo = AdamEntersVo.getNew(); // AdamEntersVo unDeaultVo = AdamEntersVo.getNew();
......
...@@ -69,7 +69,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -69,7 +69,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
String clientIp = CurrentUtil.getCliIpAddr(); String clientIp = CurrentUtil.getCliIpAddr();
// 调取对应支付接口 // 调取对应支付接口
LinkedMultiValueMap<String, String> payParam = new LinkedMultiValueMap<>(); LinkedMultiValueMap<String, String> payParam = CollectionUtil.linkedMultiValueMapStringString();
payParam.add("type", "VIP");// TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB payParam.add("type", "VIP");// TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB
payParam.add("price", String.valueOf(memberPriceVo.getPrice())); payParam.add("price", String.valueOf(memberPriceVo.getPrice()));
payParam.add("name", memberVo.getName()); payParam.add("name", memberVo.getName());
......
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