From d636c59825ba5b8214b07b907145b5c80a78b4de Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 19 Jan 2024 12:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9oralcetooralcejob=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E7=94=B1=E7=8E=B0=E5=9C=A8=E5=BE=80?=
 =?UTF-8?q?=E4=BB=A5=E5=89=8D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/oracle/job/OracleToOralceJob.java   | 16 ++++++++--------
 .../src/main/resources/application.yml           |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/oracle-data/oracle-target/src/main/java/com/njcn/oracle/job/OracleToOralceJob.java b/oracle-data/oracle-target/src/main/java/com/njcn/oracle/job/OracleToOralceJob.java
index 936e8da..8d7cead 100644
--- a/oracle-data/oracle-target/src/main/java/com/njcn/oracle/job/OracleToOralceJob.java
+++ b/oracle-data/oracle-target/src/main/java/com/njcn/oracle/job/OracleToOralceJob.java
@@ -45,29 +45,29 @@ public class OracleToOralceJob {
     private String endtime;
 
     @Scheduled(cron="0 5 0 * * ?")
-//    @Scheduled(fixedDelay=3000000)
     public void execute() {
         QueryWrapper<JobHistoryLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("max(LAST_DATE) as LAST_DATE");
+        queryWrapper.select("min(LAST_DATE) as LAST_DATE");
         LocalDate startDate ;
         LocalDate endDate ;
         JobHistoryLog one = jobHistoryLogService.getBaseMapper().selectOne(queryWrapper);
+        //获取当前任务的结束时间
         if (Objects.isNull(one)){
             startDate =LocalDate.parse(startime);
 
         }else {
             startDate = one.getLastDate();
-            startDate = startDate.plusDays(1);
+            startDate = startDate.plusDays(-1);
         }
-        //获取配置的endtime。现在时间减1天，开始时间+时间间隔最小值当enddate
-        List<LocalDate> dates = Arrays.asList(LocalDate.parse(endtime), LocalDate.now().plusDays(-1), startDate.plusDays(slice-1));
+        //获取配置的endtime和执行到时时间减去执行天数当startday最大值当当前任务的开始时间
+        List<LocalDate> dates = Arrays.asList(LocalDate.parse(endtime), startDate.plusDays(-(slice-1)));
 
-        endDate = dates.stream().min(LocalDate::compareTo).get();
+        endDate = dates.stream().max(LocalDate::compareTo).get();
 
 
         DataAsynParam dataAsynParam = new DataAsynParam();
-        dataAsynParam.setStartTime(startDate);
-        dataAsynParam.setEndTime(endDate);
+        dataAsynParam.setStartTime(endDate);
+        dataAsynParam.setEndTime(startDate);
         dataAsynParam.setTableNames(ServiceTypeEnum.getExecutableTypes());
         dataAsynParam.setExcuteType(2);
         oracleService.dataBacthSysc(dataAsynParam);
diff --git a/oracle-data/oracle-target/src/main/resources/application.yml b/oracle-data/oracle-target/src/main/resources/application.yml
index 59f551a..3ebf83c 100644
--- a/oracle-data/oracle-target/src/main/resources/application.yml
+++ b/oracle-data/oracle-target/src/main/resources/application.yml
@@ -86,9 +86,9 @@ mybatis-plus:
 business:
   slice: 4
 
-#配置job相关参数
+#配置job相关参数startime>endtime;重最近数据往历史数据慢慢迁移
 job:
-  startime: 2023-01-01
-  endtime: 2023-04-01
+  startime: 2024-01-18
+  endtime: 2023-01-01
   #每天执行数据量(天数）大于1
   slice: 2