修改配置

realtime/generation-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -26,7 +26,7 @@ import java.util.*;
 public class EdosUtil implements IEdosUtil {
 
     private RestTemplate restTemplate =new RestTemplate();
-    private static String baseURL = "http://10.83.68.205:8011/ts";
+    private static String baseURL = "http://10.83.66.201:8029/ts";
 //    private static String baseURL = "http://10.65.79.30:8019/ts";
     @Override
     public PointData getRealData(Windpowerstationtestingpoint point) throws Exception {

realtime/generation-service/src/main/resources/application-test.yml

@@ -84,7 +84,8 @@ logging:
     com.example: debug
 
 
-baseURL: http://10.83.68.205:8011/ts
+#baseURL: http://10.83.68.205:8011/ts
+baseURL: http://localhost:8029/ts
 
 
 

realtime/generation-service/src/main/resources/application.yml

@@ -1,4 +1,96 @@
+server:
+  port: 7011
+  servlet:
+    context-path: /
+
+
 spring:
-  profiles:
-#    active: dev
-    active: test
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+    host: 10.83.68.94
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 19
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: oracle.jdbc.OracleDriver
+    #外网
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+    username: gdprod
+    password: gd123
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    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
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+
+#baseURL: http://10.83.68.205:8011/ts
+baseURL: http://localhost:8029/ts
+
+
+
+
+
+
+
+

realtime/generation-service/target/classes/application-test.yml

@@ -84,7 +84,8 @@ logging:
     com.example: debug
 
 
-baseURL: http://10.83.68.205:8011/ts
+#baseURL: http://10.83.68.205:8011/ts
+baseURL: http://localhost:8029/ts
 
 
 

realtime/generation-service/target/classes/application.yml

@@ -1,4 +1,96 @@
+server:
+  port: 7011
+  servlet:
+    context-path: /
+
+
 spring:
-  profiles:
-#    active: dev
-    active: test
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+    host: 10.83.68.94
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 19
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: oracle.jdbc.OracleDriver
+    #外网
+    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+    username: gdprod
+    password: gd123
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    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
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+
+#baseURL: http://10.83.68.205:8011/ts
+baseURL: http://localhost:8029/ts
+
+
+
+
+
+
+
+

realtime/meteorologicalcollection/src/main/java/com/gyee/meteorological/service/collection/CollectionService.java

@@ -41,7 +41,7 @@ public class CollectionService {
             String[] models = model.split(",");
             Arrays.stream(models).forEach(m->{
                 long startTime = System.currentTimeMillis();
-               String restUrl = url+m+"?lat="+c.getLat()+"&lon="+c.getLon()+"&units=metric&appid="+weatherkey;
+               String restUrl = url+m+"?units=metric&lat="+c.getLat()+"&lon="+c.getLon()+"&units=metric&appid="+weatherkey;
                 String s = RestTemplateUtil.get(restUrl, null);
                 redisService.set((c.getForeignkeyid()+"_"+m).toUpperCase(),s);
                 long endTime = System.currentTimeMillis();

web/adapter-td-hb/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Mar 08 17:44:52 CST 2022
+version=1.0-SNAPSHOT
+groupId=com.gyee
+artifactId=adapter-td-hb

web/adapter-td-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,46 @@
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\timeseries\dao\ILatestDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\dao\TaosHistoryDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\StringTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\dao\TaosLatestDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\TsQuery.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\result\JsonResult.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\DoubleTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\TsPoint.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\config\OracleConfiguration.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\TsPointEntity.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\config\ThreadPoolTaskConfig.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\server\taos\TsDataService.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\controller\TsDataController.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\TsDataType.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\exception\AdviceException.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\server\taos\TsPointService.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\ToData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\timeseries\dao\IDataChangeDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\exception\CustomException.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\dao\TaskCallable.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\timeseries\TaosDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\util\TaosCovertUtil.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\IntegerTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\LongTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\util\DataUtil.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\constant\Interpolation.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\result\ResultCode.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\config\HiveConfiguration.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\config\MongodbConfiguration.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\config\TaosConfiguration.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\server\taos\ThingsPointService.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\timeseries\dao\IThingsPointDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\constant\Constant.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\util\TDengineUtil.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\BaseTsQuery.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\BasicTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\BasicTsPoint.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\timeseries\dao\IHistoryDao.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\TsPointData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\DoubleStatData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\AdapterMain8029.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\GeneralTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\TsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\BooleanTsData.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\common\exception\WisdomException.java
+D:\work\ideawork\sis\sis\web\adapter-td-hb\src\main\java\com\gyee\adapter\model\adapter\TsPointDataList.java