From 0b5729fbf7364ce46601206a52e2ad5c5b2be115 Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 3 Mar 2021 11:16:30 +0800
Subject: [PATCH] change

---
 .../controller/WeatherController.java            | 11 -----------
 .../springbootdemo/dao/WeatherMapper.java        |  4 +---
 .../example/springbootdemo/dao/WeatherMapper.xml | 11 ++---------
 .../springbootdemo/service/WeatherService.java   | 12 ++++++------
 .../src/main/resources/application.properties    | 16 ++++++++--------
 5 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
index a2470713b8..e595e26f3e 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
@@ -48,17 +48,6 @@ public class WeatherController {
         return weatherService.save(temperature, humidity);
     }
 
-    /**
-     * upload multi weather info
-     *
-     * @param weatherList
-     * @return
-     */
-    @PostMapping("/batch")
-    public int batchSaveWeather(@RequestBody List<Weather> weatherList) {
-        return weatherService.save(weatherList);
-    }
-
     @GetMapping("/count")
     public int count() {
         return weatherService.count();
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
index ddbc0e997d..7e35e19e61 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
@@ -11,14 +11,12 @@ public interface WeatherMapper {
 
     void createSuperTable();
 
-    void createTable();
+    void createTable(Weather weather);
 
     List<Weather> select(@Param("limit") Long limit, @Param("offset") Long offset);
 
     int insert(Weather weather);
 
-    int batchInsert(List<Weather> weatherList);
-
     int count();
 
     List<String> getSubTables();
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
index f9a9002d76..49ae45fad9 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
@@ -10,7 +10,7 @@
     </resultMap>
 
     <update id="createDB">
-        create database if not exists test;
+        create database if not exists test
     </update>
 
     <update id="createSuperTable">
@@ -32,14 +32,7 @@
     </select>
 
     <insert id="insert" parameterType="com.taosdata.example.springbootdemo.domain.Weather">
-        insert into test.weather (ts, temperature, humidity) values (now, #{temperature,jdbcType=INTEGER}, #{humidity,jdbcType=FLOAT})
-    </insert>
-
-    <insert id="batchInsert" parameterType="java.util.List">
-        insert into test.weather (ts, temperature, humidity) values
-        <foreach separator=" " collection="list" item="weather" index="index">
-            (now + #{index}a, #{weather.temperature}, #{weather.humidity})
-        </foreach>
+        insert into test.t#{groupId} (ts, temperature, humidity) values (#{ts}, #{temperature}, #{humidity})
     </insert>
 
     <select id="getSubTables">
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
index 08a1321ff1..a5ba27658d 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
@@ -15,15 +15,19 @@ public class WeatherService {
     @Autowired
     private WeatherMapper weatherMapper;
     private Random random = new Random(System.currentTimeMillis());
+    private String[] locations = {"北京", "上海", "广州", "深圳", "天津"};
 
     public int init() {
         weatherMapper.createDB();
         weatherMapper.createSuperTable();
-        weatherMapper.createTable();
         long ts = System.currentTimeMillis();
         int count = 0;
         for (int i = 0; i < 10; i++) {
-            count += weatherMapper.insert(new Weather(new Timestamp(ts + (1000 * i)), 30 * random.nextFloat(), random.nextInt(100)));
+            Weather weather = new Weather(new Timestamp(ts + (1000 * i)), 30 * random.nextFloat(), random.nextInt(100));
+            weather.setLocation(locations[random.nextInt(locations.length)]);
+            weather.setGroupId(i % locations.length);
+            weatherMapper.createTable(weather);
+            count += weatherMapper.insert(weather);
         }
         return count;
     }
@@ -40,10 +44,6 @@ public class WeatherService {
         return weatherMapper.insert(weather);
     }
 
-    public int save(List<Weather> weatherList) {
-        return weatherMapper.batchInsert(weatherList);
-    }
-
     public int count() {
         return weatherMapper.count();
     }
diff --git a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
index e957e00112..4d7e64d105 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
@@ -1,15 +1,15 @@
 # datasource config - JDBC-JNI
-spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
-spring.datasource.url=jdbc:TAOS://127.0.0.1:6030/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
-spring.datasource.username=root
-spring.datasource.password=taosdata
-
-# datasource config - JDBC-RESTful
-#spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-#spring.datasource.url=jdbc:TAOS-RS://localhost:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+#spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
+#spring.datasource.url=jdbc:TAOS://127.0.0.1:6030/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
 #spring.datasource.username=root
 #spring.datasource.password=taosdata
 
+# datasource config - JDBC-RESTful
+spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
+spring.datasource.url=jdbc:TAOS-RS://master:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+spring.datasource.username=root
+spring.datasource.password=taosdata
+
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.min-idle=5
 spring.datasource.druid.max-active=5