Browse Source

导入点表建临时表

xieshengjie 3 years ago
parent
commit
9d0778d8f7
65 changed files with 145 additions and 99 deletions
  1. 2 0
      histroy/analysis-histroy-hb/src/main/java/com/gyee/analysis/service/analysis/AnalysisNewService.java
  2. BIN
      histroy/analysis-histroy-hb/target/analysis-histroy-hb-1.0-SNAPSHOT.jar
  3. BIN
      histroy/analysis-histroy-hb/target/analysis-histroy-hb-1.0-SNAPSHOT.jar.original
  4. BIN
      histroy/analysis-histroy-hb/target/classes/com/gyee/analysis/service/analysis/AnalysisNewService.class
  5. 49 0
      web/knowledge-hb/src/test/java/com/gyee/knowledge/Monitortest.java
  6. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/Monitor8083Main.java
  7. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/config/CorsConfig.java
  8. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/config/GeneratorCodeConfig.java
  9. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/config/MybatisPlusConfig.java
  10. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/config/R.java
  11. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/config/ResultCode.java
  12. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/controller/auto/WindpowerstationController.java
  13. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/controller/auto/WindpowerstationtestingpointController.java
  14. 7 12
      web/monitor-web/src/main/java/com/gyee/monitor/init/CacheContext.java
  15. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/WindpowerstationMapper.java
  16. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/Windpowerstationtestingpoint2Mapper.java
  17. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/WindpowerstationtestingpointMapper.java
  18. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/Windturbinetestingpointai2Mapper.java
  19. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windpowerstation.java
  20. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windpowerstationtestingpoint.java
  21. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windpowerstationtestingpoint2.java
  22. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windturbinetestingpointai2.java
  23. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindpowerstationService.java
  24. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindpowerstationtestingpoint2Service.java
  25. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindpowerstationtestingpointService.java
  26. 2 2
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindturbinetestingpointai2Service.java
  27. 4 4
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/WindpowerstationServiceImpl.java
  28. 4 4
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/Windpowerstationtestingpoint2ServiceImpl.java
  29. 4 4
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/WindpowerstationtestingpointServiceImpl.java
  30. 4 4
      web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/Windturbinetestingpointai2ServiceImpl.java
  31. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/service/winpower/WindpowerService.java
  32. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/ApiGolden.java
  33. 5 5
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/EdosUtil.java
  34. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/GoldenConfig.java
  35. 3 3
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/IEdosUtil.java
  36. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/StringUtil.java
  37. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BaseTsQuery.java
  38. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BasicTsData.java
  39. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BasicTsPoint.java
  40. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BlobTsData.java
  41. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BlobWriteTsData.java
  42. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BooleanTsData.java
  43. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BooleanWriteTsData.java
  44. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/Coordinate.java
  45. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/CoordinateTsData.java
  46. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/CoordinateWriteTsData.java
  47. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/DoubleStatData.java
  48. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/DoubleTsData.java
  49. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/DoubleWriteTsData.java
  50. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/ErrorRequest.java
  51. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/GeneralTsData.java
  52. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/Interpolation.java
  53. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/JsonObjectHelper.java
  54. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/LongTsData.java
  55. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/LongWriteTsData.java
  56. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/StringTsData.java
  57. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/StringUtil.java
  58. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/StringWriteTsData.java
  59. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsData.java
  60. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsDataType.java
  61. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsPoint.java
  62. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsPointData.java
  63. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsPointDataList.java
  64. 1 1
      web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsQuery.java
  65. 3 3
      web/monitor-web/src/test/java/com/gyee/monitor/Monitortest.java

