123

histroy/analysis-histroy-hb/src/main/java/com/gyee/analysis/model/auto/Analysissubprojectwindcannot.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,10 +27,10 @@ public class Analysissubprojectwindcannot extends Model {
     private static final long serialVersionUID = 1L;
 
     @TableId("ID")
-    private BigDecimal id;
+    private Long id;
 
     @TableField("TID")
-    private BigDecimal tid;
+    private Long tid;
 
     @TableField("PROJECTID")
     private String projectid;
@@ -37,169 +39,169 @@ public class Analysissubprojectwindcannot extends Model {
     private String wpid;
 
     @TableField("RECORDDATE")
-    private LocalDateTime recorddate;
+    private Date recorddate;
 
     @TableField("FDLSCADA")
-    private BigDecimal fdlscada;
+    private Double fdlscada;
 
     @TableField("FDL")
-    private BigDecimal fdl;
+    private Double fdl;
 
     @TableField("SWDL")
-    private BigDecimal swdl;
+    private Double swdl;
 
     @TableField("GWDL")
-    private BigDecimal gwdl;
+    private Double gwdl;
 
     @TableField("ZHCYDL")
-    private BigDecimal zhcydl;
+    private Double zhcydl;
 
     @TableField("ZHCYDLSCADA")
-    private BigDecimal zhcydlscada;
+    private Double zhcydlscada;
 
     @TableField("ZHCYDLL")
-    private BigDecimal zhcydll;
+    private Double zhcydll;
 
     @TableField("ZHCYDLLSCADA")
-    private BigDecimal zhcydllscada;
+    private Double zhcydllscada;
 
     @TableField("CYDL")
-    private BigDecimal cydl;
+    private Double cydl;
 
     @TableField("CYDLL")
-    private BigDecimal cydll;
+    private Double cydll;
 
     @TableField("LYXS")
-    private BigDecimal lyxs;
+    private Double lyxs;
 
     @TableField("LYXSSCADA")
-    private BigDecimal lyxsscada;
+    private Double lyxsscada;
 
     @TableField("ZJRL")
-    private BigDecimal zjrl;
+    private Double zjrl;
 
     @TableField("CNSLDWDL")
-    private BigDecimal cnsldwdl;
+    private Double cnsldwdl;
 
     @TableField("CNSLJXDL")
-    private BigDecimal cnsljxdl;
+    private Double cnsljxdl;
 
     @TableField("CWSLDWDL")
-    private BigDecimal cwsldwdl;
+    private Double cwsldwdl;
 
     @TableField("CWSLJXDL")
-    private BigDecimal cwsljxdl;
+    private Double cwsljxdl;
 
     @TableField("ZRZHDL")
-    private BigDecimal zrzhdl;
+    private Double zrzhdl;
 
     @TableField("XDDL")
-    private BigDecimal xddl;
+    private Double xddl;
 
     @TableField("FJGZDL")
-    private BigDecimal fjgzdl;
+    private Double fjgzdl;
 
     @TableField("SYZGZDL")
-    private BigDecimal syzgzdl;
+    private Double syzgzdl;
 
     @TableField("JDXLGZDL")
-    private BigDecimal jdxlgzdl;
+    private Double jdxlgzdl;
 
     @TableField("FJJXDL")
-    private BigDecimal fjjxdl;
+    private Double fjjxdl;
 
     @TableField("SYZJXDL")
-    private BigDecimal syzjxdl;
+    private Double syzjxdl;
 
     @TableField("JDXLJX")
-    private BigDecimal jdxljx;
+    private Double jdxljx;
 
     @TableField("CNSLDWSJ")
-    private BigDecimal cnsldwsj;
+    private Double cnsldwsj;
 
     @TableField("CNSLJXSJ")
-    private BigDecimal cnsljxsj;
+    private Double cnsljxsj;
 
     @TableField("CWSLDWSJ")
-    private BigDecimal cwsldwsj;
+    private Double cwsldwsj;
 
     @TableField("CWSLJXSJ")
-    private BigDecimal cwsljxsj;
+    private Double cwsljxsj;
 
     @TableField("ZRZHSJ")
-    private BigDecimal zrzhsj;
+    private Double zrzhsj;
 
     @TableField("XDSJ")
-    private BigDecimal xdsj;
+    private Double xdsj;
 
     @TableField("FJGZSJ")
-    private BigDecimal fjgzsj;
+    private Double fjgzsj;
 
     @TableField("SYZGZSJ")
-    private BigDecimal syzgzsj;
+    private Double syzgzsj;
 
     @TableField("JDXLGZSJ")
-    private BigDecimal jdxlgzsj;
+    private Double jdxlgzsj;
 
     @TableField("FJJXSJ")
-    private BigDecimal fjjxsj;
+    private Double fjjxsj;
 
     @TableField("SYZJXSJ")
-    private BigDecimal syzjxsj;
+    private Double syzjxsj;
 
     @TableField("JDXLJXSJ")
-    private BigDecimal jdxljxsj;
+    private Double jdxljxsj;
 
     @TableField("GZCS")
-    private BigDecimal gzcs;
+    private Double gzcs;
 
     @TableField("QFL")
-    private BigDecimal qfl;
+    private Double qfl;
 
     @TableField("QPJFX")
-    private BigDecimal qpjfx;
+    private Double qpjfx;
 
     @TableField("TQ")
     private String tq;
 
     @TableField("LLFDL")
-    private BigDecimal llfdl;
+    private Double llfdl;
 
     @TableField("LLFDLSCADA")
-    private BigDecimal llfdlscada;
+    private Double llfdlscada;
 
     @TableField("DNAQTS")
-    private BigDecimal dnaqts;
+    private Double dnaqts;
 
     @TableField("LJAQTS")
-    private BigDecimal ljaqts;
+    private Double ljaqts;
 
     @TableField("QW")
-    private BigDecimal qw;
+    private Double qw;
 
     @TableField("ZDCL")
-    private BigDecimal zdcl;
+    private Double zdcl;
 
     @TableField("ZXCL")
-    private BigDecimal zxcl;
+    private Double zxcl;
 
     @TableField("FX")
     private String fx;
 
     @TableField("YJHFDL")
-    private BigDecimal yjhfdl;
+    private Double yjhfdl;
 
     @TableField("PJQRFS")
-    private BigDecimal pjqrfs;
+    private Double pjqrfs;
 
     @TableField("EDPJFS")
-    private BigDecimal edpjfs;
+    private Double edpjfs;
 
     @TableField("YPJKQMD")
-    private BigDecimal ypjkqmd;
+    private Double ypjkqmd;
 
     @TableField("XNSSDL")
-    private BigDecimal xnssdl;
+    private Double xnssdl;
 
 
 }

histroy/analysis-histroy-hb/src/main/resources/application-dev.yml

@@ -0,0 +1,66 @@
+server:
+  port: 8092
+  servlet:
+    context-path: /
+
+
+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
+    url: jdbc:oracle:thin:@192.168.2.215: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
+

histroy/analysis-histroy-hb/src/main/resources/application-test.yml

@@ -0,0 +1,66 @@
+server:
+  port: 8092
+  servlet:
+    context-path: /
+
+
+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
+#    url: jdbc:oracle:thin:@192.168.2.215: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
+

histroy/analysis-histroy-hb/src/main/resources/application.yml

@@ -1,66 +1,4 @@
-server:
-  port: 8092
-  servlet:
-    context-path: /
-
-
 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
-    url: jdbc:oracle:thin:@192.168.2.215: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
-
+  profiles:
+    active: dev
+#    active: test

histroy/analysis-histroy-hb/src/test/java/com/gyee/analysis/AnalysisTest.java

@@ -29,16 +29,16 @@ public class AnalysisTest {
     public void test1(){
         String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
         try {
-//            //保存主表
-//            analysisNewService.savaAnalysismain(yesterday, yesterday);
-//            //风电表底
-//            analysisNewService.saveAnalysisTableBottom(yesterday, yesterday);
-//            //风电工程
-//            analysisNewService.saveWindProject(yesterday, yesterday);
-//            //风电场站
-//            analysisNewService.saveWindStation(yesterday, yesterday);
+            //保存主表
+            analysisNewService.savaAnalysismain(yesterday, yesterday);
+            //风电表底
+            analysisNewService.saveAnalysisTableBottom(yesterday, yesterday);
+            //风电工程
+            analysisNewService.saveWindProject(yesterday, yesterday);
+            //风电场站
+            analysisNewService.saveWindStation(yesterday, yesterday);
             //公司
-            analysisNewService.saveCompany(yesterday, yesterday);
+//            analysisNewService.saveCompany(yesterday, yesterday);
         } catch (Exception e) {
             e.printStackTrace();
         }

histroy/analysis-histroy-hb/target/classes/application-dev.yml

@@ -0,0 +1,66 @@
+server:
+  port: 8092
+  servlet:
+    context-path: /
+
+
+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
+    url: jdbc:oracle:thin:@192.168.2.215: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
+

histroy/analysis-histroy-hb/target/classes/application-test.yml

@@ -0,0 +1,66 @@
+server:
+  port: 8092
+  servlet:
+    context-path: /
+
+
+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
+#    url: jdbc:oracle:thin:@192.168.2.215: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
+

histroy/analysis-histroy-hb/target/classes/application.yml

@@ -0,0 +1,4 @@
+spring:
+  profiles:
+    active: dev
+#    active: test