Merge remote-tracking branch 'origin/master'

.idea/compiler.xml

@@ -7,22 +7,43 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="adapter-td-hb" />
+        <module name="datatraining-server" />
         <module name="analysis-histroy-hb" />
+        <module name="common" />
         <module name="benchmarking-web-hb" />
+        <module name="meteorologicalcollection" />
+        <module name="customization-hb" />
         <module name="failurestatistics-server" />
         <module name="benchmarking" />
+<<<<<<< Updated upstream
         <module name="benchmarking-histroy-hb" />
+        <module name="cache" />
+        <module name="healthmodel-server" />
+        <module name="knowledge-hb" />
+        <module name="meteorologicalcollection-web" />
+        <module name="datatraining-server" />
+        <module name="datacenter-hb" />
+=======
+        <module name="cache" />
+        <module name="adapter-td-hb" />
+        <module name="healthmodel-server" />
+        <module name="meteorologicalcollection-web" />
+>>>>>>> Stashed changes
         <module name="monitor-web" />
         <module name="benchmarking-web" />
         <module name="healthmanagement-histroy" />
+        <module name="analysis-web-hb" />
         <module name="healthmanagement-histroy-hb" />
         <module name="consumer" />
-        <module name="analysis-web-hb" />
+        <module name="benchmarking-histroy-hb" />
         <module name="benchmarking-histroy" />
         <module name="algorithm-web" />
-        <module name="common" />
+        <module name="datacenter-hb" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="eureka-server" target="1.8" />
+      <module name="eureka-serverU1" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,20 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/cache/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/cache/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/eureka-server/eureka-serverU1/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/eureka-server/eureka-serverU1/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/analysis-histroy-hb/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/analysis-histroy-hb/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/benchmarking-histroy-hb/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/benchmarking-histroy-hb/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/benchmarking-histroy/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/benchmarking-histroy/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/histroy/customization-hb/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/histroy/customization-hb/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/healthmanagement-histroy-hb/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/healthmanagement-histroy-hb/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/healthmanagement-histroy/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/healthmanagement-histroy/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/realtime/datatraining-server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/realtime/datatraining-server/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/failurestatistics-server/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/failurestatistics-server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/realtime/healthmodel-server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/realtime/healthmodel-server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/realtime/meteorologicalcollection/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/realtime/meteorologicalcollection/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/adapter-td-hb/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/adapter-td-hb/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/algorithm-web/src/main/java" charset="UTF-8" />
@@ -27,6 +39,13 @@
     <file url="file://$PROJECT_DIR$/web/benchmarking-web/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/consumer/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/consumer/src/main/resources" charset="UTF-8" />
+<<<<<<< Updated upstream
+    <file url="file://$PROJECT_DIR$/web/knowledge-hb/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/web/knowledge-hb/src/main/resources" charset="UTF-8" />
+=======
+>>>>>>> Stashed changes
+    <file url="file://$PROJECT_DIR$/web/meteorologicalcollection-web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/web/meteorologicalcollection-web/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/monitor-web/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/monitor-web/src/main/resources" charset="UTF-8" />
   </component>

.idea/jarRepositories.xml

@@ -8,6 +8,11 @@
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
@@ -22,6 +27,16 @@
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="alimaven" />
+      <option name="name" value="aliyun maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus" />
+      <option name="name" value="nexus" />
+      <option name="url" value="http://nexus.hepengju.cn:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />

.idea/sis.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />

common/src/main/java/com/gyee/common/vo/analysis/DeskObject.java

@@ -14,6 +14,6 @@ import java.util.Date;
 @Data
 public class DeskObject implements Serializable {
     private static final long serialVersionUID = 1417345510455672010L;
-    private Date date;
+    private Long date;
     private String name;
 }

common/src/main/java/com/gyee/common/vo/targetdata/KkxzbfxVo.java

@@ -0,0 +1,29 @@
+package com.gyee.common.vo.targetdata;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName : KkxzbfxVo
+ * @Author : xieshengjie
+ * @Date: 2021/7/6 18:43
+ * @Description : 可靠性指标分析vo
+ */
+@Data
+public class KkxzbfxVo implements Serializable {
+
+    private static final long serialVersionUID = -2941794540137035356L;
+
+    private String wpid;
+    private Double lyxs;
+    private Double ylyxs;
+    private Double nylyx;
+    private Double sbklyl;
+    private Double ysbklyl;
+    private Double nsbklyl;
+    private Double dxkxxs;
+    private Double ydxkxxs;
+    private Double ndxkxxs;
+    private Double yxfss;
+}