+ 2 - 0
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)) {
                     //性能不好降风速

BIN
histroy/analysis-histroy-hb/target/analysis-histroy-hb-1.0-SNAPSHOT.jar


BIN
histroy/analysis-histroy-hb/target/analysis-histroy-hb-1.0-SNAPSHOT.jar.original


BIN
histroy/analysis-histroy-hb/target/classes/com/gyee/analysis/service/analysis/AnalysisNewService.class


+ 49 - 0
web/knowledge-hb/src/test/java/com/gyee/knowledge/Monitortest.java

@@ -0,0 +1,49 @@
+package com.gyee.knowledge;
+
+
+import com.gyee.knowledge.model.auto.Testmis;
+import com.gyee.knowledge.service.auto.ITestmisService;
+import lombok.extern.slf4j.Slf4j;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName : Monitortest
+ * @Author : xieshengjie
+ * @Date: 2021/12/10 14:55
+ * @Description :
+ */
+@Slf4j
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
+public class Monitortest {
+    @Resource
+    private ITestmisService testmisService;
+    @Test
+    public void test(){
+        List<Testmis> list = testmisService.list();
+        List<String> ids = list.stream().map(i -> i.getId()).collect(Collectors.toList());
+        ids.stream().forEach(id->{
+            int count = id.length() / 2;
+            for (int j=0;j<count;j++){
+                Testmis testmis= new Testmis();
+                testmis.setId(id);
+                String substring = id.substring(0, (j + 1) * 2);
+                testmis.setName(substring);
+                System.out.println("'"+testmis.getId()+"!'"+testmis.getName());
+            }
+        });
+
+    }
+}

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/Monitor8083Main.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor;
+package com.gyee.knowledge;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/config/CorsConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.config;
+package com.gyee.knowledge.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/config/GeneratorCodeConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.config;
+package com.gyee.knowledge.config;
 
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.config;
+package com.gyee.knowledge.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.springframework.context.annotation.Bean;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/config/R.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.config;
+package com.gyee.knowledge.config;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/config/ResultCode.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.config;
+package com.gyee.knowledge.config;
 
 /**
  * @ClassName : ResultCode

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/controller/auto/WindpowerstationController.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.controller.auto;
+package com.gyee.knowledge.controller.auto;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/controller/auto/WindpowerstationtestingpointController.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.controller.auto;
+package com.gyee.knowledge.controller.auto;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

+ 7 - 12
web/monitor-web/src/main/java/com/gyee/monitor/init/CacheContext.java

@@ -1,19 +1,14 @@
-package com.gyee.monitor.init;
+package com.gyee.knowledge.init;
 
 
-import com.gyee.common.model.auto.Windturbine;
-import com.gyee.common.service.IWindturbineService;
-import com.gyee.monitor.model.auto.Windpowerstation;
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint;
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.monitor.model.auto.Windturbinetestingpointai2;
-import com.gyee.monitor.service.auto.IWindpowerstationService;
-import com.gyee.monitor.service.auto.IWindpowerstationtestingpoint2Service;
-import com.gyee.monitor.service.auto.IWindpowerstationtestingpointService;
-import com.gyee.monitor.service.auto.IWindturbinetestingpointai2Service;
+import com.gyee.knowledge.model.auto.Windpowerstation;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
+import com.gyee.knowledge.service.auto.IWindpowerstationService;
+import com.gyee.knowledge.service.auto.IWindpowerstationtestingpoint2Service;
+import com.gyee.knowledge.service.auto.IWindpowerstationtestingpointService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/WindpowerstationMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.monitor.mapper.auto;
+package com.gyee.knowledge.mapper.auto;
 
-import com.gyee.monitor.model.auto.Windpowerstation;
+import com.gyee.knowledge.model.auto.Windpowerstation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/Windpowerstationtestingpoint2Mapper.java

@@ -1,7 +1,7 @@
-package com.gyee.monitor.mapper.auto;
+package com.gyee.knowledge.mapper.auto;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint2;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
 
 /**
  * <p>

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/WindpowerstationtestingpointMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.monitor.mapper.auto;
+package com.gyee.knowledge.mapper.auto;
 
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/mapper/auto/Windturbinetestingpointai2Mapper.java

@@ -1,7 +1,7 @@
-package com.gyee.monitor.mapper.auto;
+package com.gyee.knowledge.mapper.auto;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.monitor.model.auto.Windturbinetestingpointai2;
+import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
 
 /**
  * <p>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windpowerstation.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.model.auto;
+package com.gyee.knowledge.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windpowerstationtestingpoint.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.model.auto;
+package com.gyee.knowledge.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windpowerstationtestingpoint2.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.model.auto;
+package com.gyee.knowledge.model.auto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/model/auto/Windturbinetestingpointai2.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.model.auto;
+package com.gyee.knowledge.model.auto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindpowerstationService.java

@@ -1,6 +1,6 @@
-package com.gyee.monitor.service.auto;
+package com.gyee.knowledge.service.auto;
 
-import com.gyee.monitor.model.auto.Windpowerstation;
+import com.gyee.knowledge.model.auto.Windpowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindpowerstationtestingpoint2Service.java

@@ -1,7 +1,7 @@
-package com.gyee.monitor.service.auto;
+package com.gyee.knowledge.service.auto;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint2;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
 
 /**
  * <p>

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindpowerstationtestingpointService.java

@@ -1,6 +1,6 @@
-package com.gyee.monitor.service.auto;
+package com.gyee.knowledge.service.auto;
 
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/IWindturbinetestingpointai2Service.java

@@ -1,7 +1,7 @@
-package com.gyee.monitor.service.auto;
+package com.gyee.knowledge.service.auto;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.monitor.model.auto.Windturbinetestingpointai2;
+import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
 
 /**
  * <p>

+ 4 - 4
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/WindpowerstationServiceImpl.java

@@ -1,8 +1,8 @@
-package com.gyee.monitor.service.auto.impl;
+package com.gyee.knowledge.service.auto.impl;
 
-import com.gyee.monitor.model.auto.Windpowerstation;
-import com.gyee.monitor.mapper.auto.WindpowerstationMapper;
-import com.gyee.monitor.service.auto.IWindpowerstationService;
+import com.gyee.knowledge.model.auto.Windpowerstation;
+import com.gyee.knowledge.mapper.auto.WindpowerstationMapper;
+import com.gyee.knowledge.service.auto.IWindpowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 4 - 4
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/Windpowerstationtestingpoint2ServiceImpl.java

@@ -1,10 +1,10 @@
-package com.gyee.monitor.service.auto.impl;
+package com.gyee.knowledge.service.auto.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.gyee.monitor.mapper.auto.Windpowerstationtestingpoint2Mapper;
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.monitor.service.auto.IWindpowerstationtestingpoint2Service;
+import com.gyee.knowledge.mapper.auto.Windpowerstationtestingpoint2Mapper;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
+import com.gyee.knowledge.service.auto.IWindpowerstationtestingpoint2Service;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 4
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/WindpowerstationtestingpointServiceImpl.java

@@ -1,8 +1,8 @@
-package com.gyee.monitor.service.auto.impl;
+package com.gyee.knowledge.service.auto.impl;
 
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint;
-import com.gyee.monitor.mapper.auto.WindpowerstationtestingpointMapper;
-import com.gyee.monitor.service.auto.IWindpowerstationtestingpointService;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
+import com.gyee.knowledge.mapper.auto.WindpowerstationtestingpointMapper;
+import com.gyee.knowledge.service.auto.IWindpowerstationtestingpointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 4 - 4
web/monitor-web/src/main/java/com/gyee/monitor/service/auto/impl/Windturbinetestingpointai2ServiceImpl.java

@@ -1,10 +1,10 @@
-package com.gyee.monitor.service.auto.impl;
+package com.gyee.knowledge.service.auto.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.gyee.monitor.mapper.auto.Windturbinetestingpointai2Mapper;
-import com.gyee.monitor.model.auto.Windturbinetestingpointai2;
-import com.gyee.monitor.service.auto.IWindturbinetestingpointai2Service;
+import com.gyee.knowledge.mapper.auto.Windturbinetestingpointai2Mapper;
+import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
+import com.gyee.knowledge.service.auto.IWindturbinetestingpointai2Service;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/service/winpower/WindpowerService.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.service.winpower;
+package com.gyee.knowledge.service.winpower;
 
 import org.springframework.stereotype.Service;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/ApiGolden.java

@@ -7,7 +7,7 @@
  * 
  */
 
-package com.gyee.monitor.util.realtimesource;
+package com.gyee.knowledge.util.realtimesource;
 
 import org.springframework.web.client.RestTemplate;
 

+ 5 - 5
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/EdosUtil.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource;
+package com.gyee.knowledge.util.realtimesource;
 
 
 
@@ -8,10 +8,10 @@ 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.monitor.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.monitor.model.auto.Windturbinetestingpointai2;
-import com.gyee.monitor.util.realtimesource.timeseries.ErrorRequest;
-import com.gyee.monitor.util.realtimesource.timeseries.JsonObjectHelper;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
+import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
+import com.gyee.knowledge.util.realtimesource.timeseries.ErrorRequest;
+import com.gyee.knowledge.util.realtimesource.timeseries.JsonObjectHelper;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/GoldenConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource;
+package com.gyee.knowledge.util.realtimesource;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

+ 3 - 3
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/IEdosUtil.java

@@ -1,12 +1,12 @@
-package com.gyee.monitor.util.realtimesource;
+package com.gyee.knowledge.util.realtimesource;
 
 
 
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
-import com.gyee.monitor.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.monitor.model.auto.Windturbinetestingpointai2;
+import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
+import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/StringUtil.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource;
+package com.gyee.knowledge.util.realtimesource;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BaseTsQuery.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BasicTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BasicTsPoint.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BlobTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import java.util.Base64;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BlobWriteTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BooleanTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/BooleanWriteTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/Coordinate.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/CoordinateTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/CoordinateWriteTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/DoubleStatData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/DoubleTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/DoubleWriteTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/ErrorRequest.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import com.gyee.common.model.PointData;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/GeneralTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/Interpolation.java

@@ -1,5 +1,5 @@
 
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 public enum Interpolation {
     SNAP,   // 历史快照数据

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/JsonObjectHelper.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 
 import com.alibaba.fastjson.JSONArray;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/LongTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/LongWriteTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/StringTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/StringUtil.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/StringWriteTsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 import lombok.Data;
 

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsDataType.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsPoint.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 /**
  * @author songwb<songwb@aliyun.com>

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsPointData.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 
 import lombok.AllArgsConstructor;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsPointDataList.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 
 import lombok.AllArgsConstructor;

+ 1 - 1
web/monitor-web/src/main/java/com/gyee/monitor/util/realtimesource/timeseries/TsQuery.java

@@ -1,4 +1,4 @@
-package com.gyee.monitor.util.realtimesource.timeseries;
+package com.gyee.knowledge.util.realtimesource.timeseries;
 
 public interface TsQuery {
 

+ 3 - 3
web/monitor-web/src/test/java/com/gyee/monitor/Monitortest.java

@@ -1,7 +1,7 @@
-package com.gyee.monitor;
+package com.gyee.knowledge;
 
-import com.gyee.monitor.model.auto.Windpowerstation;
-import com.gyee.monitor.service.auto.IWindpowerstationService;
+import com.gyee.knowledge.model.auto.Windpowerstation;
+import com.gyee.knowledge.service.auto.IWindpowerstationService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;