GYEE 1 week atrás
parent
commit
b302a0ffbc

+ 116 - 0
electricity/wind/src/main/resources/bootstrap2.yaml

@@ -0,0 +1,116 @@
+server:
+  port: 8133
+
+spring:
+  application:
+    name: powergen-wind
+  profiles:
+    # 环境配置
+    active: nx
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.1.66:8848
+      config:
+        # 配置中心地址
+        server-addr: 192.168.1.66:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  cache:
+    type: SIMPLE
+  datasource:
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          url: jdbc:postgresql://192.168.1.67:5432/gyee
+          username: gyee
+          password: Gyee@2023!@#
+          driver-class-name: org.postgresql.Driver
+          type: com.alibaba.druid.pool.DruidDataSource
+        jsfw:
+          url: jdbc:TAOS-RS://192.168.1.67:6041/jsfw?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+          username: root
+          password: taosdata
+          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+    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
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    default-property-inclusion: always
+
+meter:
+  stations: MHS_FDC,NSS_FDC
+  adapter-url: http://192.168.10.18:8011
+  sharding-url: http://192.168.10.18:8075
+  uniformcode:
+    #8种状态
+    state8: FJZT8
+    #桨叶角度
+    blade-angle: AI082
+    #功率-有功功率
+    active-power: AI130
+    #风速
+    speed: AI022
+
+
+mybatis-plus:
+  typeAliasesPackage: com.gyee.gaia.meter.entity
+  mapper-locations: classpath:mappers-postgresql/*.xml
+  global-config:
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+    id-type: 3
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+    field-strategy: 2
+    #驼峰下划线转换
+    db-column-underline: true
+    #mp2.3+ 全局表前缀 mp_
+    #table-prefix: mp_
+    #刷新mapper 调试神器
+    #refresh-mapper: true
+    #数据库大写下划线转换
+    #capital-mode: true
+    # Sequence序列接口实现类配置
+    key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
+    #逻辑删除配置(下面3个配置)
+    logic-delete-value: 1
+    logic-not-delete-value: 0
+    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+    #自定义填充策略接口实现
+    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
+  configuration:
+    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名),自动匹配无需as(没开启这个,SQL需要写as: select user_id as userId)
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    #配置JdbcTypeForNull, oracle数据库必须配置
+    jdbc-type-for-null: 'null'
+    callSettersOnNulls: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.1.67:8080/xxl-job-admin
+      #addresses: http://192.168.10.18:8080/xxl-job-admin
+    accessToken:
+    executor:
+      appname: ${spring.application.name}
+      address:
+      ip:
+      port: 9133
+      logpath: d:/xxl-job/meter/logs
+      logretentiondays: 30

+ 116 - 0
realtime/wind/src/main/resources/bootstrap2.yaml

@@ -0,0 +1,116 @@
+server:
+  port: 8132
+
+spring:
+  application:
+    name: realtime-wind
+  profiles:
+    # 环境配置
+    active: nx
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.1.66:8848
+      config:
+        # 配置中心地址
+        server-addr: 192.168.1.66:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  cache:
+    type: SIMPLE
+  datasource:
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          url: jdbc:postgresql://192.168.1.67:5432/gyee
+          username: gyee
+          password: Gyee@2023!@#
+          driver-class-name: org.postgresql.Driver
+          type: com.alibaba.druid.pool.DruidDataSource
+        jsfw:
+          url: jdbc:TAOS-RS://192.168.1.67:6041/jsfw?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+          username: root
+          password: taosdata
+          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+    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: false
+      test-on-borrow: false
+      test-on-return: false
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    default-property-inclusion: always
+
+meter:
+  stations: MHS_FDC,NSS_FDC
+  adapter-url: http://192.168.10.18:8011
+  sharding-url: http://192.168.10.18:8075
+  uniformcode-one:
+    wind-speed: AI022  #风速
+    active-power: AI130  #功率-有功功率
+    generator_speed: AI128  #发电机转速
+    impeller_speed: AI012  #叶轮转速
+    wind_direction: AI010  #风向
+
+
+mybatis-plus:
+  typeAliasesPackage: com.gyee.gaia.meter.entity
+  mapper-locations: classpath:mappers-postgresql/*.xml
+  global-config:
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+    id-type: 3
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+    field-strategy: 2
+    #驼峰下划线转换
+    db-column-underline: true
+    #mp2.3+ 全局表前缀 mp_
+    #table-prefix: mp_
+    #刷新mapper 调试神器
+    #refresh-mapper: true
+    #数据库大写下划线转换
+    #capital-mode: true
+    # Sequence序列接口实现类配置
+    key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
+    #逻辑删除配置(下面3个配置)
+    logic-delete-value: 1
+    logic-not-delete-value: 0
+    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+    #自定义填充策略接口实现
+    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
+  configuration:
+    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名),自动匹配无需as(没开启这个,SQL需要写as: select user_id as userId)
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    #配置JdbcTypeForNull, oracle数据库必须配置
+    jdbc-type-for-null: 'null'
+    callSettersOnNulls: true
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.1.67:8080/xxl-job-admin
+    accessToken:
+    executor:
+      appname: ${spring.application.name}
+      address:
+      ip:
+      port: 9132
+      logpath: d:/xxl-job/meter/logs
+      logretentiondays: 30
+
+#logging:
+#  level:
+#    org.springframework: debug

+ 5 - 5
state/cause/src/main/resources/bootstrap.yaml

@@ -28,13 +28,13 @@ spring:
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master:
-          url: jdbc:postgresql://192.168.1.67:5432/gyee
+          url: jdbc:postgresql://192.168.1.68:5432/gyee
           username: gyee
           password: Gyee@2023!@#
           driver-class-name: org.postgresql.Driver
           type: com.alibaba.druid.pool.DruidDataSource
         jsfw:
-          url: jdbc:TAOS-RS://192.168.1.67:6041/jsfw?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+          url: jdbc:TAOS-RS://192.168.1.61:6041/jsfw?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
           username: root
           password: taosdata
           driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
@@ -55,7 +55,7 @@ spring:
 
 meter:
   stations: MHS_FDC,NSS_FDC
-  adapter-url: http://192.168.10.18:8011
+  adapter-url: http://192.168.1.68:8011
   sharding-url: http://192.168.10.18:8075
   time:
     #小于多长时间的故障不计算在内,单位秒
@@ -113,12 +113,12 @@ mybatis-plus:
     #配置JdbcTypeForNull, oracle数据库必须配置
     jdbc-type-for-null: 'null'
     callSettersOnNulls: true
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 xxl:
   job:
     admin:
-      addresses: http://192.168.1.67:8080/xxl-job-admin
+      addresses: http://192.168.1.68:8080/xxl-job-admin
     accessToken:
     executor:
       appname: ${spring.application.name}

+ 1 - 1
timeseries/dao-taoscz/src/main/java/com/gyee/gaia/dao/taoscz/TaosLatestDao.java

@@ -146,7 +146,7 @@ public class TaosLatestDao implements ILatestDao {
 
         return i;
     }
-    @Override
+
     public int writeBooleanLatest2(List<PointData> list) throws Exception {
         Statement st = config.getInstance().createStatement();
         StringBuilder sb = new StringBuilder();

+ 3 - 0
timeseries/data-adapter/build.gradle

@@ -32,6 +32,7 @@ dependencies {
 //    implementation fileTree(dir: 'src/main/lib', include: '*.jar') //// oracle连接驱动       2区使用
     // implementation ("mysql:mysql-connector-java:$mysqlConnectorVersion")
     implementation("com.alibaba:druid:$alibabaDruidVersion")
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
     testImplementation("$bootGroup:spring-boot-starter-test")
     implementation("$bootGroup:spring-boot-starter-web")
     //compile("$bootGroup:spring-boot-starter-session")
@@ -50,6 +51,8 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-starter-bootstrap")
 //    implementation("com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery")
 //    implementation("com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config")
+    implementation 'com.taobao.arthas:arthas-spring-boot-starter:3.7.1'
+//    implementation 'org.jboss.xnio:xnio-nio:3.3.8.Final'
 
 }
 

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

@@ -8,7 +8,7 @@ spring:
   application:
     name: data-adapter
   profiles:
-    active: nx
+    active: slbd
   cloud:
     nacos:
       discovery:

+ 13 - 0
timeseries/data-adapter/src/main/resources/application-db.yaml

@@ -152,6 +152,19 @@ redis:
   port: 6379
   password: gdnxfd123
 
+#management:
+#  endpoints:
+#    web:
+#      exposure:
+#        include: "*"
 
+arthas:
+  #tunnel地址,目前是部署在同一台服务器,正式环境需要拆分
+  tunnel-server: ws://localhost:7777/ws
+  #tunnel显示的应用名称,直接使用应用名
+  app-name: ${spring.application.name}
+  #arthas http访问的端口和远程连接的端口
+  http-port: 8888
+  telnet-port: 9999
 
 

+ 2 - 2
timeseries/data-adapter/src/main/resources/application-hf.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8012
+  port: 8011
   max-http-header-size: 128KB
 
 
@@ -13,7 +13,7 @@ spring:
   datasource:
     # -------------------------1区mysql/2区oracle---------------------------------------
     driver-class-name: oracle.jdbc.OracleDriver
-    url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+    url: jdbc:oracle:thin:@10.0.118.77:1521:gdsj
     username: gdprod
     password: gd123
     # ----------------------------------------------------------------

+ 141 - 0
timeseries/data-adapter/src/main/resources/application-hwy.yaml

@@ -0,0 +1,141 @@
+server:
+  port: 8012
+  max-http-header-size: 128KB
+
+
+spring:
+  application:
+    name: data-adapter
+  jpa:
+    show-sql: false
+  cache:
+    type: SIMPLE
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://123.60.219.66:5432/power_lcm
+    username: postgres
+    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.76
+    password:
+    port: 6379
+    databases: [ 0 ] # 要使用的库,会根据此处填写的库生成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: 123.60.219.66
+  server_port: 6041
+  db_name: jsfw_db
+  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: pointci
+
+#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  #状态

+ 158 - 0
timeseries/data-adapter/src/main/resources/application-slbd.yaml

@@ -0,0 +1,158 @@
+server:
+  port: 8011
+  max-http-header-size: 128KB
+
+
+spring:
+  application:
+    name: data-adapter
+  jpa:
+    show-sql: true
+  cache:
+    type: SIMPLE
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://124.70.75.91:5432/IMS_NEM_JJYX #IMS_NEM_SD
+    username: postgres
+    password: gd123
+    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: golden #"${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: 192.168.1.100
+  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.67
+  #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: 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  #状态
+
+redis:
+  host: 10.155.32.4
+  port: 6379
+  password: gdnxfd123
+
+
+
+

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

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: nx
+    active: db