From e2dbfc38f444aa77761a046152407e3e8e4048e6 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 5 Jan 2024 14:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=BA=93=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oracle-data/oracle-source/pom.xml | 2 -- .../oracle/controller/DataSyncController.java | 3 ++- .../src/test/java/com/njcn/DataTest.java | 26 +++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) rename oracle-data/{oracle-source => oracle-target}/src/main/java/com/njcn/oracle/controller/DataSyncController.java (98%) diff --git a/oracle-data/oracle-source/pom.xml b/oracle-data/oracle-source/pom.xml index 89474fb..83e5ff8 100644 --- a/oracle-data/oracle-source/pom.xml +++ b/oracle-data/oracle-source/pom.xml @@ -132,8 +132,6 @@ mybatis-plus-boot-starter - - com.baomidou diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/controller/DataSyncController.java b/oracle-data/oracle-target/src/main/java/com/njcn/oracle/controller/DataSyncController.java similarity index 98% rename from oracle-data/oracle-source/src/main/java/com/njcn/oracle/controller/DataSyncController.java rename to oracle-data/oracle-target/src/main/java/com/njcn/oracle/controller/DataSyncController.java index 90c2ea5..885f20e 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/controller/DataSyncController.java +++ b/oracle-data/oracle-target/src/main/java/com/njcn/oracle/controller/DataSyncController.java @@ -34,8 +34,9 @@ import java.util.List; public class DataSyncController { private final ServiceExecutorStore serviceExecutorStore; + @PostMapping("/dataSync") - @ApiOperation("新增组件") + @ApiOperation("数据同步") @ApiImplicitParam(name = "componentParam", value = "组件数据", required = true) public void dataSync(@RequestBody MigrationParam migrationParam) { diff --git a/oracle-data/oracle-target/src/test/java/com/njcn/DataTest.java b/oracle-data/oracle-target/src/test/java/com/njcn/DataTest.java index 4399bb9..0b249a4 100644 --- a/oracle-data/oracle-target/src/test/java/com/njcn/DataTest.java +++ b/oracle-data/oracle-target/src/test/java/com/njcn/DataTest.java @@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.extra.spring.SpringUtil; import com.njcn.oracle.bo.param.MigrationParam; import com.njcn.oracle.bo.po.*; +import com.njcn.oracle.mybatis.service.IReplenishMybatisService; import com.njcn.oracle.service.*; import lombok.SneakyThrows; import org.junit.Test; @@ -58,6 +60,30 @@ public class DataTest extends BaseJunitTest { private @Autowired ILimitTargetService limittargetservice; + @SneakyThrows + @Test + public void testBean() { + LocalDateTime endTime = LocalDateTimeUtil.parse("2023-12-29 15:00:10", DatePattern.NORM_DATETIME_PATTERN); + LocalDateTime startTime = LocalDateTimeUtil.offset(endTime, -24, ChronoUnit.HOURS); + +// LocalDateTime endTime = LocalDateTimeUtil.parse("1970-01-02 00:00:10", DatePattern.NORM_DATETIME_PATTERN); +// LocalDateTime startTime = LocalDateTimeUtil.offset(endTime, -2, ChronoUnit.HOURS); + + MigrationParam migrationParam = new MigrationParam(); + migrationParam.setStartTime(startTime); + migrationParam.setEndTime(endTime); + IReplenishMybatisService executor = (IReplenishMybatisService) SpringUtil.getBean(Class.forName("com.njcn.oracle.service.impl.DataFlickerServiceImpl")); + //查询数据 + List temp = executor.queryData(migrationParam); + if(CollectionUtil.isNotEmpty(temp)){ + //清除数据 + executor.clearTargetData(migrationParam); + //插入数据 + executor.insertBatchByDB(temp); + } + } + + @SneakyThrows @Test public void test() {