From 2f6896ecc98004d6d8a106a173aa617fbd27436a Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Tue, 28 Feb 2023 11:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/zhengjie/modules/constant/DefaultConstant.java  | 10 ++++++++++
 .../modules/uploadnew/task/SaveToFileNewTask.java      |  6 +-----
 .../modules/uploadnew/util/ToolExcelUtils.java         |  3 +++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/constant/DefaultConstant.java b/eladmin-system/src/main/java/me/zhengjie/modules/constant/DefaultConstant.java
index 121b70c..9c7a914 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/constant/DefaultConstant.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/constant/DefaultConstant.java
@@ -60,6 +60,16 @@ public class DefaultConstant {
      */
     public static final int THIRTEEN_NUMBER = 13;
 
+    /**
+     * 13
+     */
+    public static final int THIRTY_THREE = 33;
+
+    /**
+     * 34
+     */
+    public static final int THIRTY_FOUR = 34;
+
 
     /**
      * 200
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java
index b2d6e14..6940067 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java
@@ -172,13 +172,11 @@ public class SaveToFileNewTask {
                 ? TxtUtils.txtParseListVyUrl(filePath) :
                 fileFormat.contains(FileConstant.CSV_FILE_SUB_NAME)
                         ? ToolExcelUtils.csvParseListByUrl(filePath)
-                            : ToolExcelUtils.excelParseListByUrl(filePath);
-
+                                : ToolExcelUtils.excelParseListByUrl(filePath);
         Map<Integer, List<String>> preEncryptNumMap = listT.stream().filter
                 (phone -> StringUtils.isNotBlank(phone.trim())).collect(Collectors.groupingBy(String::length));
         if (CollectionUtil.isNotEmpty(preEncryptNumMap)) {
             // 分批调用接口进行加密
-
             if (tbUploadFileNewDto.getEncryptionType() == DefaultConstant.TWO_NUMBER) {
                 List<String> decryptionList = preEncryptNumMap.get(2 << 4);
                 List<String> stringList = decryptFile(decryptionList);
@@ -231,10 +229,8 @@ public class SaveToFileNewTask {
             DecryptionJsonContent build =
                     DecryptionJsonContent.builder().cellphoneMd5
                             (decryptStr).requestId(RandomUtil.randomString(TEN_NUM)).build();
-
             // 调用HTTP请求发送数据
             DecryptionDTO decryptionDTO = JSONUtil.toBean(HttpUtil.post(decryptAddress, JSON.toJSONString(build)), DecryptionDTO.class);
-            log.info("================ response  as {} ================", JSONUtil.toJsonStr(decryptionDTO));
             if (StringUtils.isNotBlank(decryptionDTO.getReason())
                     && "success".equals(decryptionDTO.getReason())) {
                 if (StringUtils.isNotBlank(decryptionDTO.getCellPhone())) {
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/util/ToolExcelUtils.java b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/util/ToolExcelUtils.java
index 17a6933..1893262 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/util/ToolExcelUtils.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/util/ToolExcelUtils.java
@@ -32,6 +32,9 @@ public class ToolExcelUtils {
                 if (phone.length() == DefaultConstant.THIRTEEN_NUMBER) {
                     list.add(phone.substring(DefaultConstant.ONE_NUMBER, DefaultConstant.TWELVE_NUMBER));
                 }
+                if (phone.length() == DefaultConstant.THIRTY_FOUR) {
+                    list.add(phone.substring(DefaultConstant.ONE_NUMBER, DefaultConstant.THIRTY_THREE));
+                }
             }
         }
         return list;