taos建表

.gitignore

@@ -46,3 +46,7 @@
 /logs
 /*.class
 .DS_Store
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/

data-adapter/src/main/java/com/gyee/wisdom/dataadapter/runner/SpringStartAfter.java

@@ -52,15 +52,17 @@ public class SpringStartAfter implements ApplicationRunner {
     private IThingsPointDao thingsPointDao;
 
 
+    List<TsPoint> allTsPoint = null;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
         //牛首山风电场 taos库创建，taos库保存数据为90天
-//        initDatabase("HNJ_FDC", 90);
+        //initDatabase("FS_FDC", 90);
 //        //牛首山风电场 ai测点表创建，超级表名为windturbineai，风机型号为UP82
-//        initTableAI("HNJ_FDC", "windturbineai", "MY-1500");
+        initTableAI("FS_FDC", "pointai", "UP82-1500");
 //        //牛首山风电场 di测点表创建，超级表名为windturbinedi，风机型号为UP82
-//        initTableDI("HNJ_FDC", "windturbinedi", "MY-1500");
+        //initTableDI("FS_FDC", "pointdi", "UP82-1500");
 
 //        Random r = new Random();
 //        Long ts = new Date().getTime();
@@ -161,7 +163,7 @@ public class SpringStartAfter implements ApplicationRunner {
             final Statement statement = connection.createStatement();
             //statement.executeUpdate(createDatabaseSql);
 
-            String createSTableSql = "create database " + stationName + " replica 1 quorum 1 days 1 keep " + keepDay + " cache 16 blocks 6" +
+            String createSTableSql = "create database " + dbName + " replica 1 quorum 1 days 1 keep " + keepDay + " cache 16 blocks 6" +
                     " minrows 100 maxrows 4096 wal 1 fsync 3000 comp 2 cachelast 0 precision 'ms' update 1";
             statement.executeUpdate(createSTableSql);
 
@@ -180,9 +182,9 @@ public class SpringStartAfter implements ApplicationRunner {
     private void initTableAI(String stationId, String stableName, String modelId) throws ClassNotFoundException {
         log.error("开始执行创建taos库");
         try {
-            final List<Windturbine> windturbines = windturbineService.queryWindturbine(stationId, modelId);
+            //final List<Windturbine> windturbines = windturbineService.queryWindturbine(stationId, modelId);
 
-            log.error("查询风机完毕" + windturbines.size());
+            //log.error("查询风机完毕" + windturbines.size());
             // Class.forName("com.taosdata.jdbc.TSDBDriver");
             // String jdbcUrl = "jdbc:TAOS://" + serverIp + ":" + serverPort + "/" + dbName + "?user=" + userName + "&password=" + password;
 
@@ -200,17 +202,18 @@ public class SpringStartAfter implements ApplicationRunner {
             final Statement statement = connection.createStatement();
             //statement.executeUpdate(createDatabaseSql);
 
-            String createSTableSql = "create stable if not exists " + stationId + "." + stableName + "(ts timestamp,value double)tags(point binary(50));";
+            String createSTableSql = "create stable if not exists " + dbName + "." + stableName + "(ts timestamp,value double) " +
+                    "tags(point binary(50),description nchar(100),station binary(20),turbine binary(20));";
             statement.executeUpdate(createSTableSql);
+            if (allTsPoint == null)
+                allTsPoint = thingsPointDao.getAllTsPoint();
 
-
-            final List<TsPoint> allTsPoint = thingsPointDao.getAllTsPoint().stream().filter(s -> s.getTsDataType() == TsDataType.DOUBLE).collect(Collectors.toList());
-
+            List<TsPoint> doublePointList = allTsPoint.stream().filter(s -> s.getTsDataType() == TsDataType.DOUBLE).collect(Collectors.toList());
             Date st = new Date();
-            for (Windturbine data :
+/*            for (Windturbine data :
                     windturbines) {
 
-                final List<TsPoint> collect = allTsPoint.stream().filter(s -> s.getThingId().equals(data.getCode())).collect(Collectors.toList());
+                 List<TsPoint> collect = doublePointList.stream().filter(s -> s.getThingId().equals(data.getId())).collect(Collectors.toList());
 
                 for (TsPoint point :
                         collect) {
@@ -218,6 +221,12 @@ public class SpringStartAfter implements ApplicationRunner {
 
                     statement.executeUpdate(createTableSql);
                 }
+            }*/
+            for (TsPoint point : doublePointList) {
+                String createTableSql = "create table if not exists " + dbName + "." + point.getId() + " using " + dbName + "." + stableName +
+                        " tags('" + point.getId() +"','','',''" + ");";
+
+                statement.executeUpdate(createTableSql);
             }
             Date et = new Date();
             log.error("数据库创建完毕，耗时" + (et.getTime() - st.getTime()));
