diff --git a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java index afd0530..ea2b231 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java @@ -39,6 +39,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@Deprecated @RequiredArgsConstructor public class DmpMonitorNumServiceImpl implements DmpMonitorNumService { diff --git a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java index d9c36ea..6ecfc79 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorV2ServiceImpl.java @@ -165,10 +165,8 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service { private List getDmpMonitorJpaDto(List list) { List tradeList = new ArrayList<>(); - Map> stringCollectionMap = list.stream().collect(Collectors.groupingBy(DmpMonitorJpaDto::getTag)); - if (CollUtil.isNotEmpty(stringCollectionMap)) { List newDataList = Lists.newArrayList(); List saveDataList = Lists.newArrayList(); diff --git a/src/main/java/com/baiyee/adcallback/tools/CheckPlatPointParamsUtil.java b/src/main/java/com/baiyee/adcallback/tools/CheckPlatPointParamsUtil.java index f7ea523..bd294b8 100644 --- a/src/main/java/com/baiyee/adcallback/tools/CheckPlatPointParamsUtil.java +++ b/src/main/java/com/baiyee/adcallback/tools/CheckPlatPointParamsUtil.java @@ -78,9 +78,10 @@ public class CheckPlatPointParamsUtil { //安卓:0 //IOS:1 //其他:3 - int os = Integer.parseInt(os1); + if (ValidationUtil.isInteger(os1)) { + int os = Integer.parseInt(os1); - log.info("================================= [pre check model, os is {} ] =================================", os); + log.info("================================= [pre check model, os is {} ] =================================", os); /* imei 默认是 回传 MD5 摘要, 排除全0的md5摘要和空串的情况 000000000000000 @@ -88,30 +89,31 @@ public class CheckPlatPointParamsUtil { */ - // 安卓 - if (os == 0 && - (StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IMEI, imei) || - StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IMEI_MD5, imei) || - StrUtil.isBlank(imei)) - ){ - return Boolean.FALSE; - } - - // IOS - if (os == 1 && - (StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IDFA, idfa) || - StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IDFA_MD5, idfaMD5) || - ( StrUtil.isBlank(idfa) && StrUtil.isBlank(idfaMD5))) - ){ - return Boolean.FALSE; - } - - // 其他 - if (os == 3 && (StrUtil.isBlank(imei) && StrUtil.isBlank(idfa) && StrUtil.isBlank(idfaMD5) && StrUtil.isBlank(mac))){ - return Boolean.FALSE; + // 安卓 + if (os == 0 && + (StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IMEI, imei) || + StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IMEI_MD5, imei) || + StrUtil.isBlank(imei)) + ){ + return Boolean.FALSE; + } + + // IOS + if (os == 1 && + (StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IDFA, idfa) || + StrUtil.equals(SpecialCheckParmConstant.ZERO_JL_IDFA_MD5, idfaMD5) || + ( StrUtil.isBlank(idfa) && StrUtil.isBlank(idfaMD5))) + ){ + return Boolean.FALSE; + } + + // 其他 + if (os == 3 && (StrUtil.isBlank(imei) && StrUtil.isBlank(idfa) && StrUtil.isBlank(idfaMD5) && StrUtil.isBlank(mac))){ + return Boolean.FALSE; + } + return Boolean.TRUE; } - - return Boolean.TRUE; + return Boolean.FALSE; } /** diff --git a/src/main/java/com/baiyee/adcallback/tools/ValidationUtil.java b/src/main/java/com/baiyee/adcallback/tools/ValidationUtil.java new file mode 100644 index 0000000..1071efb --- /dev/null +++ b/src/main/java/com/baiyee/adcallback/tools/ValidationUtil.java @@ -0,0 +1,35 @@ +/* + * Copyright 2019-2020 Zheng Jie + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.baiyee.adcallback.tools; + +import java.util.regex.Pattern; + +/** + * 验证工具 + * @author Zheng Jie + * @date 2018-11-23 + */ +public class ValidationUtil { + + private ValidationUtil(){ + } + + public static boolean isInteger(String str) { + Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$"); + return pattern.matcher(str).matches(); + } + +}