common/src/main/java/com/gyee/common/vo/targetdata/NxzbfxVo.java

@@ -0,0 +1,44 @@
+package com.gyee.common.vo.targetdata;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName : NxzbfxVo
+ * @Author : xieshengjie
+ * @Date: 2021/7/6 16:35
+ * @Description : 能效指标分析vo
+ */
+@Data
+public class NxzbfxVo implements Serializable {
+    private static final long serialVersionUID = -6233668839170355138L;
+
+    private String wpid;
+    private String projectid;
+    private Date date;
+    private Double rpjfs;
+    private Double rfdl;
+    private Double yljfdl;
+    private Double nljfdl;
+    private Double rswdl;
+    private Double yljswdl;
+    private Double nljswdl;
+    private Double zhcydl;
+    private Double yljzhcydl;
+    private Double zhcydll;
+    private Double scadarfdl;
+    private Double scadayljfdl;
+    private Double scadanljfdl;
+    private Double scadazhcydl;
+    private Double scadayljzhcydl;
+    private Double scadazhcydll;
+    private Double rxdssdl;
+    private Double yljxdssdl;
+    private Double nljxdssdl;
+    private Double yljxdl;
+    private Double nljxdl;
+    private Integer sort;
+
+}

common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -35,6 +35,7 @@ com\gyee\common\util\SortUtils$1.class
 com\gyee\common\util\RestTemplateUtil.class
 com\gyee\common\vo\benchmark\DataVo.class
 com\gyee\common\service\impl\WindturbineServiceImpl.class
+com\gyee\common\vo\targetdata\KkxzbfxVo.class
 com\gyee\common\CommonMain.class
 com\gyee\common\util\DoubleUtils.class
 com\gyee\common\util\RestTemplateUtil$SingletonRestTemplate.class
@@ -42,6 +43,7 @@ com\gyee\common\model\DNAVal.class
 com\gyee\common\util\algorithm\GDJTLineBuild.class
 com\gyee\common\vo\algorithm\LineParameters.class
 com\gyee\common\vo\specific\SpecificCenterVo.class
+com\gyee\common\vo\targetdata\NxzbfxVo.class
 com\gyee\common\util\CopyUtils.class
 com\gyee\common\service\IWindturbineService.class
 com\gyee\common\vo\threerate\FwjslVo.class

common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -2,6 +2,7 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\Analys
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\CharsetKit.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\SortUtils.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\BigDecimalUtils.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\targetdata\NxzbfxVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\CommonUtils.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\PointData.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\GoodCompareVo.java
@@ -41,6 +42,7 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\algorithm\LineP
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\DNAVal.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificCenterVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\ValueVo.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\targetdata\KkxzbfxVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\Convert.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\config\GeneratorCodeConfig.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\config\R.java

common/target/surefire-reports/com.gyee.common.CommonMainTest.txt

@@ -0,0 +1,103 @@
+-------------------------------------------------------------------------------
+Test set: com.gyee.common.CommonMainTest
+-------------------------------------------------------------------------------
+Tests run: 3, Failures: 0, Errors: 3, Skipped: 0, Time elapsed: 0.183 sec <<< FAILURE!
+initializationError(com.gyee.common.CommonMainTest)  Time elapsed: 0.005 sec  <<< ERROR!
+java.lang.Exception: The class com.gyee.common.CommonMainTest is not public.
+	at org.junit.validator.PublicClassValidator.validateTestClass(PublicClassValidator.java:29)
+	at org.junit.runners.ParentRunner.applyValidators(ParentRunner.java:134)
+	at org.junit.runners.ParentRunner.collectInitializationErrors(ParentRunner.java:128)
+	at org.junit.runners.BlockJUnit4ClassRunner.collectInitializationErrors(BlockJUnit4ClassRunner.java:124)
+	at org.junit.runners.ParentRunner.validate(ParentRunner.java:416)
+	at org.junit.runners.ParentRunner.<init>(ParentRunner.java:84)
+	at org.junit.runners.BlockJUnit4ClassRunner.<init>(BlockJUnit4ClassRunner.java:65)
+	at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.<init>(SpringJUnit4ClassRunner.java:137)
+	at org.springframework.test.context.junit4.SpringRunner.<init>(SpringRunner.java:49)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at org.junit.internal.builders.AnnotatedBuilder.buildRunner(AnnotatedBuilder.java:104)
+	at org.junit.internal.builders.AnnotatedBuilder.runnerForClass(AnnotatedBuilder.java:86)
+	at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:59)
+	at org.junit.internal.builders.AllDefaultPossibilitiesBuilder.runnerForClass(AllDefaultPossibilitiesBuilder.java:26)
+	at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:59)
+	at org.junit.internal.requests.ClassRequest.getRunner(ClassRequest.java:33)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:250)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+	at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+	at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
+	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
+
+initializationError(com.gyee.common.CommonMainTest)  Time elapsed: 0.001 sec  <<< ERROR!
+java.lang.Exception: Test class should have exactly one public constructor
+	at org.junit.runners.BlockJUnit4ClassRunner.validateOnlyOneConstructor(BlockJUnit4ClassRunner.java:158)
+	at org.junit.runners.BlockJUnit4ClassRunner.validateConstructor(BlockJUnit4ClassRunner.java:147)
+	at org.junit.runners.BlockJUnit4ClassRunner.collectInitializationErrors(BlockJUnit4ClassRunner.java:127)
+	at org.junit.runners.ParentRunner.validate(ParentRunner.java:416)
+	at org.junit.runners.ParentRunner.<init>(ParentRunner.java:84)
+	at org.junit.runners.BlockJUnit4ClassRunner.<init>(BlockJUnit4ClassRunner.java:65)
+	at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.<init>(SpringJUnit4ClassRunner.java:137)
+	at org.springframework.test.context.junit4.SpringRunner.<init>(SpringRunner.java:49)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at org.junit.internal.builders.AnnotatedBuilder.buildRunner(AnnotatedBuilder.java:104)
+	at org.junit.internal.builders.AnnotatedBuilder.runnerForClass(AnnotatedBuilder.java:86)
+	at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:59)
+	at org.junit.internal.builders.AllDefaultPossibilitiesBuilder.runnerForClass(AllDefaultPossibilitiesBuilder.java:26)
+	at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:59)
+	at org.junit.internal.requests.ClassRequest.getRunner(ClassRequest.java:33)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:250)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+	at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+	at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
+	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
+
+initializationError(com.gyee.common.CommonMainTest)  Time elapsed: 0 sec  <<< ERROR!
+java.lang.Exception: No runnable methods
+	at org.junit.runners.BlockJUnit4ClassRunner.validateInstanceMethods(BlockJUnit4ClassRunner.java:191)
+	at org.junit.runners.BlockJUnit4ClassRunner.collectInitializationErrors(BlockJUnit4ClassRunner.java:128)
+	at org.junit.runners.ParentRunner.validate(ParentRunner.java:416)
+	at org.junit.runners.ParentRunner.<init>(ParentRunner.java:84)
+	at org.junit.runners.BlockJUnit4ClassRunner.<init>(BlockJUnit4ClassRunner.java:65)
+	at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.<init>(SpringJUnit4ClassRunner.java:137)
+	at org.springframework.test.context.junit4.SpringRunner.<init>(SpringRunner.java:49)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
+	at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
+	at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
+	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
+	at org.junit.internal.builders.AnnotatedBuilder.buildRunner(AnnotatedBuilder.java:104)
+	at org.junit.internal.builders.AnnotatedBuilder.runnerForClass(AnnotatedBuilder.java:86)
+	at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:59)
+	at org.junit.internal.builders.AllDefaultPossibilitiesBuilder.runnerForClass(AllDefaultPossibilitiesBuilder.java:26)
+	at org.junit.runners.model.RunnerBuilder.safeRunnerForClass(RunnerBuilder.java:59)
+	at org.junit.internal.requests.ClassRequest.getRunner(ClassRequest.java:33)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:250)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
+	at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+	at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+	at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
+	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
+

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/java/com/gyee/analysis/service/analysis/AnalysisNewService.java

@@ -631,6 +631,8 @@ public class AnalysisNewService {
                     } else {
                         can.setPjqrfs(0.0);
                     }
+                }else {
+                    can.setPjqrfs(0.0);
                 }
                 if (StringUtils.isNotNull(w)) {
                     //性能不好降风速

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