修改数据中心点表

cache/src/main/java/com/gyee/cache/init/CacheContext.java

@@ -185,6 +185,7 @@ public class CacheContext implements CommandLineRunner {
 
         logger.info("----------------------设备点开始");
         //缓存设备点
+        redisService.remove("PRODUCT-WT");
         if (!redisService.hasKey("PRODUCT-WT")){
             Map<String,Map<String,Windturbinetestingpointnew>> wtaimap = new HashMap<>();
             List<Windturbine> windturbineList = windturbineService.list();
@@ -204,6 +205,7 @@ public class CacheContext implements CommandLineRunner {
         logger.info("----------------------设备点结束");
         logger.info("----------------------线路点开始");
         //缓存线路点
+        redisService.remove("PRODUCT-LN");
         if (!redisService.hasKey("PRODUCT-LN")){
             Map<String,Map<String, Windpowerstationpointnew>> lnaimap = new HashMap<>();
             List<Line> lineList = lineService.list();
@@ -223,6 +225,7 @@ public class CacheContext implements CommandLineRunner {
         logger.info("----------------------线路点结束");
         logger.info("----------------------工程点开始");
         //缓存工程点
+        redisService.remove("PRODUCT-PJ");
         if (!redisService.hasKey("PRODUCT-PJ")){
             Map<String,Map<String, Windpowerstationpointnew>> pjaimap = new HashMap<>();
             List<Project> projectList = projectService.list();
@@ -242,6 +245,7 @@ public class CacheContext implements CommandLineRunner {
         logger.info("----------------------工程点结束");
         logger.info("----------------------场站点开始");
         //缓存场站点
+        redisService.remove("PRODUCT-WP");
         if (!redisService.hasKey("PRODUCT-WP")){
             Map<String,Map<String, Windpowerstationpointnew>> wpaimap = new HashMap<>();
             List<Windpowerstation> wpList = windpowerstationService.list();

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -14,4 +14,6 @@ public class Contant {
     public static String opePoints = "CI0668,CI0669,CI0670";
 
     public static String benchPoints = "RSDJZSDL,RSSTZSDL,RXNZSDL,RSQXZSDL,RGZZSDL,RSZZSDL,RJXZSDL,RLZZSDL,RQFZSDL,RXDZSDL,RWZZSDL,RTZZSDL";
+
+    public static String WP_RFDLB = "RFDLB";
 }

histroy/benchmarking-histroy-new/src/main/resources/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 192.168.2.202
-    host: 10.83.68.94
+    host: 192.168.2.202
+#    host: 10.83.68.94
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     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
+#    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=:
@@ -87,5 +87,5 @@ logging:
 
 
 golden:
-  baseURL: http://10.83.68.205:8011/ts
+  baseURL: http://192.168.2.205:8011/ts
 

histroy/benchmarking-histroy-new/target/classes/application.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-#    host: 192.168.2.202
-    host: 10.83.68.94
+    host: 192.168.2.202
+#    host: 10.83.68.94
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -35,8 +35,8 @@ spring:
     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
+#    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=:
@@ -87,5 +87,5 @@ logging:
 
 
 golden:
-  baseURL: http://10.83.68.205:8011/ts
+  baseURL: http://192.168.2.205:8011/ts
 

histroy/benchmarking-histroy-new/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Mar 03 15:31:51 CST 2022
+version=1.0-SNAPSHOT
+groupId=com.gyee.histroy
+artifactId=benchmarking-histroy-new

histroy/benchmarking-histroy-new/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,164 @@
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\TsDataType.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\CoordinateWriteTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\FaulthistoryController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\BenchmarkingbetweenServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindpowerspecificinfodayServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerstation.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\FaulthistoryMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IProjectService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerstationthewindinfoService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\GeneralTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Faultsnap.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Line.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\LineMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\FaulteliminatedefectsServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\WindturbinetestingpointController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindturbinetestingpointaiMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\LongTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindpowerstationthewindinfoMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindturbineServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindturbinetestingpointMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindpowerstationpointnewMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindturbineMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindpowerstationtestingpointServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindpowerspecificinfodayMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerstationpointnew.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Operationrecord.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\GoldenConfig.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerinfoday3.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\ILineService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Equipmentdayinfo.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Dutyschedule.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerstationtestingpoint2Service.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windturbinetestingpoint.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\DutyscheduleServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IBenchmarkService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\TsQuery.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindturbinetestingpointaiService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindpowerstationMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windturbinetestingpointai.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IEquipmentdayinfoService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Wpmttrandmtbfday.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\config\GeneratorCodeConfig.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerinfoday.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\Coordinate.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\FaulteliminatedefectsController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windturbine.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\TsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerstationService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WpmttrandmtbfdayMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\OperationrecordServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WpmttrandmtbfdayServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IOperationrecordService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BlobWriteTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\Windpowerinfoday3ServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\DoubleStatData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\EquipmentdayinfoController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\task\SaticScheduleTask.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\Windpowerstationtestingpoint2Mapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IDutyscheduleService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\ShutdowneventServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\EquipmentdaydetailedServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BooleanTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IBenchmarkingbetweenService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWpmttrandmtbfdayService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindpowerstationServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindturbineService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindturbinetestingpointai2Service.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\EquipmentdayinfoMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\LineServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Faulteliminatedefects.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\CoordinateTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindpowerstationtestingpointMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerstationtestingpointService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windturbinetestingpointnew.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\FaulthistoryServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\ProjectMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\ErrorRequest.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerstationpointnewService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerstationtestingpoint2.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Benchmarkingbetween.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\HttpClientUtil.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\WindpowerstationtestingpointController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindpowerinfodayMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Project.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindpowerstationthewindinfoServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\Windpowerinfoday3Mapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BlobTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\BenchmarkMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\FaulteliminatedefectsMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\LongWriteTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\TsPointData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BasicTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Faulthistory.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\ApiGolden.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\ShutdowneventController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\StringUtil.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\OperationrecordMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\TsPoint.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindpowerstationpointnewServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windturbinetestingpointai2.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\IEdosUtil.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\WindpowerstationpointnewController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindpowerinfodayServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\StringWriteTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\ShutdowneventMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\redis\RedisServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\FaultsnapController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IFaultsnapService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\Windpowerstationtestingpoint2ServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\MongoEdosUtil.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BasicTsPoint.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\DoubleTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\EdosUtil.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\StringTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\redis\RedisAutoConfiguration.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\StatetransitionratesMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BooleanWriteTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\BenchmarkingHistroyMain.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\benchmarking\BenchmarkingHistroyService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\init\CacheContext.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\Windturbinetestingpointai2ServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerspecificinfodayService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerinfoday3Service.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\WindturbinetestingpointnewController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\ProjectServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\BaseTsQuery.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\redis\RedisService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\specific\SpecificService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\JsonObjectHelper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\BenchmarkServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\StatetransitionratesController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\StringUtil.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Equipmentdaydetailed.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\WindturbinetestingpointnewMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Benchmark.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\EquipmentdayinfoServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\DoubleWriteTsData.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerstationthewindinfo.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindturbinetestingpointServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Shutdownevent.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\controller\auto\WindturbinetestingpointaiController.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\DutyscheduleMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\Interpolation.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\FaultsnapMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\Windturbinetestingpointai2Mapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\FaultsnapServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerspecificinfoday.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\realtimesource\timeseries\TsPointDataList.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IShutdowneventService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IFaulteliminatedefectsService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\EquipmentdaydetailedMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindturbinetestingpointaiServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\util\redis\RedisConfig.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Windpowerstationtestingpoint.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IFaulthistoryService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\StatetransitionratesServiceImpl.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IStatetransitionratesService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindturbinetestingpointnewService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\model\auto\Statetransitionrates.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\mapper\auto\BenchmarkingbetweenMapper.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindturbinetestingpointService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IWindpowerinfodayService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\IEquipmentdaydetailedService.java
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\main\java\com\gyee\benchmarkinghistroy\service\auto\impl\WindturbinetestingpointnewServiceImpl.java

histroy/benchmarking-histroy-new/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1 @@
+D:\work\ideawork\sis\sis\histroy\benchmarking-histroy-new\src\test\java\com\gyee\benchmarkinghistroy\BenchmarkingHistroyMainNewTest.java

realtime/generation-service/src/main/java/com/gyee/generation/controller/WindpowerstationpointnewController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+@RestController
+@RequestMapping("//windpowerstationpointnew")
+public class WindpowerstationpointnewController {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/controller/WindturbinetestingpointnewController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+@RestController
+@RequestMapping("//windturbinetestingpointnew")
+public class WindturbinetestingpointnewController {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -1,8 +1,11 @@
 package com.gyee.generation.init;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
+import com.gyee.generation.util.redis.RedisService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
@@ -34,6 +37,8 @@ public class CacheContext implements CommandLineRunner {
     private IWindpowerstationService windpowerstationService;
     @Resource
     private IMeterpointService meterpointService;
+    @Resource
+    private RedisService redisService;
 
     public static List<Windturbine> wtls = new ArrayList<>();
     public static List<Project> projects = new ArrayList<>();
@@ -42,6 +47,9 @@ public class CacheContext implements CommandLineRunner {
     public static List<Meterpoint>  meterpoints = new ArrayList<>();
     public static Map<String,List<Project>> wppromap = new HashMap<>();
     public static Map<String,List<Line>> prolinemap = new HashMap<>();
+    public static Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap = new HashMap<>();// 风电机测点AI表
+
+    public static Map<String,Map<String, Windpowerstationpointnew>> wppointmap =new HashMap<>();
     @Override
     public void run(String... args) throws Exception {
         logger.info("缓存开始------------------------------------------------------------");
@@ -69,6 +77,20 @@ public class CacheContext implements CommandLineRunner {
         });
         wpls = windpowerstationService.list();
         meterpoints = meterpointService.list();
+
+        String wpString = redisService.get("PRODUCT-WP");
+        wppointmap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
+        });
+//        String pjString = JSON.toJSONString(redisService.get("PJ"));
+//        pjPointmap = JSONObject.parseObject(pjString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint2>>>() {
+//        });
+//        String lnString = JSON.toJSONString(redisService.get("LN"));
+//        lnPointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, WindPowerStationTestingPoint2>>>() {
+//        });
+
+        String wtString = redisService.get("PRODUCT-WT");
+        wtpAimap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
+        });
         logger.info("缓存结束------------------------------------------------------------");
     }
 }

realtime/generation-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationpointnewMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.Windpowerstationpointnew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+public interface WindpowerstationpointnewMapper extends BaseMapper<Windpowerstationpointnew> {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/mapper/auto/WindturbinetestingpointnewMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.Windturbinetestingpointnew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+public interface WindturbinetestingpointnewMapper extends BaseMapper<Windturbinetestingpointnew> {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationpointnew.java

@@ -0,0 +1,77 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERSTATIONPOINTNEW")
+public class Windpowerstationpointnew extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("MODEL")
+    private String model;
+
+    @TableField("VALUEUNIT")
+    private String valueunit;
+
+    @TableField("ENGLISHNAME")
+    private String englishname;
+
+    @TableField("TYPEID")
+    private String typeid;
+
+    @TableField("MODELID")
+    private String modelid;
+
+    @TableField("MAXVAL")
+    private Double maxval;
+
+    @TableField("MINVAL")
+    private Double minval;
+
+    @TableField("REASONABLEMAXVAL")
+    private Double reasonablemaxval;
+
+    @TableField("REASONABLEMINVAL")
+    private Double reasonableminval;
+
+    @TableField("UNIFORMCODE")
+    private String uniformcode;
+
+    @TableField("SHORTID")
+    private String shortid;
+
+    @TableField("LONGID")
+    private String longid;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("REALTIMEID")
+    private String realtimeid;
+
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/model/auto/Windturbinetestingpointnew.java

@@ -0,0 +1,80 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDTURBINETESTINGPOINTNEW")
+public class Windturbinetestingpointnew extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("MODEL")
+    private String model;
+
+    @TableField("VALUEUNIT")
+    private String valueunit;
+
+    @TableField("ENGLISHNAME")
+    private String englishname;
+
+    @TableField("TYPEID")
+    private String typeid;
+
+    @TableField("MODELID")
+    private String modelid;
+
+    @TableField("MAXVAL")
+    private Double maxval;
+
+    @TableField("MINVAL")
+    private Double minval;
+
+    @TableField("REASONABLEMAXVAL")
+    private Double reasonablemaxval;
+
+    @TableField("REASONABLEMINVAL")
+    private Double reasonableminval;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("UNIFORMCODE")
+    private String uniformcode;
+
+    @TableField("SHORTID")
+    private String shortid;
+
+    @TableField("LONGID")
+    private String longid;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("REALTIMEID")
+    private String realtimeid;
+
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/service/GenerationService.java

@@ -3,10 +3,7 @@
 //import com.gyee.common.model.PointData;
 //import com.gyee.common.util.DateUtils;
 //import com.gyee.generation.init.CacheContext;
-//import com.gyee.generation.model.auto.Line;
-//import com.gyee.generation.model.auto.Meterpoint;
-//import com.gyee.generation.model.auto.Project;
-//import com.gyee.generation.model.auto.Windpowerstation;
+//import com.gyee.generation.model.auto.*;
 //import com.gyee.generation.util.realtimesource.EdosUtil;
 //import com.gyee.generation.util.realtimesource.IEdosUtil;
 //import org.springframework.stereotype.Service;
@@ -30,6 +27,7 @@
 //        Map<String, List<Project>> wppromap = CacheContext.wppromap;
 //        Map<String, List<Line>> prolinemap = CacheContext.prolinemap;
 //        List<Meterpoint> meterpoints = CacheContext.meterpoints;
+//        Map<String, Map<String, Windpowerstationpointnew>> wppointmap = CacheContext.wppointmap;
 //        Date samedayZero = DateUtils.getSamedayZero();
 //        Date monthFirstZero = DateUtils.getMonthFirstZero();
 //        Date yearFirstZero = DateUtils.getYearFirstZero();

realtime/generation-service/src/main/java/com/gyee/generation/service/auto/IWindpowerstationpointnewService.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.Windpowerstationpointnew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+public interface IWindpowerstationpointnewService extends IService<Windpowerstationpointnew> {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/service/auto/IWindturbinetestingpointnewService.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.Windturbinetestingpointnew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+public interface IWindturbinetestingpointnewService extends IService<Windturbinetestingpointnew> {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/service/auto/impl/WindpowerstationpointnewServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.Windpowerstationpointnew;
+import com.gyee.generation.mapper.auto.WindpowerstationpointnewMapper;
+import com.gyee.generation.service.auto.IWindpowerstationpointnewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+@Service
+public class WindpowerstationpointnewServiceImpl extends ServiceImpl<WindpowerstationpointnewMapper, Windpowerstationpointnew> implements IWindpowerstationpointnewService {
+
+}

realtime/generation-service/src/main/java/com/gyee/generation/service/auto/impl/WindturbinetestingpointnewServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.Windturbinetestingpointnew;
+import com.gyee.generation.mapper.auto.WindturbinetestingpointnewMapper;
+import com.gyee.generation.service.auto.IWindturbinetestingpointnewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-02
+ */
+@Service
+public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<WindturbinetestingpointnewMapper, Windturbinetestingpointnew> implements IWindturbinetestingpointnewService {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/controller/auto/WindpowerstationpointnewController.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+@RestController
+@RequestMapping("//windpowerstationpointnew")
+public class WindpowerstationpointnewController {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/controller/auto/WindturbinetestingpointnewController.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+@RestController
+@RequestMapping("//windturbinetestingpointnew")
+public class WindturbinetestingpointnewController {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/init/CacheContext.java

@@ -12,7 +12,6 @@ import com.gyee.datacenter.service.auto.IWindturbineService;
 import com.gyee.datacenter.util.redis.RedisService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
@@ -49,7 +48,7 @@ public class CacheContext  implements CommandLineRunner {
     public static List<Uniformcode> codeList = new ArrayList<>();
     public static Map<String,String> codemap = new HashMap<>();
     public static Map<String,String> wpmap = new HashMap<>();
-    public static Map<String, Map<String, Windturbinetestingpointai>> wtpointmap = new HashMap<>();
+    public static Map<String, Map<String, Windturbinetestingpointnew>> wtpointmap = new HashMap<>();
 
     public static Map<String,String> wtmap = new HashMap<>();
     @Override
@@ -83,8 +82,8 @@ public class CacheContext  implements CommandLineRunner {
             wtmap.put(i.getId(),i.getName());
         });
 
-        String wtjson = redisService.get("WT");
-        wtpointmap = JSONObject.parseObject(wtjson, new TypeReference<Map<String, Map<String, Windturbinetestingpointai>>>() {
+        String wtjson = redisService.get("PRODUCT-WT");
+        wtpointmap = JSONObject.parseObject(wtjson, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
         });
 
         log.info("-------------------------------缓存结束--------------------------------------");

web/datacenter-hb/src/main/java/com/gyee/datacenter/mapper/auto/WindpowerstationpointnewMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.mapper.auto;
+
+import com.gyee.datacenter.model.auto.Windpowerstationpointnew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+public interface WindpowerstationpointnewMapper extends BaseMapper<Windpowerstationpointnew> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/mapper/auto/WindturbinetestingpointnewMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.mapper.auto;
+
+import com.gyee.datacenter.model.auto.Windturbinetestingpointnew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+public interface WindturbinetestingpointnewMapper extends BaseMapper<Windturbinetestingpointnew> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/model/auto/Windpowerstationpointnew.java

@@ -0,0 +1,77 @@
+package com.gyee.datacenter.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERSTATIONPOINTNEW")
+public class Windpowerstationpointnew extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("MODEL")
+    private String model;
+
+    @TableField("VALUEUNIT")
+    private String valueunit;
+
+    @TableField("ENGLISHNAME")
+    private String englishname;
+
+    @TableField("TYPEID")
+    private String typeid;
+
+    @TableField("MODELID")
+    private String modelid;
+
+    @TableField("MAXVAL")
+    private Double maxval;
+
+    @TableField("MINVAL")
+    private Double minval;
+
+    @TableField("REASONABLEMAXVAL")
+    private Double reasonablemaxval;
+
+    @TableField("REASONABLEMINVAL")
+    private Double reasonableminval;
+
+    @TableField("UNIFORMCODE")
+    private String uniformcode;
+
+    @TableField("SHORTID")
+    private String shortid;
+
+    @TableField("LONGID")
+    private String longid;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("REALTIMEID")
+    private String realtimeid;
+
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/model/auto/Windturbinetestingpointnew.java

@@ -0,0 +1,80 @@
+package com.gyee.datacenter.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDTURBINETESTINGPOINTNEW")
+public class Windturbinetestingpointnew extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CODE")
+    private String code;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("MODEL")
+    private String model;
+
+    @TableField("VALUEUNIT")
+    private String valueunit;
+
+    @TableField("ENGLISHNAME")
+    private String englishname;
+
+    @TableField("TYPEID")
+    private String typeid;
+
+    @TableField("MODELID")
+    private String modelid;
+
+    @TableField("MAXVAL")
+    private Double maxval;
+
+    @TableField("MINVAL")
+    private Double minval;
+
+    @TableField("REASONABLEMAXVAL")
+    private Double reasonablemaxval;
+
+    @TableField("REASONABLEMINVAL")
+    private Double reasonableminval;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("UNIFORMCODE")
+    private String uniformcode;
+
+    @TableField("SHORTID")
+    private String shortid;
+
+    @TableField("LONGID")
+    private String longid;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("REALTIMEID")
+    private String realtimeid;
+
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/DataqueryService.java

@@ -10,10 +10,9 @@ import com.gyee.datacenter.model.auto.Datacenter;
 import com.gyee.datacenter.model.auto.Datacenterpoint;
 import com.gyee.datacenter.util.PageUtil;
 import com.gyee.datacenter.util.realtimesource.EdosUtil;
-import com.gyee.datacenter.util.realtimesource.IEdosUtil;
-import com.gyee.datacenter.util.realtimesource.MongoEdosUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -29,7 +28,8 @@ import java.util.stream.Collectors;
 @Service
 public class DataqueryService {
 
-    private IEdosUtil edosUtil = new EdosUtil();
+    @Resource
+    private EdosUtil edosUtil;
     public List<Datacenter> getTables() {
         return CacheContext.tableList;
     }

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/ParameterComparisonService.java

@@ -8,13 +8,11 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.datacenter.CurveVo;
 import com.gyee.common.vo.datacenter.ParameterComparisonVo;
 import com.gyee.datacenter.init.CacheContext;
-
-import com.gyee.datacenter.model.auto.Windturbinetestingpointai;
+import com.gyee.datacenter.model.auto.Windturbinetestingpointnew;
 import com.gyee.datacenter.util.realtimesource.EdosUtil;
-import com.gyee.datacenter.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -27,7 +25,8 @@ import java.util.*;
 public class ParameterComparisonService {
 
 
-    private IEdosUtil edosUtil = new EdosUtil();
+    @Resource
+    private EdosUtil edosUtil;
 
     public List<Object> generatingCurveBywt(String begin, String end, String interval, String type, String wt, String params) throws Exception {
         List<Object>  resultList = new ArrayList<>();
@@ -35,15 +34,15 @@ public class ParameterComparisonService {
         Date endDate = DateUtils.parseDate1(end);
         Map<String,List<ParameterComparisonVo>> result = new HashMap<>();
 //        List<List<ParameterComparisonVo>> result = new ArrayList<>();
-        Map<String, Map<String, Windturbinetestingpointai>> wtpointmap = CacheContext.wtpointmap;
+        Map<String, Map<String, Windturbinetestingpointnew>> wtpointmap = CacheContext.wtpointmap;
         Map<String, String> codemap = CacheContext.codemap;
 
         String[] paramArray = params.split(",");
-        Map<String, Windturbinetestingpointai> stringWindturbinetestingpointai2Map = wtpointmap.get(wt);
+        Map<String, Windturbinetestingpointnew> stringWindturbinetestingpointai2Map = wtpointmap.get(wt);
         for (String param : paramArray) {
             List<ParameterComparisonVo> paramList = new ArrayList<>();
             List<PointData> pointDatas = null;
-            Windturbinetestingpointai windturbinetestingpointai2 = stringWindturbinetestingpointai2Map.get(param);
+            Windturbinetestingpointnew windturbinetestingpointai2 = stringWindturbinetestingpointai2Map.get(param);
             if(null !=windturbinetestingpointai2){
                 if (interval != null) {
                     if (type!=null){
@@ -99,7 +98,7 @@ public class ParameterComparisonService {
         Date endDate = DateUtils.parseDate1(end);
         Map<String,List<ParameterComparisonVo>> result = new HashMap<>();
 
-        Map<String, Map<String, Windturbinetestingpointai>> wtpointmap = CacheContext.wtpointmap;
+        Map<String, Map<String, Windturbinetestingpointnew>> wtpointmap = CacheContext.wtpointmap;
         Map<String, String> codemap = CacheContext.codemap;
         Map<String, String> wtmap = CacheContext.wtmap;
 
@@ -107,7 +106,7 @@ public class ParameterComparisonService {
         for (String wt : wtArray) {
             List<ParameterComparisonVo> wtsList = new ArrayList<>();
             List<PointData> pointDatas = null;
-            Windturbinetestingpointai windturbinetestingpointai2 =  wtpointmap.get(wt).get(params);
+            Windturbinetestingpointnew windturbinetestingpointai2 =  wtpointmap.get(wt).get(params);
             if (null != windturbinetestingpointai2){
                 if (interval != null) {
                     if (type!=null){

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/IWindpowerstationpointnewService.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.service.auto;
+
+import com.gyee.datacenter.model.auto.Windpowerstationpointnew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+public interface IWindpowerstationpointnewService extends IService<Windpowerstationpointnew> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/IWindturbinetestingpointnewService.java

@@ -0,0 +1,16 @@
+package com.gyee.datacenter.service.auto;
+
+import com.gyee.datacenter.model.auto.Windturbinetestingpointnew;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+public interface IWindturbinetestingpointnewService extends IService<Windturbinetestingpointnew> {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/impl/WindpowerstationpointnewServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.service.auto.impl;
+
+import com.gyee.datacenter.model.auto.Windpowerstationpointnew;
+import com.gyee.datacenter.mapper.auto.WindpowerstationpointnewMapper;
+import com.gyee.datacenter.service.auto.IWindpowerstationpointnewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+@Service
+public class WindpowerstationpointnewServiceImpl extends ServiceImpl<WindpowerstationpointnewMapper, Windpowerstationpointnew> implements IWindpowerstationpointnewService {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/service/auto/impl/WindturbinetestingpointnewServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.datacenter.service.auto.impl;
+
+import com.gyee.datacenter.model.auto.Windturbinetestingpointnew;
+import com.gyee.datacenter.mapper.auto.WindturbinetestingpointnewMapper;
+import com.gyee.datacenter.service.auto.IWindturbinetestingpointnewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-03-03
+ */
+@Service
+public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<WindturbinetestingpointnewMapper, Windturbinetestingpointnew> implements IWindturbinetestingpointnewService {
+
+}

web/datacenter-hb/src/main/java/com/gyee/datacenter/util/realtimesource/EdosUtil.java

@@ -1,18 +1,17 @@
 package com.gyee.datacenter.util.realtimesource;
 
 
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
-import com.gyee.datacenter.model.auto.Windpowerstationtestingpoint;
-import com.gyee.datacenter.model.auto.Windturbinetestingpointai;
+import com.gyee.datacenter.model.auto.Windpowerstationpointnew;
+import com.gyee.datacenter.model.auto.Windturbinetestingpointnew;
 import com.gyee.datacenter.util.realtimesource.timeseries.ErrorRequest;
 import com.gyee.datacenter.util.realtimesource.timeseries.JsonObjectHelper;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -27,10 +26,10 @@ 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.65.79.30:8019/ts";
+    @Value("${golden.baseURL}")
+    private String baseURL;
     @Override
-    public PointData getRealData(Windpowerstationtestingpoint point) throws Exception {
+    public PointData getRealData(Windpowerstationpointnew point) throws Exception {
         try {
             Optional<String> keys = Optional.ofNullable(point.getCode());
             Optional<String> thingType = Optional.ofNullable("station");
@@ -49,7 +48,7 @@ public class EdosUtil implements IEdosUtil {
 
             ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
             JSONObject jsonArray = resp.getBody();
-             if (StringUtils.isNotEmpty(jsonArray)){
+            if (StringUtils.isNotEmpty(jsonArray)){
                 List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
                 if (list.size() > 0)
                     return list.get(0);
@@ -70,7 +69,7 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasSnap(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -116,53 +115,53 @@ public class EdosUtil implements IEdosUtil {
                 if(snapList.isEmpty())
                 {
 
-                	getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
+                    getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
                 }else
                 {
-                	 for (PointData snapItem : snapList) {
-
-                         long subTime = snapItem.getPointTime() - pried;
-                         //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                         // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                         // 则代表该时间节点快照有效，否则为0
-                         String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
-                         ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                         JSONObject jsonObjectSection = sectionResp.getBody();
-
-                         if (jsonObjectSection != null) {
-                             List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                             if (sectionlist.size() > 0) {
-                                 if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                     resultList.add(snapItem);
-                                 }
-                                 else{
-                                     PointData data = new PointData();
-                                     data.setEdnaId(point.getCode());
-                                     data.setPointTime(snapItem.getPointTime());
-                                     data.setPointValue("0");
-                                     data.setPointName("1");
-                                     data.setPointValueInDouble(0.0);
-                                     resultList.add(data);
-                                 }
-                             } else {
-                                 PointData data = new PointData();
-                                 data.setEdnaId(point.getCode());
-                                 data.setPointTime(snapItem.getPointTime());
-                                 data.setPointValue("0");
-                                 data.setPointName("1");
-                                 data.setPointValueInDouble(0.0);
-                                 resultList.add(data);
-                             }
-                         } else {
-                             PointData data = new PointData();
-                             data.setEdnaId(point.getCode());
-                             data.setPointTime(snapItem.getPointTime());
-                             data.setPointValue("0");
-                             data.setPointName("1");
-                             data.setPointValueInDouble(0.0);
-                             resultList.add(data);
-                         }
-                     }
+                    for (PointData snapItem : snapList) {
+
+                        long subTime = snapItem.getPointTime() - pried;
+                        //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+                        // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+                        // 则代表该时间节点快照有效，否则为0
+                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+                        ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+                        JSONObject jsonObjectSection = sectionResp.getBody();
+
+                        if (jsonObjectSection != null) {
+                            List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+                            if (sectionlist.size() > 0) {
+                                if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+                                    resultList.add(snapItem);
+                                }
+                                else{
+                                    PointData data = new PointData();
+                                    data.setEdnaId(point.getCode());
+                                    data.setPointTime(snapItem.getPointTime());
+                                    data.setPointValue("0");
+                                    data.setPointName("1");
+                                    data.setPointValueInDouble(0.0);
+                                    resultList.add(data);
+                                }
+                            } else {
+                                PointData data = new PointData();
+                                data.setEdnaId(point.getCode());
+                                data.setPointTime(snapItem.getPointTime());
+                                data.setPointValue("0");
+                                data.setPointName("1");
+                                data.setPointValueInDouble(0.0);
+                                resultList.add(data);
+                            }
+                        } else {
+                            PointData data = new PointData();
+                            data.setEdnaId(point.getCode());
+                            data.setPointTime(snapItem.getPointTime());
+                            data.setPointValue("0");
+                            data.setPointName("1");
+                            data.setPointValueInDouble(0.0);
+                            resultList.add(data);
+                        }
+                    }
                 }
 
 
@@ -185,52 +184,52 @@ public class EdosUtil implements IEdosUtil {
     }
 
 
-	private void getHistsnapSameTiem(String pointid, Long beginDate, Long pried,
-			List<PointData> resultList) {
-		long subTime =beginDate - pried;
-		  String rawUrl = baseURL + "/history/section?null=0&tagNames=" + pointid + "&ts=" + beginDate + "000";
-		  ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-		  JSONObject jsonObjectSection = sectionResp.getBody();
-		  if (jsonObjectSection != null) {
-		      List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-		      if (sectionlist.size() > 0) {
-		          if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=beginDate){
-		              resultList.add(sectionlist.get(0));
-		          }
-		          else{
-		              PointData data = new PointData();
-		              data.setEdnaId(pointid);
-		              data.setPointTime(sectionlist.get(0).getPointTime());
-		              data.setPointValue("0");
-		              data.setPointName("1");
-		              data.setPointValueInDouble(0.0);
-		              resultList.add(data);
-		          }
-		      } else {
-		          PointData data = new PointData();
-		          data.setEdnaId(pointid);
-		          if (sectionlist!=null && sectionlist.size()>0){
-                      data.setPointTime(sectionlist.get(0).getPointTime());
-                  }
-		          data.setPointValue("0");
-		          data.setPointName("1");
-		          data.setPointValueInDouble(0.0);
-		          resultList.add(data);
-		      }
-		  } else {
-		      PointData data = new PointData();
-		      data.setEdnaId(pointid);
-		      data.setPointTime(beginDate);
-		      data.setPointValue("0");
-		      data.setPointName("1");
-		      data.setPointValueInDouble(0.0);
-		      resultList.add(data);
-		  }
-	}
+    private void getHistsnapSameTiem(String pointid, Long beginDate, Long pried,
+                                     List<PointData> resultList) {
+        long subTime =beginDate - pried;
+        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + pointid + "&ts=" + beginDate + "000";
+        ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+        JSONObject jsonObjectSection = sectionResp.getBody();
+        if (jsonObjectSection != null) {
+            List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+            if (sectionlist.size() > 0) {
+                if(sectionlist.get(0).getPointTime()>=subTime&&sectionlist.get(0).getPointTime()<=beginDate){
+                    resultList.add(sectionlist.get(0));
+                }
+                else{
+                    PointData data = new PointData();
+                    data.setEdnaId(pointid);
+                    data.setPointTime(sectionlist.get(0).getPointTime());
+                    data.setPointValue("0");
+                    data.setPointName("1");
+                    data.setPointValueInDouble(0.0);
+                    resultList.add(data);
+                }
+            } else {
+                PointData data = new PointData();
+                data.setEdnaId(pointid);
+                if (sectionlist!=null && sectionlist.size()>0){
+                    data.setPointTime(sectionlist.get(0).getPointTime());
+                }
+                data.setPointValue("0");
+                data.setPointName("1");
+                data.setPointValueInDouble(0.0);
+                resultList.add(data);
+            }
+        } else {
+            PointData data = new PointData();
+            data.setEdnaId(pointid);
+            data.setPointTime(beginDate);
+            data.setPointValue("0");
+            data.setPointName("1");
+            data.setPointValueInDouble(0.0);
+            resultList.add(data);
+        }
+    }
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(Windpowerstationtestingpoint point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -276,8 +275,8 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public PointData getRealData(Windturbinetestingpointai point) throws Exception {
-        Optional<String> keys = Optional.ofNullable(point.getId());
+    public PointData getRealData(Windturbinetestingpointnew point) throws Exception {
+        Optional<String> keys = Optional.ofNullable(point.getCode());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
@@ -297,7 +296,7 @@ public class EdosUtil implements IEdosUtil {
             }
             ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
             JSONObject jsonArray = resp.getBody();
-             if (StringUtils.isNotEmpty(jsonArray)){
+            if (StringUtils.isNotEmpty(jsonArray)){
                 List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
                 if (list.size() > 0)
                     return list.get(0);
@@ -318,14 +317,14 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         if (point==null){
             System.out.println(1111);
 
         }else if(point.getId()==null){
             System.out.println(222);
         }
-        Optional<String> tagName = Optional.ofNullable(point.getId());
+        Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
@@ -370,10 +369,10 @@ public class EdosUtil implements IEdosUtil {
                 if(snapList.isEmpty())
                 {
 
-                	getHistsnapSameTiem(point.getId(), beginDate, pried, resultList);
+                    getHistsnapSameTiem(point.getId(), beginDate, pried, resultList);
                 }else
                 {
-                	for (PointData snapItem : snapList) {
+                    for (PointData snapItem : snapList) {
                         long subTime = snapItem.getPointTime() - pried;
                         //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
                         // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
@@ -385,7 +384,7 @@ public class EdosUtil implements IEdosUtil {
                         if (jsonObjectSection != null) {
                             List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
                             if (sectionlist.size() > 0) {
-                                    resultList.add(snapItem);
+                                resultList.add(snapItem);
 
                             } else {
                                 PointData data = new PointData();
@@ -425,8 +424,8 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointai point, Long beginDate, Long endDate) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getId());
+    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
@@ -480,7 +479,7 @@ public class EdosUtil implements IEdosUtil {
 
             ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
             JSONObject jsonArray = resp.getBody();
-             if (StringUtils.isNotEmpty(jsonArray)){
+            if (StringUtils.isNotEmpty(jsonArray)){
                 List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
                 if (list.size() > 0)
                     return list.get(0);
@@ -555,7 +554,7 @@ public class EdosUtil implements IEdosUtil {
                     }
                     pointData.setPointValue(pointValue);
                     pointData.setPointValueInDouble(Double.parseDouble(pointValue));
-                   // System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
+                    // System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
                 }
                 return result;
 
@@ -640,7 +639,7 @@ public class EdosUtil implements IEdosUtil {
                     pointData.setPointValue(pointValue);
 
                     pointData.setPointValueInDouble(Double.parseDouble(pointValue));
-                  //  System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
+                    //  System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
                 }
                 return result;
 
@@ -672,7 +671,7 @@ public class EdosUtil implements IEdosUtil {
                 return null;
             ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
             JSONObject jsonArray = resp.getBody();
-             if (StringUtils.isNotEmpty(jsonArray)){
+            if (StringUtils.isNotEmpty(jsonArray)){
                 Iterator<String> sIterator = jsonArray.keySet().iterator();
                 Map<String, Double> resultMap = new HashMap();
                 while (sIterator.hasNext()) {
@@ -708,41 +707,41 @@ public class EdosUtil implements IEdosUtil {
     }
 
 
-	  @Override
-	    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-	        Optional<String> tagName = Optional.ofNullable(pointid);
-	        Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
-	        Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
-
-	        //通过时间区间和时间间隔获取点数
-	        Long finalInterval;
-	        if (pried != null)
-	            finalInterval = pried;
-	        else if (count != null)
-	            finalInterval = (endDate - beginDate) / count;
-	        else
-	            return ErrorRequest.RequestListError(pointid);
-	        Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
-
-	        try {
-	            String url = baseURL + "/history/snap?null=0";
-	            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
-	            if (tagName.isPresent())
-	                url = url + "&tagName=" + tagName.get();
-
-	            if (startTs.isPresent())
-	                url = url + "&startTs=" + startTs.get();
-	            if (endTs.isPresent())
-	                url = url + "&endTs=" + endTs.get();
-	            if (interval.isPresent())
-	                url = url + "&interval=" + interval.get();
-
-	            ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
-	            JSONArray jsonArray = resp.getBody();
-	            if (jsonArray != null) {
-	                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray,tagName.get());
-	                List<PointData> resultList = new ArrayList<>();
-	                return list;
+    @Override
+    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(pointid);
+        Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
+        Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
+
+        //通过时间区间和时间间隔获取点数
+        Long finalInterval;
+        if (pried != null)
+            finalInterval = pried;
+        else if (count != null)
+            finalInterval = (endDate - beginDate) / count;
+        else
+            return ErrorRequest.RequestListError(pointid);
+        Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
+
+        try {
+            String url = baseURL + "/history/snap?null=0";
+            //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+            if (tagName.isPresent())
+                url = url + "&tagName=" + tagName.get();
+
+            if (startTs.isPresent())
+                url = url + "&startTs=" + startTs.get();
+            if (endTs.isPresent())
+                url = url + "&endTs=" + endTs.get();
+            if (interval.isPresent())
+                url = url + "&interval=" + interval.get();
+
+            ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
+            JSONArray jsonArray = resp.getBody();
+            if (jsonArray != null) {
+                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray,tagName.get());
+                List<PointData> resultList = new ArrayList<>();
+                return list;
 //
 //	                if(list.isEmpty())
 //	                {
@@ -796,20 +795,20 @@ public class EdosUtil implements IEdosUtil {
 //	                }
 //
 //	                return resultList;
-	            } else {
-	                return ErrorRequest.RequestListError(pointid);
-	            }
+            } else {
+                return ErrorRequest.RequestListError(pointid);
+            }
 
-	        } catch (HttpClientErrorException exception) {
-	            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-	                System.out.println("404请求错误");
-	                return ErrorRequest.RequestListError(pointid);
-	            } else {
-	                throw exception;
-	            }
-	        }
+        } catch (HttpClientErrorException exception) {
+            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                System.out.println("404请求错误");
+                return ErrorRequest.RequestListError(pointid);
+            } else {
+                throw exception;
+            }
+        }
 
-	    }
+    }
 
 
     @Override
@@ -847,8 +846,8 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getId());
+    public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
@@ -909,7 +908,7 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -1116,14 +1115,14 @@ public class EdosUtil implements IEdosUtil {
             if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty()){
                 return JsonObjectHelper.phraseDNAVal(jsonObject,tagNames);
             } else {
-            	  DNAVal[] errorResult = new DNAVal[tagNames.length];
-                  for(int i=0;i<tagNames.length;i++)
-                  {
-                  	 DNAVal val = new DNAVal();
-                       val.Status = 0;
-                       errorResult[i] = val;
-                  }
-                  return errorResult;
+                DNAVal[] errorResult = new DNAVal[tagNames.length];
+                for(int i=0;i<tagNames.length;i++)
+                {
+                    DNAVal val = new DNAVal();
+                    val.Status = 0;
+                    errorResult[i] = val;
+                }
+                return errorResult;
             }
 
         } catch (HttpClientErrorException exception) {
@@ -1132,9 +1131,9 @@ public class EdosUtil implements IEdosUtil {
                 DNAVal[] errorResult = new DNAVal[tagNames.length];
                 for(int i=0;i<tagNames.length;i++)
                 {
-                	 DNAVal val = new DNAVal();
-                     val.Status = 0;
-                     errorResult[i] = val;
+                    DNAVal val = new DNAVal();
+                    val.Status = 0;
+                    errorResult[i] = val;
                 }
                 return errorResult;
             } else {
@@ -1239,29 +1238,31 @@ public class EdosUtil implements IEdosUtil {
             JSONObject jsonObject = resp.getBody();
             if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty())
             {
-            	 return JsonObjectHelper.phraseDNAVal(jsonObject,nameList);
+                return JsonObjectHelper.phraseDNAVal(jsonObject,nameList);
             }
             else {
                 DNAVal[] errorResult = new DNAVal[nameList.length];
                 for(int i=0;i<nameList.length;i++)
                 {
-                	 DNAVal val = new DNAVal();
-                     val.Status = 0;
-                     errorResult[i] = val;
+                    DNAVal val = new DNAVal();
+                    val.Status = 0;
+                    errorResult[i] = val;
                 }
                 return errorResult;
             }
         } catch (Exception e) {
-        	  DNAVal[] errorResult = new DNAVal[nameList.length];
-              for(int i=0;i<nameList.length;i++)
-              {
-              	 DNAVal val = new DNAVal();
-                   val.Status = 0;
-                   errorResult[i] = val;
-              }
-              return errorResult;
+            DNAVal[] errorResult = new DNAVal[nameList.length];
+            for(int i=0;i<nameList.length;i++)
+            {
+                DNAVal val = new DNAVal();
+                val.Status = 0;
+                errorResult[i] = val;
+            }
+            return errorResult;
         }
     }
 
 
+
+
 }

web/datacenter-hb/src/main/java/com/gyee/datacenter/util/realtimesource/IEdosUtil.java

@@ -1,12 +1,11 @@
 package com.gyee.datacenter.util.realtimesource;
 
 
-
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
-import com.gyee.datacenter.model.auto.Windpowerstationtestingpoint;
-import com.gyee.datacenter.model.auto.Windturbinetestingpointai;
+import com.gyee.datacenter.model.auto.Windpowerstationpointnew;
+import com.gyee.datacenter.model.auto.Windturbinetestingpointnew;
 
 import java.util.List;
 import java.util.Map;
@@ -14,13 +13,13 @@ import java.util.Map;
 
 public interface IEdosUtil {
 
-	/**
-	 * 通过风场测点获得测点实时数据
-	 * @param point 只是用了code字段，作为唯一标识
-	 * @return
-	 * @throws Exception
-	 */
-    public PointData getRealData(Windpowerstationtestingpoint point) throws Exception;
+    /**
+     * 通过风场测点获得测点实时数据
+     * @param point 只是用了code字段，作为唯一标识
+     * @return
+     * @throws Exception
+     */
+    public PointData getRealData(Windpowerstationpointnew point) throws Exception;
 
     /**
      * 通过风场测点获得测点历史快照数据
@@ -32,7 +31,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风场测点获得测点历史存储数据，存多少取多少
@@ -42,7 +41,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(Windpowerstationtestingpoint point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception;
 
     /**
      * 通过风机测点获得测点实时数据
@@ -50,7 +49,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public PointData getRealData(Windturbinetestingpointai point) throws Exception;
+    public PointData getRealData(Windturbinetestingpointnew point) throws Exception;
 
     /**
      * 通过风机测点获得历史快照
@@ -62,7 +61,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风机测点获得测点历史存储数据，存多少取多少
@@ -72,7 +71,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointai point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception;
 
 
     /**
@@ -139,7 +138,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过风场测点获得测点指定时间周期的统计数据
@@ -152,7 +151,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过全局点名获得测点指定时间周期的统计数据

web/datacenter-hb/src/main/resources/application-dev.yml

@@ -98,5 +98,5 @@ logging:
 
 
 golden:
-  baseURL: http://10.155.32.4:8011/ts
+  baseURL: http://192.168.2.205:8011/ts
 

web/datacenter-hb/src/main/resources/application-test.yml

@@ -96,5 +96,6 @@ logging:
     root: info
     com.example: debug
 
-
+golden:
+  baseURL: http://10.83.68.205:8011/ts
 

web/datacenter-hb/src/main/resources/application.yml

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

web/datacenter-hb/target/classes/application-dev.yml

@@ -98,5 +98,5 @@ logging:
 
 
 golden:
-  baseURL: http://10.155.32.4:8011/ts
+  baseURL: http://192.168.2.205:8011/ts
 

web/datacenter-hb/target/classes/application-test.yml

@@ -96,5 +96,6 @@ logging:
     root: info
     com.example: debug
 
-
+golden:
+  baseURL: http://10.83.68.205:8011/ts
 

web/datacenter-hb/target/classes/application.yml

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