Browse Source

健康管理功能模块优化与BUG修复

shilin 2 years ago
parent
commit
829642b5f5

File diff suppressed because it is too large
+ 33 - 33
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/mapper/auto/FailurestatisticsmainMapper.java


+ 2 - 2
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/service/PartstatisticsService.java

@@ -38,8 +38,8 @@ public class PartstatisticsService {
     private final String MONTH1NUM ="month1num";
     private final String SYNTHESISNUM ="synthesisnum";
 
-	private final long STEP = 60;
-	private final int DAYSTEP = 1440;
+	private final long STEP = 60*30;
+	private final int DAYSTEP = 1440/30;
 
 //    private final long STEP = 900;
 //    private final int DAYSTEP = 96;

+ 78 - 0
realtime/failurestatistics-server-cph/src/main/resources/application-hbn.yml

@@ -0,0 +1,78 @@
+# 项目相关配置
+gyee:
+  #实时数据库Url
+  baseurl: http://10.83.68.96:8011/ts
+  healthurl: http://10.83.68.96:8012/ts
+  #实时数据库选择
+  realtimedataBase: mongodb #数据查询模式 golden、hwy
+  initialcode: INITIAL
+server:
+  port: 8161
+  servlet:
+    context-path: /
+
+management:
+  health:
+    redis:
+      enabled: false
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
+  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
+
+edos:
+  baseURL: http://10.0.118.73:8011/ts