From 9779c27de44df386af11adb52b2b299554897965 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Mon, 4 Mar 2024 17:58:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E7=A8=8B=E6=B1=A0?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/zhengjie/constant/SystemConstant.java | 6 ++++ .../service/mapstruct/LogErrorMapperImpl.java | 2 +- .../service/mapstruct/LogSmallMapperImpl.java | 2 +- .../config/thread/ThreadPoolConfig.java | 2 +- .../callUpload/task/SendCallSourceTask.java | 2 +- .../uploadnew/task/SaveToFileNewTask.java | 30 +++++++++++-------- .../src/main/resources/config/application.yml | 2 +- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/constant/SystemConstant.java b/eladmin-common/src/main/java/me/zhengjie/constant/SystemConstant.java index 891058b..4790d47 100644 --- a/eladmin-common/src/main/java/me/zhengjie/constant/SystemConstant.java +++ b/eladmin-common/src/main/java/me/zhengjie/constant/SystemConstant.java @@ -12,5 +12,11 @@ public class SystemConstant { */ public static final String PARSE_DATA_LINK = "http://localhost:9191/data/analysis/tag"; + /** + * 成功 + */ + public static final String SUCCESS = "success"; + + } diff --git a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java index e4573a7..846ad1d 100644 --- a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java +++ b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-12-26T11:47:03+0800", + date = "2023-12-28T11:13:16+0800", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" ) @Component diff --git a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java index 5d8f887..77efd18 100644 --- a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java +++ b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-12-26T11:47:03+0800", + date = "2023-12-28T11:13:16+0800", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" ) @Component diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolConfig.java b/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolConfig.java index f71d7fe..ef4e2a8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolConfig.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolConfig.java @@ -50,7 +50,7 @@ public class ThreadPoolConfig { return threadPoolExecutor; } - @Bean("workExecutor") + @Bean("WorkExecutor") public Executor getExecutor() { return new ThreadPoolExecutor(10, Integer.MAX_VALUE, DefaultConstant.THREE_NUMBER, TimeUnit.MINUTES, diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/callUpload/task/SendCallSourceTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/callUpload/task/SendCallSourceTask.java index 0894a4a..dee4cd4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/callUpload/task/SendCallSourceTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/callUpload/task/SendCallSourceTask.java @@ -93,7 +93,7 @@ public class SendCallSourceTask { } - @Scheduled(cron = "0 0 0 * * ?") + /*@Scheduled(cron = "0 0 0 * * ?")*/ public void getToken() { List list = callAccountRepository.findAllByStatus(1); for (CallAccount account : list) { 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 5d591f8..cbe8a02 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 @@ -20,6 +20,7 @@ import com.jcraft.jsch.Session; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import me.zhengjie.config.thread.ThreadPoolConfig; +import me.zhengjie.constant.SystemConstant; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.constant.DefaultConstant; import me.zhengjie.modules.constant.FileConstant; @@ -180,11 +181,11 @@ public class SaveToFileNewTask { ? TxtUtils.txtParseListVyUrl(filePath) : fileFormat.contains(FileConstant.CSV_FILE_SUB_NAME) ? ToolExcelUtils.csvParseListByUrl(filePath) - : ToolExcelUtils.excelParseListByUrl(filePath); + : ToolExcelUtils.excelParseListByUrl(filePath); Map> 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 decryptionList = preEncryptNumMap.get(2 << 4); if (CollUtil.isNotEmpty(decryptionList)) { @@ -193,7 +194,7 @@ public class SaveToFileNewTask { // 替换集合并去除空格 phoneList = stringList.stream().filter (StringUtils::isNotBlank).collect(Collectors.toList()); - log.info("============ the phone list as {} ============",phoneList.size()); + log.info("============ the phone list as {} ============", phoneList.size()); } } } @@ -243,7 +244,7 @@ public class SaveToFileNewTask { int batchNum = partition.size(); stopWatch.start(); for (List list : partition) { - TimeUnit.MILLISECONDS.sleep(300L); + TimeUnit.MILLISECONDS.sleep(1000L); // 异步线程池 CompletableFuture> future = CompletableFuture.supplyAsync(() -> { // 转换 @@ -252,17 +253,20 @@ 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); - if (org.apache.commons.lang3.StringUtils.isNotBlank(decryptionDTO.getReason()) - && "success".equals(decryptionDTO.getReason()) && (org.apache.commons.lang3.StringUtils.isNotBlank(decryptionDTO.getCellPhone()))) { - List parseArray = JSON.parseArray(decryptionDTO.getCellPhone(), String.class); - if (!parseArray.isEmpty()) { - log.info("================ response size as {} ================", parseArray.size()); - return parseArray; + String result = HttpUtil.post(decryptAddress, JSON.toJSONString(build)); + if (result.contains(SystemConstant.SUCCESS) && JSONUtil.isJson(result)) { + // 调用HTTP请求发送数据 + DecryptionDTO decryptionDTO = JSONUtil.toBean(result, DecryptionDTO.class); + if (org.apache.commons.lang3.StringUtils.isNotBlank(decryptionDTO.getReason()) + && SystemConstant.SUCCESS.equals(decryptionDTO.getReason()) && (org.apache.commons.lang3.StringUtils.isNotBlank(decryptionDTO.getCellPhone()))) { + List parseArray = JSON.parseArray(decryptionDTO.getCellPhone(), String.class); + if (!parseArray.isEmpty()) { + log.info("================ response size as {} ================", parseArray.size()); + return parseArray; + } } + log.info("============== the response as {} ===========", JSONUtil.toJsonStr(decryptionDTO)); } - log.info("============== the response as {} ===========",JSONUtil.toJsonStr(decryptionDTO)); return Lists.newArrayList(); }, executor); results.add(future); diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index 78349c1..6ec8489 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -58,7 +58,7 @@ inter: address: https://bd.hzdaba.cn:8085/v3/Accounts/yuyoukeji/BigData/EncryptTel appid: yuyoukeji tk: e3fb7090b4babe44a5113601487af433 - importAddress: https://ai.hzdaba.cn/external/activity/addClient + importAddress: https://ai.hzdaba.cn/api/activity/addclient refreshToken: https://ai.hzdaba.cn/external/get/authKey upload: