From 75ead4619539b65d75bdd07d22af772f0296cb73 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Wed, 17 Jan 2024 10:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OracleToInfluxDBServiceImpl.java     | 20 ++++++++----------
 .../service/impl/OracleServiceImpl.java       | 21 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java
index cfa4f01..cc66598 100644
--- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java
+++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java
@@ -77,6 +77,10 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService {
                     //如果该指标当前天已执行或正在执行，直接跳出循环
                     break;
                 }
+                if (Objects.isNull(jobDetailInfluxDB)) {
+                    jobDetailInfluxDB = new JobDetailInfluxDB(tableName, date, 0, 0, LocalDateTime.now());
+                    jobDetailInfluxDBService.save(jobDetailInfluxDB);
+                }
                 //程序监听
                 StopWatch stopWatch = new StopWatch();
                 stopWatch.start();
@@ -136,18 +140,12 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService {
                         }
                         //手动执行GC
                         System.gc();
-                        if (Objects.nonNull(jobDetailInfluxDB)) {
-                            if (i == 0) {
-                                jobDetailInfluxDB.setState(0);
-                                jobDetailInfluxDB.setRowCount(0);
-                            }
-                            jobDetailInfluxDB.setRowCount(jobDetailInfluxDB.getRowCount() + size);
-                            jobDetailInfluxDB.setUpdateTime(LocalDateTime.now());
-                            jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB);
-                        } else {
-                            jobDetailInfluxDB = new JobDetailInfluxDB(tableName, date, 0, size, LocalDateTime.now());
-                            jobDetailInfluxDBService.save(jobDetailInfluxDB);
+                        if (i == 0) {
+                            jobDetailInfluxDB.setRowCount(0);
                         }
+                        jobDetailInfluxDB.setRowCount(jobDetailInfluxDB.getRowCount() + size);
+                        jobDetailInfluxDB.setUpdateTime(LocalDateTime.now());
+                        jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB);
                         if (i + 1 == slice && Objects.nonNull(jobDetailInfluxDB)) {
                             stopWatch.stop();
                             jobDetailInfluxDB.setState(1);
diff --git a/oracle-data/oracle-target/src/main/java/com/njcn/oracle/service/impl/OracleServiceImpl.java b/oracle-data/oracle-target/src/main/java/com/njcn/oracle/service/impl/OracleServiceImpl.java
index 1fa750a..475a8a7 100644
--- a/oracle-data/oracle-target/src/main/java/com/njcn/oracle/service/impl/OracleServiceImpl.java
+++ b/oracle-data/oracle-target/src/main/java/com/njcn/oracle/service/impl/OracleServiceImpl.java
@@ -68,6 +68,11 @@ public class OracleServiceImpl implements IOracleService {
                     //如果该指标当前天已执行或正在执行，直接跳出循环
                     break;
                 }
+                if (Objects.isNull(jobDetail)) {
+                    jobDetail = new JobDetail(tableName, date, 0, 0, LocalDateTime.now());
+                    jobDetailService.save(jobDetail);
+                }
+
                 //程序监听
                 StopWatch stopWatch = new StopWatch();
                 stopWatch.start();
@@ -99,18 +104,12 @@ public class OracleServiceImpl implements IOracleService {
                         }
                         //手动执行GC
                         System.gc();
-                        if (Objects.nonNull(jobDetail)) {
-                            if (i == 0) {
-                                jobDetail.setState(0);
-                                jobDetail.setRowCount(0);
-                            }
-                            jobDetail.setRowCount(jobDetail.getRowCount() + size);
-                            jobDetail.setUpdateTime(LocalDateTime.now());
-                            jobDetailService.updateByMultiId(jobDetail);
-                        } else {
-                            jobDetail = new JobDetail(tableName, date, 0, size, LocalDateTime.now());
-                            jobDetailService.save(jobDetail);
+                        if (i == 0) {
+                            jobDetail.setRowCount(0);
                         }
+                        jobDetail.setRowCount(jobDetail.getRowCount() + size);
+                        jobDetail.setUpdateTime(LocalDateTime.now());
+                        jobDetailService.updateByMultiId(jobDetail);
                         if (i + 1 == slice && Objects.nonNull(jobDetail)) {
                             stopWatch.stop();
                             jobDetail.setState(1);