From 5304070b758c7386099c43f3ddef9dc847104e85 Mon Sep 17 00:00:00 2001 From: qyx <565485304@qq.com> Date: Wed, 13 Jan 2021 16:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B9=B3=E5=8F=B0=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dbug=E6=9C=80=E7=BB=88=E7=89=883?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/buildrecord/task/SendBigDataTask.java | 11 +++++++++++ .../modules/remoterec/consts/RemoteRecConst.java | 4 ++++ .../zhengjie/modules/remoterec/consts/SysConst.java | 2 +- .../src/main/resources/config/application.yml | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java index 79dc384..78955d0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java @@ -47,6 +47,7 @@ import java.util.stream.Collectors; import static me.zhengjie.modules.common.consts.SendBigDataConst.NON_FINISH_SEND_STATATUS; import static me.zhengjie.modules.remoterec.consts.RemoteRecConst.SUCCESS_TAG; +import static me.zhengjie.modules.remoterec.consts.RemoteRecConst.WAIT_SUCCESS_TAG; @Component @Scope("prototype") @@ -126,6 +127,7 @@ public class SendBigDataTask { if (remoteRecord.getId() != null){ RemoteRecordDto remoteRecordDto = remoteRecordService.findById(remoteRecord.getId()); + waitSendSuccessRemoteRec(remoteRecordDto); // 远程文件存储形式的源 remoteCollect = getRemoteRecFromLocal(remoteRecordDto); // 进行去重逻辑 @@ -139,6 +141,15 @@ public class SendBigDataTask { // Collections.shuffle(collect); } + private void waitSendSuccessRemoteRec(RemoteRecordDto remoteRecordDto) { + // 对发送后的状态进行更新 + RemoteRecord remote = new RemoteRecord(); + BeanUtil.copyProperties(remoteRecordDto, remote); + remote.setTag(WAIT_SUCCESS_TAG); + remote.setWeight(5); // 把正在发送权重改成 5 + remoteRecordService.update(remote); + } + private void finishSendThenUpdateRec(BuildRecord resource, BuildRecordDto buildRecordDto, AtomicLong atomicLong) { // 对发送后的状态进行更新 buildRecordDto.setIsSend(FINISH_SEND_TAG); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/RemoteRecConst.java b/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/RemoteRecConst.java index 3cb9fd6..527b8f7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/RemoteRecConst.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/RemoteRecConst.java @@ -2,6 +2,10 @@ package me.zhengjie.modules.remoterec.consts; public class RemoteRecConst { + /** + * 等待发送成功标识 + */ + public static final Integer WAIT_SUCCESS_TAG = 3; /** * 成功执行的标识 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/SysConst.java b/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/SysConst.java index 728bbfc..e4af824 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/SysConst.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/remoterec/consts/SysConst.java @@ -6,7 +6,7 @@ package me.zhengjie.modules.remoterec.consts; public class SysConst { // 远程服务器的相关配置 - public static final String REMOTE_TRANS_HOST = "118.178.137.129"; + public static final String REMOTE_TRANS_HOST = "116.62.197.152"; public static final Integer REMOTE_TRANS_PORT = 22; diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index 2606f39..8a59dec 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -5,7 +5,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: test jackson: time-zone: GMT+8 data: