11

cache/src/main/java/com/gyee/cache/init/CacheContext.java

@@ -367,7 +367,7 @@ public class CacheContext implements CommandLineRunner {
         redisService.set("SSZZT",JSONObject.toJSONString(sszztMap));
 
 
-        logger.info("--------------------------redis保证功率");
+        logger.info("--------------------------redis保证功率开始");
         List<Modelpower> modelpowers = modelpowerService.list();
         List<Equipmentmodel> equipmentmodels = equipmentmodelService.list();
         Map<String,Map<Double,Double>> llglMap = new HashMap<>();

pom.xml

@@ -12,8 +12,7 @@
     <module>histroy</module>
     <module>web</module>
     <module>common</module>
-      <module>cache</module>
-      <module>configuration</module>
+    <module>cache</module>
   </modules>
   <packaging>pom</packaging>
 

realtime/generation-service/src/main/java/com/gyee/generation/service/StatusService.java

@@ -111,7 +111,7 @@ public class StatusService {
                                 Optional<Windturbinestatusdi> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.AI422)).findFirst();
                                 if (first.isPresent()){
                                     Windturbinestatusdi windturbinestatusdi = first.get();
-                                    if (wt.getModelid().equals("EN141/2.6") || wt.getModelid().equals("EN141/3.2")){
+                                    if (wt.getModelid().equals("EN141/2.65") || wt.getModelid().equals("EN141/3.2")){
                                         //远景
                                         int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getId()).getPointValueInDouble();
                                         switch (pointValueInDouble){

web/adapter-td-hb/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.22</version>
+            <version>2.0.38</version>
         </dependency>
         <dependency>
             <groupId>com.oracle</groupId>
@@ -47,6 +47,10 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
 
 
     </dependencies>

web/adapter-td-hb/src/main/java/com/gyee/adapter/common/config/TaosConfiguration.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.SQLException;
 
 
@@ -40,17 +41,25 @@ public class TaosConfiguration {
     private static DataSource dataSource = null;
 
 
-    public Connection getConnect() {
-        if (null == dataSource) {
-            dataSource = getDataSource();
-        }
+    public Connection getConnect() throws SQLException {
+//        String jdbcUrl = "jdbc:TAOS-RS://td1:6041?user=root&password=taosdata";
 
+        final String jdbcUrl = "jdbc:TAOS-RS://" + serverIp + ":" + serverPort+"/"+database+"?user="+userName+"&password="+password;
         try {
-            return dataSource.getConnection();
+            return DriverManager.getConnection(jdbcUrl);
         } catch (SQLException e) {
             e.printStackTrace();
         }
 
+//        if (null == dataSource) {
+//            dataSource = getDataSource();
+//        }
+//        try {
+//            return dataSource.getConnection();
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+
         return null;
     }
 
@@ -78,6 +87,8 @@ public class TaosConfiguration {
     private DataSource getDataSource() {
         final String url = "jdbc:TAOS://" + serverIp + ":" + serverPort+"/"+database;
 
+
+
         DruidDataSource dataSource = new DruidDataSource();
         // jdbc properties
         dataSource.setDriverClassName("com.taosdata.jdbc.TSDBDriver");

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

@@ -62,13 +62,14 @@ timeseries:
 
 #taos数据库
 taos:
-  server_ip: 10.83.68.154
-  server_port: 6030
+  server_ip: 124.70.56.8
+#  server_ip: 10.83.68.154
+  server_port: 6041
   user_name: root
   password: taosdata
   pool_size: 5
   max_pool_size: 20
-  database: hebei
+  database: wisdom
 
 ##taos数据库
 #mongodb:

web/adapter-td-hb/src/test/java/com/gyee/adapter/AdapterTest.java

@@ -26,6 +26,20 @@ public class AdapterTest {
     @Test
     public void test1() throws SQLException {
         taosLatestDao.test1();
-        System.out.println(1);
+//        System.out.println(1);
+//        String jdbcUrl = "jdbc:TAOS://td1:6030/wisdom?user=root&password=taosdata";
+//        Properties connProps = new Properties();
+//        connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+//        connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+//        connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+//        Connection conn = DriverManager.getConnection(jdbcUrl, connProps);
+//        System.out.println("Connected");
+//        conn.close();
+
+//        String jdbcUrl = "jdbc:TAOS-RS://td1:6041?user=root&password=taosdata";
+//        Connection conn = DriverManager.getConnection(jdbcUrl);
+//        System.out.println("Connected");
+//        conn.close();
+
     }
 }