配置

state/wind/src/main/java/com/gyee/gaia/Bootstrap.java

@@ -1,17 +1,16 @@
 package com.gyee.gaia;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @EnableDiscoveryClient
 @SpringBootApplication(scanBasePackages = "com.gyee.gaia")
-public class Bootstrap {
+public class WindState {
 
     public static void main(String[] args) {
 
-        SpringApplication.run(Bootstrap.class, args);
+        SpringApplication.run(WindState.class, args);
 
     }
 }

state/wind/src/main/java/com/gyee/gaia/state/wind/service/CalculateServer.java

@@ -100,7 +100,7 @@ public class CalculateServer {
                                             stInfo.getReadMap().get(entry.getKey()).setLastUpdateTsData(entry.getValue());
                                     }
                                 }
-                                if (readRtdbSuccess == false)
+                                if (!readRtdbSuccess)
                                     readRtdbSuccess = true;
                             } catch (Exception ex) {
                                 log.error(ex.getMessage());

state/wind/src/main/java/com/gyee/gaia/state/wind/service/Status8Service.java

@@ -77,7 +77,7 @@ public class Status8Service {
         for (TestingPoint tsPoint : list) {
             if (zttsMap.containsKey(tsPoint.getUniformCode()) == false) {
                 TagInfo tagInfo = new TagInfo();
-                tagInfo.setId(tsPoint.getId());
+                tagInfo.setId(tsPoint.getCode());
                 tagInfo.setLastUpdateTsData(new DoubleTsData(0L, (short) 0, -1));
                 String str = status8Properties.convertZttsUniformCodes(tsPoint.getUniformCode());
                 if (str != null && zttsMap.containsKey(str) == false) {
@@ -105,7 +105,7 @@ public class Status8Service {
         for (TestingPoint tsPoint : tplist2) {
             if (fjztMap.containsKey(tsPoint.getThingId()) == false) {
                 TagInfo tagInfo = new TagInfo();
-                tagInfo.setId(tsPoint.getId());
+                tagInfo.setId(tsPoint.getCode());
                 //tagInfo.set
                 tagInfo.setUniformCode(tsPoint.getUniformCode());
                 fjztMap.put(tsPoint.getThingId(), tagInfo);
@@ -124,7 +124,7 @@ public class Status8Service {
         for (TestingPoint tsPoint : tplist3) {
             if (gzztMap.containsKey(tsPoint.getThingId()) == false) {
                 TagInfo tagInfo = new TagInfo();
-                tagInfo.setId(tsPoint.getId());
+                tagInfo.setId(tsPoint.getCode());
                 //tagInfo.set
                 tagInfo.setUniformCode(tsPoint.getUniformCode());
                 gzztMap.put(tsPoint.getThingId(), tagInfo);

state/wind/src/main/resources/application-nx.yaml

@@ -1,6 +1,6 @@
 calculate:
   status8:
-    serviceUrl: http://192.168.1.82:8011/ts
+    serviceUrl: http://192.168.10.18:8011/ts
     #离线判定时间（单位：秒）
     offlineInterval: 300
     #扫描线程轮询时间（单位：毫秒）

timeseries/dao-redis-taos/src/main/java/com/gyee/gaia/dao/redistaos/TaosDataChangeDao.java

@@ -1,6 +1,7 @@
 package com.gyee.gaia.dao.redistaos;
 
 import com.gyee.gaia.dao.timeseries.IDataChangeDao;
+import com.gyee.gaia.dao.timeseries.RedisTaosDao;
 import com.gyee.gaia.dao.timeseries.TaosDao;
 import com.gyee.wisdom.common.data.timeseries.TsData;
 import com.gyee.wisdom.common.data.timeseries.TsPoint;
@@ -12,7 +13,7 @@ import java.util.Map;
 
 @Slf4j
 @Component
-@TaosDao
+@RedisTaosDao
 public class TaosDataChangeDao implements IDataChangeDao {
 
     @Override

timeseries/dao-redis-taos/src/main/java/com/gyee/gaia/dao/redistaos/TaosHistoryDao.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.redistaos;
 
 import com.gyee.gaia.dao.redistaos.config.TaosConfig;
 import com.gyee.gaia.dao.timeseries.IHistoryDao;
+import com.gyee.gaia.dao.timeseries.RedisTaosDao;
 import com.gyee.gaia.dao.timeseries.TaosDao;
 import com.gyee.wisdom.common.data.timeseries.*;
 import com.gyee.wisdom.common.exception.WisdomException;
@@ -18,7 +19,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component
-@TaosDao
+@RedisTaosDao
 public class TaosHistoryDao implements IHistoryDao {
 
     private long day_time = 86400000L;

timeseries/dao-redis-taos/src/main/java/com/gyee/gaia/dao/redistaos/TaosLatestDao.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.redistaos;
 
 import com.gyee.gaia.dao.redistaos.config.TaosConfig;
 import com.gyee.gaia.dao.timeseries.ILatestDao;
+import com.gyee.gaia.dao.timeseries.RedisTaosDao;
 import com.gyee.gaia.dao.timeseries.TaosDao;
 import com.gyee.wisdom.common.data.timeseries.*;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component
-@TaosDao
+@RedisTaosDao
 public class TaosLatestDao implements ILatestDao {
 
     @Autowired

timeseries/data-adapter/build.gradle

@@ -25,8 +25,8 @@ dependencies {
     //implementation project(":timeseries:dao-golden")
     //compile project(":timeseries:dao-taos")
     //implementation project(":timeseries:dao-taoscz")
-    implementation project(":timeseries:dao-taos")
-    //implementation project(":timeseries:dao-redis-taos")
+    //implementation project(":timeseries:dao-taos")
+    implementation project(":timeseries:dao-redis-taos")
     //compile project(":timeseries:dao-hive")
     //compile project(":timeseries:dao-hadoop")
     implementation fileTree(dir: 'src/main/lib', include: '*.jar') //// oracle连接驱动       2区使用

timeseries/data-adapter/src/main/java/com/gyee/gaia/Bootstrap.java

@@ -1,6 +1,5 @@
 package com.gyee.gaia;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -12,11 +11,11 @@ import org.springframework.cache.annotation.EnableCaching;
 @EnableCaching
 @ServletComponentScan
 @SpringBootApplication(scanBasePackages = "com.gyee.gaia")
-public class Bootstrap {
+public class Adapter {
 
     public static void main(String[] args) {
 
-        SpringApplication.run(Bootstrap.class, args);
+        SpringApplication.run(Adapter.class, args);
    /*     PointList.pointListInit();
         PointList.MapInit();
         Thread t = new ReadAndWrite();

timeseries/data-adapter/src/main/java/com/gyee/gaia/dataadapter/websocket/backwork/BackWorkStart.java

@@ -26,9 +26,14 @@ public class BackWorkStart implements ApplicationRunner {
     @Autowired
     private TsPointService tsPointService;
 
+    @Value("${timeseries.db-type}")
+    private String type;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
+        System.out.println(type);
+
         //一次性加载所有测点至缓存
         if (Boolean.valueOf(isLoadAllWindturbineTag)) {
             tsPointService.getAllTsPointToCache();

timeseries/data-adapter/src/main/resources/application-bf.yaml

@@ -0,0 +1,158 @@
+server:
+  port: 8011
+  max-http-header-size: 128KB
+  tomcat:
+    connection-timeout: 3000
+
+
+spring:
+  application:
+    name: data-adapter
+  jpa:
+    show-sql: false
+  cache:
+    type: SIMPLE
+  datasource:
+    # -------------------------1区mysql/2区oracle---------------------------------------
+    driver-class-name: oracle.jdbc.OracleDriver
+    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    username: nxfdprod
+    password: gdnxfd123
+    # ----------------------------------------------------------------
+    #    driver-class-name: com.mysql.jdbc.Driver
+    #    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
+    #    username: root
+    #    password: gyeepd@123
+    # ----------------------------------------------------------------
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  profiles:
+    active: nxcs
+#  redis:
+#    database: 2
+#    host: 192.168.2.5
+#    password:
+#    port: 6379
+#    timeout: 60000
+#    jedis:
+#      pool:
+#        maxTotal: 20
+#        maxIdle: 20
+#        maxwait: 60000
+#        minIdle: 10
+# 此处Key不可改变
+knife4j:
+  redis:
+    # 是否采用json序列化方式，若不采用jackson序列化
+    jsonSerialType: 'Fastjson'
+    host: 114.55.105.194
+    password: wanghs123
+    port: 6379
+    databases: [ 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ] # 要使用的库，会根据此处填写的库生成redisTemplate
+    timeout: 60s
+    lettuce: # lettuce基于netty，线程安全，支持并发
+      pool:
+        max-active: 50
+        max-wait: -1ms
+        max-idle: 8
+        min-idle: 0
+  cache:
+    type: Simple
+
+timeseries:
+  db-type: taos #"${DATABASE_TYPE:sql}" # cassandra/kairosDB/hbase/opentsDB/influxDB/TiDB
+  #db-type: hadoop #"${DATABASE_TYPE:sql}" # cassandra/kairosDB/hbase/opentsDB/influxDB/TiDB
+#golden 数据库信息
+golden:
+  server_ip: 123.60.213.70
+  #server_ip: 172.168.1.3
+  server_port: 6327
+  user_name: sa
+  password: golden
+  pool_size: 10
+  max_pool_size: 100
+  #单次查询历史原始数据的数量上限
+  query_history_limit: 100000
+
+#hadoop数据库信息
+hadoop:
+  #查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
+  lastValueSearch: 8
+  urlMap:
+    DJL: http://192.168.1.61:4242/api/
+    DQ: http://192.168.1.62:4242/api/
+    GF: http://192.168.1.63:4242/api/
+    GGL: http://192.168.1.64:4242/api/
+    FGL: http://192.168.1.66:4242/api/
+    FJ: http://192.168.1.69:4243/api/
+    JSFW: http://192.168.1.67:4242/api/
+    #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
+    DQ2: http://192.168.1.62:10001/api/
+
+#taos数据库
+taos:
+  server_ip: 192.168.2.252
+  server_port: 6030
+  user_name: root
+  password: taosdata
+  pool_size: 10
+  max_pool_size: 100
+
+#适配器链接taos数据库配置信息
+taoscz:
+  server_ip: 123.60.219.66
+  server_port: 6041
+  db_name: hnj_fdc
+  user_name: root
+  password: taosdata
+  pool_size: 10
+  max_pool_size: 100
+  driver_type: com.taosdata.jdbc.rs.RestfulDriver
+  #driver_type: com.taosdata.jdbc.TSDBDriver
+  #taos中ai测点的超级表名
+  di_stable_name: windturbinedi
+  #taos中di测点的超级表名
+  ai_stable_name: windturbineai
+
+#EDOS 数据库信息
+edos:
+  server_ip: 192.168.1.100
+  server_port: 10010
+  default_connections: 1
+  incremental_connections: 1
+  max_connections: 10
+# Publish 发布服务配置
+publish:
+  rtdb_scan_interval: 1000
+  publish_interval: 5000
+
+#是否缓存所有风机测点
+isLoadAllTag: true
+#是否启动websocket推送
+websocket_start: false
+#websocket推送风机基本信息统一编码
+uniformcode:
+  wind_speed_code: AI022
+  roll_speed_code: AI128
+  power_code: AI130
+  status_code: FJZT8
+  lock_code: XDSL
+  pv_I: AIG060     #电流-A相
+  pv_U: AIG061     #电压-A相
+  pv_P: AI130      #功率-有功功率
+  pv_statue: FJZT  #状态
+
+
+
+
+
+

timeseries/data-adapter/src/main/resources/application-nx.yaml

@@ -38,9 +38,9 @@ spring:
       test-while-idle: true
       test-on-borrow: false
       test-on-return: false
-  config:
-    activate:
-      on-profile: nx
+#  config:
+#    activate:
+#      on-profile: nx
 #  redis:
 #    database: 2
 #    host: 192.168.2.5

timeseries/data-adapter/src/main/resources/application-nxcs.yaml

@@ -0,0 +1,169 @@
+server:
+  port: 8011
+  max-http-header-size: 128KB
+
+
+spring:
+  application:
+    name: data-adapter
+  jpa:
+    show-sql: false
+  cache:
+    type: SIMPLE
+  datasource:
+    # -------------------------1区mysql/2区oracle---------------------------------------
+    driver-class-name: oracle.jdbc.OracleDriver
+    url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
+    username: nxfdprod
+    password: gdnxfd123
+    # -------------------------1区mysql/2区oracle---------------------------------------
+    #    driver-class-name: oracle.jdbc.OracleDriver
+    #    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    #    username: nxfdprod
+    #    password: gdnxfd123
+    # ----------------------------------------------------------------
+    #    driver-class-name: com.mysql.jdbc.Driver
+    #    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
+    #    username: root
+    #    password: gyeepd@123
+    # ----------------------------------------------------------------
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+#  config:
+#    activate:
+#      on-profile: nx
+#  redis:
+#    database: 2
+#    host: 192.168.2.5
+#    password:
+#    port: 6379
+#    timeout: 60000
+#    jedis:
+#      pool:
+#        maxTotal: 20
+#        maxIdle: 20
+#        maxwait: 60000
+#        minIdle: 10
+# 此处Key不可改变
+knife4j:
+  redis:
+    # 是否采用json序列化方式，若不采用jackson序列化
+    jsonSerialType: 'Fastjson'
+    host: 114.55.105.194
+    password: wanghs123
+    port: 6379
+    databases: [ 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ] # 要使用的库，会根据此处填写的库生成redisTemplate
+    timeout: 60s
+    lettuce: # lettuce基于netty，线程安全，支持并发
+      pool:
+        max-active: 50
+        max-wait: -1ms
+        max-idle: 8
+        min-idle: 0
+  cache:
+    type: Simple
+
+timeseries:
+  db-type: redis-taos #"${DATABASE_TYPE:sql}" # cassandra/kairosDB/hbase/opentsDB/influxDB/TiDB
+  #db-type: hadoop #"${DATABASE_TYPE:sql}" # cassandra/kairosDB/hbase/opentsDB/influxDB/TiDB
+#golden 数据库信息
+golden:
+  server_ip: 10.155.32.1
+  #server_ip: 172.168.1.3
+  server_port: 6327
+  user_name: sa
+  password: golden
+  pool_size: 10
+  max_pool_size: 100
+  #单次查询历史原始数据的数量上限
+  query_history_limit: 100000
+
+#hadoop数据库信息
+hadoop:
+  #查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
+  lastValueSearch: 8
+  urlMap:
+    DJL: http://192.168.1.61:4242/api/
+    DQ: http://192.168.1.62:4242/api/
+    GF: http://192.168.1.63:4242/api/
+    GGL: http://192.168.1.64:4242/api/
+    FGL: http://192.168.1.66:4242/api/
+    FJ: http://192.168.1.69:4243/api/
+    JSFW: http://192.168.1.67:4242/api/
+    #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
+    DQ2: http://192.168.1.62:10001/api/
+
+#taos数据库
+taos:
+  #server_ip: 18.6.30.71
+  server_ip: 192.168.1.66
+  #restful
+  server_port: 6041
+  #jni
+  #server_port: 6030
+  user_name: root
+  password: taosdata
+  pool_size: 500
+  max_pool_size: 2000
+
+#适配器链接taos数据库配置信息
+taoscz:
+  server_ip: 192.168.23.128
+  server_port: 6030
+  db_name: nxxny
+  user_name: root
+  password: taosdata
+  pool_size: 10
+  max_pool_size: 100
+  #driver_type: com.taosdata.jdbc.rs.RestfulDriver
+  driver_type: com.taosdata.jdbc.TSDBDriver
+  #taos中ai测点的超级表名
+  di_stable_name: pointdi
+  #taos中di测点的超级表名
+  ai_stable_name: pointai
+
+#EDOS 数据库信息
+edos:
+  server_ip: 192.168.1.100
+  server_port: 10010
+  default_connections: 1
+  incremental_connections: 1
+  max_connections: 10
+# Publish 发布服务配置
+publish:
+  rtdb_scan_interval: 1000
+  publish_interval: 5000
+
+#是否缓存所有风机测点
+isLoadAllTag: false
+#是否启动websocket推送
+websocket_start: false
+#websocket推送风机基本信息统一编码
+uniformcode:
+  wind_speed_code: AI022
+  roll_speed_code: AI128
+  power_code: AI130
+  status_code: FJZT8
+  lock_code: XDSL
+  pv_I: AIG060     #电流-A相
+  pv_U: AIG061     #电压-A相
+  pv_P: AI130      #功率-有功功率
+  pv_statue: FJZT  #状态
+
+redis:
+  host: localhost
+  port: 6379
+  password:
+
+
+
+

timeseries/data-adapter/src/main/resources/application.yaml

@@ -1,158 +1,3 @@
-server:
-  port: 8011
-  max-http-header-size: 128KB
-  tomcat:
-    connection-timeout: 3000
-
-
 spring:
-  application:
-    name: data-adapter
-  jpa:
-    show-sql: false
-  cache:
-    type: SIMPLE
-  datasource:
-    # -------------------------1区mysql/2区oracle---------------------------------------
-    driver-class-name: oracle.jdbc.OracleDriver
-    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-    username: nxfdprod
-    password: gdnxfd123
-    # ----------------------------------------------------------------
-    #    driver-class-name: com.mysql.jdbc.Driver
-    #    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
-    #    username: root
-    #    password: gyeepd@123
-    # ----------------------------------------------------------------
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
   profiles:
-    active: nx
-#  redis:
-#    database: 2
-#    host: 192.168.2.5
-#    password:
-#    port: 6379
-#    timeout: 60000
-#    jedis:
-#      pool:
-#        maxTotal: 20
-#        maxIdle: 20
-#        maxwait: 60000
-#        minIdle: 10
-# 此处Key不可改变
-knife4j:
-  redis:
-    # 是否采用json序列化方式，若不采用jackson序列化
-    jsonSerialType: 'Fastjson'
-    host: 114.55.105.194
-    password: wanghs123
-    port: 6379
-    databases: [ 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ] # 要使用的库，会根据此处填写的库生成redisTemplate
-    timeout: 60s
-    lettuce: # lettuce基于netty，线程安全，支持并发
-      pool:
-        max-active: 50
-        max-wait: -1ms
-        max-idle: 8
-        min-idle: 0
-  cache:
-    type: Simple
-
-timeseries:
-  db-type: taos #"${DATABASE_TYPE:sql}" # cassandra/kairosDB/hbase/opentsDB/influxDB/TiDB
-  #db-type: hadoop #"${DATABASE_TYPE:sql}" # cassandra/kairosDB/hbase/opentsDB/influxDB/TiDB
-#golden 数据库信息
-golden:
-  server_ip: 123.60.213.70
-  #server_ip: 172.168.1.3
-  server_port: 6327
-  user_name: sa
-  password: golden
-  pool_size: 10
-  max_pool_size: 100
-  #单次查询历史原始数据的数量上限
-  query_history_limit: 100000
-
-#hadoop数据库信息
-hadoop:
-  #查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
-  lastValueSearch: 8
-  urlMap:
-    DJL: http://192.168.1.61:4242/api/
-    DQ: http://192.168.1.62:4242/api/
-    GF: http://192.168.1.63:4242/api/
-    GGL: http://192.168.1.64:4242/api/
-    FGL: http://192.168.1.66:4242/api/
-    FJ: http://192.168.1.69:4243/api/
-    JSFW: http://192.168.1.67:4242/api/
-    #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
-    DQ2: http://192.168.1.62:10001/api/
-
-#taos数据库
-taos:
-  server_ip: 192.168.2.252
-  server_port: 6030
-  user_name: root
-  password: taosdata
-  pool_size: 10
-  max_pool_size: 100
-
-#适配器链接taos数据库配置信息
-taoscz:
-  server_ip: 123.60.219.66
-  server_port: 6041
-  db_name: hnj_fdc
-  user_name: root
-  password: taosdata
-  pool_size: 10
-  max_pool_size: 100
-  driver_type: com.taosdata.jdbc.rs.RestfulDriver
-  #driver_type: com.taosdata.jdbc.TSDBDriver
-  #taos中ai测点的超级表名
-  di_stable_name: windturbinedi
-  #taos中di测点的超级表名
-  ai_stable_name: windturbineai
-
-#EDOS 数据库信息
-edos:
-  server_ip: 192.168.1.100
-  server_port: 10010
-  default_connections: 1
-  incremental_connections: 1
-  max_connections: 10
-# Publish 发布服务配置
-publish:
-  rtdb_scan_interval: 1000
-  publish_interval: 5000
-
-#是否缓存所有风机测点
-isLoadAllTag: true
-#是否启动websocket推送
-websocket_start: false
-#websocket推送风机基本信息统一编码
-uniformcode:
-  wind_speed_code: AI022
-  roll_speed_code: AI128
-  power_code: AI130
-  status_code: FJZT8
-  lock_code: XDSL
-  pv_I: AIG060     #电流-A相
-  pv_U: AIG061     #电压-A相
-  pv_P: AI130      #功率-有功功率
-  pv_statue: FJZT  #状态
-
-
-
-
-
-
+    active: nxcs

timeseries/data-adapter/src/main/resources/bootstrap.yaml

@@ -8,7 +8,7 @@ spring:
   application:
     name: data-adapter
   profiles:
-    active: nx
+    active: nxcs
   cloud:
     nacos:
       discovery:
@@ -42,7 +42,4 @@ spring:
       min-evictable-idle-time-millis: 300000
       test-while-idle: true
       test-on-borrow: false
-      test-on-return: false
-
-timeseries:
-  db-type: taos
+      test-on-return: false