From 436cc7b9ede71e8968323ac7fe914e189fd07a66 Mon Sep 17 00:00:00 2001
From: wujingtao <wujingtao_t@126.com>
Date: Wed, 1 Feb 2023 15:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=AA=8C=E8=AF=81=E5=8F=B7=E7=A0=81=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/baiye/util/MobileUtil.java      |  8 +++++---
 .../baiye/module/service/impl/ClueServiceImpl.java    | 11 +++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MobileUtil.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MobileUtil.java
index e9ac2756..be3b1f28 100644
--- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MobileUtil.java
+++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MobileUtil.java
@@ -26,7 +26,8 @@ public class MobileUtil {
      * 中国移动号码格式验证
      * 手机段：134,135,136,137,138,139,147,148,150,151,152,157,158,159,178,182,183,184,187,188,195,198,1440,1703,1705,1706
      **/
-    private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|78|8[2-478]|98|95)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
+//    private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|78|8[2-478]|98|95)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
+    private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|7[28]|8[2-478]|98|95)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
 
     /**
      * 中国大陆手机号码校验
@@ -45,8 +46,9 @@ public class MobileUtil {
     }
 
     public static void main(String[] args) {
-        String s = "/home/eladmin/mail/MM_20221125_2.zip";
-        String filePath = s.substring(s.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
+//        String s = "/home/eladmin/mail/MM_20221125_2.zip";
+//        String filePath = s.substring(s.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
+        System.out.println( checkPhone("17269788988"));
     }
     /**
      * 中国移动手机号码校验
diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java
index 3816b961..b03c1ad0 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java
@@ -11,6 +11,7 @@ import com.baiye.exception.BadRequestException;
 import com.baiye.feign.*;
 import com.baiye.http.CommonResponse;
 import com.baiye.model.dto.*;
+import com.baiye.model.entity.BaseClue;
 import com.baiye.model.vo.ResSourceLabel;
 import com.baiye.module.dao.*;
 import com.baiye.module.entity.*;
@@ -90,7 +91,9 @@ public class ClueServiceImpl implements ClueService {
                 }
             }
             //删除不符合条件的资源
-            clueList.removeAll(removeClueList);
+//            clueList.removeAll(removeClueList);
+            clueList = clueList.stream().filter(item -> !removeClueList.stream().map(BaseClue::getNid).collect(
+                    Collectors.toList()).contains(item.getNid())).collect(Collectors.toList());
             //更新成功条数
             Map<Long, List<Clue>> clueGroup = clueList.stream().collect(Collectors.groupingBy(Clue::getRecordId));
             List<ClueRecord> successClueRecord = clueRecordRepository.findAllById(clueGroup.keySet());
@@ -531,11 +534,11 @@ public class ClueServiceImpl implements ClueService {
         clueMiddleRepository.deleteByMemberId(userId);
         //3、删除拓客或者DMP资源数据
         clueTalkRepository.deleteByMemberId(userId);
-        List<Map<String,Object>> mapList = clueMiddleRepository.findTaskIdCount(taskIds);
+        List<Map<String, Object>> mapList = clueMiddleRepository.findTaskIdCount(taskIds);
         Map<Long, Integer> taskCount = new HashMap<>();
         for (Map<String, Object> map : mapList) {
-            BigInteger taskId = (BigInteger)map.get("taskId");
-            BigInteger num = (BigInteger)map.get("num");
+            BigInteger taskId = (BigInteger) map.get("taskId");
+            BigInteger num = (BigInteger) map.get("num");
             taskCount.put(taskId.longValue(), num.intValue());
         }
         return taskCount;