xieshengjie 2 سال پیش
والد
کامیت
c669853640

+ 3 - 3
realtime/generation-service/src/main/resources/application-jn.yml

@@ -85,11 +85,11 @@ logging:
 db:
   url: http://10.81.3.152:8011/ts
 #参与计算的场站
-runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC,PTZ_FDC,YLZ_FDC,ZK_FDC
+runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC,PTZ_FDC,YLZ_FDC,ZK_FDC,NJL_FDC
 #计算状态用ai或者di
 clauStatus:
-  ai: GJY03_GC,YLZ01_GC   #配置期次
-  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
+  ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
+  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC
 #判断数据终端
 second: 1800
 #判断降出力

+ 8 - 0
web/adapter-td-hb/pom.xml

@@ -51,6 +51,14 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
 
 
     </dependencies>

+ 2 - 1
web/adapter-td-hb/src/main/java/com/gyee/adapter/dao/TaosLatestDao.java

@@ -962,7 +962,8 @@ public class TaosLatestDao implements ILatestDao {
 
         for (String tag : tagNames) {
 //            String point = TaosCovertUtil.coverStationPrefix(tag) + "." + tag.replace(".", "_");
-            String sql = "select last_row(*) from " + tag;
+            String point = tag.replace(".", "_");
+            String sql = "select last_row(*) from " + point;
             TaskCallable task = new TaskCallable(config.getConnect(), sql, 0, tag, TsDataType.DOUBLE);
             Future<Map<String, TsData>> submit = taskConfig.getExecutor().submit(task);
             results.add(submit);

+ 95 - 0
web/adapter-td-hb/src/main/java/com/gyee/adapter/init/RestInsertExample.java

@@ -0,0 +1,95 @@
+package com.gyee.adapter.init;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+@author   谢生杰
+@date   2022/8/6-16:25
+*/
+public class RestInsertExample {
+    private static Connection getConnection() throws SQLException {
+        String jdbcUrl = "jdbc:TAOS-RS://10.81.3.164:6041?user=root&password=taosdata";
+        return DriverManager.getConnection(jdbcUrl);
+    }
+
+    private static Connection getPgConnection() throws SQLException {
+        Connection connection = null;
+        try {
+            String url = "jdbc:postgresql://10.81.3.151:5432/wisdom";
+            String user = "gdprod";
+            String password = "gd123";
+            Class.forName("org.postgresql.Driver");
+            connection = DriverManager.getConnection(url, user, password);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        return connection;
+    }
+
+    private static String getSQL(String stable,String database,String table,String name) {
+//        INSERT INTO d1001 USING jnsx TAGS ("d1001","风速") VALUES (now, 0.0);
+//        INSERT INTO d1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6, 218, 0.33)
+//        d1002 VALUES (1538548696800, 12.3, 221, 0.31);
+        StringBuilder sb = new StringBuilder();
+        String replace = name.replace(".", "_");
+        sb.append("INSERT INTO ").append(database).append(".").append(table).append(" USING ").append(stable);
+        sb.append(" TAGS (\"").append(table).append("\",\"");
+        sb.append(replace).append("\") VALUES (now, 0.0)");
+        return String.valueOf(sb);
+    }
+
+    /**
+     * 创建超级表
+     * @param database   TD数据库名
+     * @param stable    TD超级表
+     * @throws SQLException
+     */
+    public static void createStable(String database,String stable) throws SQLException {
+//     create stable IF NOT EXISTS wisdom.stag_double ( point_time timestamp, value_double double ) tags ( tag_id binary(192),tag_name nchar(500));
+        StringBuilder sb = new StringBuilder();
+        sb.append("create stable IF NOT EXISTS ");
+        sb.append(database).append(".").append(stable);
+        sb.append(" ( point_time timestamp, value_double double ) tags ( tag_id binary(192),tag_name nchar(500))");
+        try (Connection conn = getConnection()) {
+            try (Statement stmt = conn.createStatement()) {
+                stmt.execute(String.valueOf(sb));
+            }
+        }
+    }
+
+    /**
+     * @param pgtable   pg表名
+     * @param realtimeid    筛选pg点
+     * @param stable    TD超级表名
+     * @param database  TD数据库名
+     * @throws SQLException
+     */
+    public static void initPoint(String pgtable,String realtimeid,String stable,String database) throws SQLException {
+        Connection pgConnection = getPgConnection();
+        StringBuilder sb = new StringBuilder();
+        sb.append("select * from ").append(pgtable).append(" where realtimeid='").append(realtimeid).append("'");
+
+        Statement statement = pgConnection.createStatement();
+        ResultSet resultSet = statement.executeQuery(String.valueOf(sb));
+
+        while(resultSet.next()){
+            String code = resultSet.getString("code");
+            String name = resultSet.getString("name");
+            String sql = getSQL(stable, database, code,name);
+            Connection connection = getConnection();
+            Statement statement1 = connection.createStatement();
+            statement1.execute(sql);
+            connection.close();
+            statement1.close();
+        }
+        pgConnection.close();
+        statement.close();
+        resultSet.close();
+    }
+
+    public static void main(String[] args) throws SQLException {
+        createStable("wisdom","stag_double");
+//        initPoint("windpowerstationpointnew","SXJN.JSFWYLZFC","YLZFCJSFW","wisdom");
+    }
+}

+ 3 - 6
web/adapter-td-hb/src/main/resources/application.yml

@@ -27,11 +27,8 @@ spring:
 #    database: 1
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: oracle.jdbc.OracleDriver
-    #外网
-    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    #    url: jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd
-    #    url: jdbc:oracle:thin:@172.168.1.14:1521:gdnxfd
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://10.81.3.151:5432/wisdom
     username: gdprod
     password: gd123
     oracle-schema=:
@@ -62,7 +59,7 @@ timeseries:
 
 #taos数据库
 taos:
-  server_ip: 124.70.56.8
+  server_ip: 10.81.3.164
 #  server_ip: 10.83.68.154
   server_port: 6041
   user_name: root