From a91d886b77f9d5be16f98a1e1717fd068bb60ed2 Mon Sep 17 00:00:00 2001 From: zyyang Date: Tue, 22 Dec 2020 10:58:10 +0800 Subject: [PATCH] change --- .../java/com/taosdata/taosdemo/TaosDemoApplication.java | 7 +++---- .../com/taosdata/taosdemo/service/SubTableService.java | 2 +- .../com/taosdata/taosdemo/utils/TimeStampUtilTest.java | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java index 502936c961..a0cbdb5190 100644 --- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java +++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/TaosDemoApplication.java @@ -79,7 +79,7 @@ public class TaosDemoApplication { // 插入 long tableSize = config.numOfTables; int threadSize = config.numOfThreadsForInsert; - long startTime = getProperStartTime(config); + long startTime = getProperStartTime(config.startTime, config.keep); if (tableSize < threadSize) threadSize = (int) tableSize; @@ -98,10 +98,9 @@ public class TaosDemoApplication { System.exit(0); } - private static long getProperStartTime(JdbcTaosdemoConfig config) { + private static long getProperStartTime(long startTime, int keep) { Instant now = Instant.now(); - long earliest = now.minus(Duration.ofDays(config.keep)).toEpochMilli(); - long startTime = config.startTime; + long earliest = now.minus(Duration.ofDays(keep)).toEpochMilli(); if (startTime == 0 || startTime < earliest) { startTime = earliest; } diff --git a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java index 95887137a2..5b99bf3558 100644 --- a/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java +++ b/tests/examples/JDBC/taosdemo/src/main/java/com/taosdata/taosdemo/service/SubTableService.java @@ -63,7 +63,7 @@ public class SubTableService extends AbstractService { // 插入: 多表,insert into xxx values(),()... xxx values(),()... public int insert(List subTableValues) { - return mapper.insertMultiTableMultiValuesUsingSuperTable(subTableValues); + return mapper.insertMultiTableMultiValues(subTableValues); } // 插入:单表,自动建表, insert into xxx using xxx tags(...) values(),()... diff --git a/tests/examples/JDBC/taosdemo/src/test/java/com/taosdata/taosdemo/utils/TimeStampUtilTest.java b/tests/examples/JDBC/taosdemo/src/test/java/com/taosdata/taosdemo/utils/TimeStampUtilTest.java index 628594c4b1..195db2b13e 100644 --- a/tests/examples/JDBC/taosdemo/src/test/java/com/taosdata/taosdemo/utils/TimeStampUtilTest.java +++ b/tests/examples/JDBC/taosdemo/src/test/java/com/taosdata/taosdemo/utils/TimeStampUtilTest.java @@ -17,6 +17,9 @@ public class TimeStampUtilTest { @Test public void longToDatetime() { + System.out.println(TimeStampUtil.longToDatetime(1293244920052l)); + + String datetime = TimeStampUtil.longToDatetime(1510000000000L); assertEquals("2017-11-07 04:26:40.000", datetime); long timestamp = TimeStampUtil.datetimeToLong(datetime);