@@ -234,9 +243,9 @@ public class SpringStartAfter implements ApplicationRunner {
     private void initTableDI(String stationId, String stableName, String modelId) throws ClassNotFoundException {
         log.error("开始执行创建taos库");
         try {
-            final List<Windturbine> windturbines = windturbineService.queryWindturbine(stationId, modelId);
+            //final List<Windturbine> windturbines = windturbineService.queryWindturbine(stationId, modelId);
 
-            log.error("查询风机完毕" + windturbines.size());
+            //log.error("查询风机完毕" + windturbines.size());
             // Class.forName("com.taosdata.jdbc.TSDBDriver");
             // String jdbcUrl = "jdbc:TAOS://" + serverIp + ":" + serverPort + "/" + dbName + "?user=" + userName + "&password=" + password;
 
@@ -254,17 +263,20 @@ public class SpringStartAfter implements ApplicationRunner {
             final Statement statement = connection.createStatement();
             //statement.executeUpdate(createDatabaseSql);
 
-            String createSTableSql = "create stable if not exists " + stationId + "." + stableName + "(ts timestamp,value bool)tags(point binary(50));";
+            String createSTableSql = "create stable if not exists " + dbName + "." + stableName + "(ts timestamp,value bool)" +
+                    "tags(point binary(50),description nchar(100),station binary(20),turbine binary(20));";
             statement.executeUpdate(createSTableSql);
 
 
-            final List<TsPoint> allTsPoint = thingsPointDao.getAllTsPoint().stream().filter(s -> s.getTsDataType() == TsDataType.BOOLEAN).collect(Collectors.toList());
+            if (allTsPoint == null)
+                allTsPoint = thingsPointDao.getAllTsPoint();
 
+            List<TsPoint> booleanPointList = allTsPoint.stream().filter(s -> s.getTsDataType() == TsDataType.BOOLEAN).collect(Collectors.toList());
             Date st = new Date();
-            for (Windturbine data :
+            /*for (Windturbine data :
                     windturbines) {
 
-                final List<TsPoint> collect = allTsPoint.stream().filter(s -> s.getThingId().equals(data.getCode())).collect(Collectors.toList());
+                 List<TsPoint> collect = booleanPointList.stream().filter(s -> s.getThingId().equals(data.getId())).collect(Collectors.toList());
 
                 for (TsPoint point :
                         collect) {
@@ -273,6 +285,14 @@ public class SpringStartAfter implements ApplicationRunner {
 
                     statement.executeUpdate(createTableSql);
                 }
+            }*/
+            for (TsPoint point :
+                    booleanPointList) {
+                String createTableSql = "create table if not exists " + dbName + "." + point.getId() + " using " + dbName + "." + stableName +
+                        " tags('" + point.getId() +"','','',''" + ");";
+
+
+                statement.executeUpdate(createTableSql);
             }
             Date et = new Date();
             log.error("数据库创建完毕，耗时" + (et.getTime() - st.getTime()));

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

@@ -0,0 +1,149 @@
+server:
+  port: 8012
+  connection-timeout: 3000
+  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:@10.0.118.71:1521:gdsj
+    username: gdprod
+    password: gd123
+    # ----------------------------------------------------------------
+#    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
+#  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: 10.0.118.70
+    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: taoscz #"${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: 192.168.2.10
+  server_port: 6041
+  db_name: hfxny
+  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  #状态

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

@@ -34,6 +34,8 @@ spring:
           test-while-idle: true
           test-on-borrow: false
           test-on-return: false
+  profiles:
+    active: hf
 #  redis:
 #    database: 2
 #    host: 192.168.2.5

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/job/AlarmCountPartsHandler.java

@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
  */
 @Component
 @Slf4j
-@EnableScheduling
 public class AlarmCountPartsHandler {
 
     @Autowired
@@ -57,7 +56,7 @@ public class AlarmCountPartsHandler {
     public boolean doTask() {
 
         try {
-            log.info("调度任务开始执行");
+            log.info("方法开始执行");
             List<AlarmSnap> snapList = alarmSnapService.queryAll(null, null, "windturbine", null, null, null, null, null, null, null);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             String strDate = sdf.format(DateUtil.addDays(new Date(),-1));
@@ -119,7 +118,7 @@ public class AlarmCountPartsHandler {
                                 windturbineAlarmIdCount.setRulesId(entryString.getKey());
                                 windturbineAlarmIdCount.setCount(entryString.getValue());
                                 windturbineAlarmIdCount.setWindturbineId(entry.getKey());
-                                windturbineAlarmIdCount.setPartsName(DataDictionaryCache.getWinturbinePartName(entry1.getKey()));
+                                windturbineAlarmIdCount.setPartsName(DataDictionaryCache.getPartName(entry1.getKey()));
                                 windturbineAlarmIdCount.setWindpowerstationId(windturbineService.selectWindturbineByWindturbineid(entry.getKey()).getWindpowerstationid());
                                 alarmRuleCounts.add(windturbineAlarmIdCount);
                             }
@@ -130,7 +129,7 @@ public class AlarmCountPartsHandler {
                                 windturbineAlarmPartsCount.setAlarmDate(dtStart);
                                 windturbineAlarmPartsCount.setParts(entry1.getKey());
                                 windturbineAlarmPartsCount.setCount(count);
-                                windturbineAlarmPartsCount.setPartsName(DataDictionaryCache.getWinturbinePartName(entry1.getKey()));
+                                windturbineAlarmPartsCount.setPartsName(DataDictionaryCache.getPartName(entry1.getKey()));
                                 windturbineAlarmPartsCount.setWindturbineId(entry.getKey());
                                 windturbineAlarmPartsCount.setWindpowerstationId(windturbineService.selectWindturbineByWindturbineid(entry.getKey()).getWindpowerstationid());
                                 acList.add(windturbineAlarmPartsCount);