shilin 2 yıl önce
ebeveyn
işleme
aa4bf91d81
88 değiştirilmiş dosya ile 3 ekleme ve 3293 silme
  1. 0 2
      .idea/encodings.xml
  2. 2 1
      .idea/misc.xml
  3. 1 2
      realtime/datatraining-server-cph/datatraining-server-cph.iml
  4. 0 1
      realtime/failurestatistics-server-cph-jn/failurestatistics-server-cph-jn.iml
  5. BIN
      realtime/generationXa-service/lib/xxl-job-core-2.3.1-SNAPSHOT.jar
  6. 0 118
      realtime/generationXa-service/pom.xml
  7. 0 148
      realtime/generationXa-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java
  8. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/EquipmentmodelController.java
  9. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/LineController.java
  10. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/MeterpointController.java
  11. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/MeterpointvalueController.java
  12. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/ProjectController.java
  13. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/ShutdowneventController.java
  14. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/WindpowerstationtestingpointController.java
  15. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/WindturbineController.java
  16. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/controller/WindturbinetestingpointaiController.java
  17. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/EquipmentmodelMapper.java
  18. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/LineMapper.java
  19. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/ProjectMapper.java
  20. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationMapper.java
  21. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationpointnewMapper.java
  22. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindturbineMapper.java
  23. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindturbinetestingpointnewMapper.java
  24. 0 65
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Equipmentmodel.java
  25. 0 53
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Line.java
  26. 0 70
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Project.java
  27. 0 86
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstation.java
  28. 0 77
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationpointnew.java
  29. 0 40
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationstandardpoint.java
  30. 0 74
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationtestingpoint.java
  31. 0 67
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbine.java
  32. 0 40
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinestandardpoint.java
  33. 0 80
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinestatusdi.java
  34. 0 80
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinetestingpointai.java
  35. 0 80
      realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinetestingpointnew.java
  36. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IEquipmentmodelService.java
  37. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/ILineService.java
  38. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IProjectService.java
  39. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindpowerstationService.java
  40. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindpowerstationpointnewService.java
  41. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindturbineService.java
  42. 0 16
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindturbinetestingpointnewService.java
  43. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/EquipmentmodelServiceImpl.java
  44. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/LineServiceImpl.java
  45. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/ProjectServiceImpl.java
  46. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindpowerstationServiceImpl.java
  47. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindpowerstationpointnewServiceImpl.java
  48. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindturbineServiceImpl.java
  49. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindturbinetestingpointnewServiceImpl.java
  50. 0 48
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/ApiGolden.java
  51. 0 27
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/GoldenConfig.java
  52. 0 262
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java
  53. 0 34
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/StringUtil.java
  54. 0 28
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BaseTsQuery.java
  55. 0 38
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BasicTsData.java
  56. 0 29
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BasicTsPoint.java
  57. 0 24
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BlobTsData.java
  58. 0 22
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BlobWriteTsData.java
  59. 0 24
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BooleanTsData.java
  60. 0 19
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BooleanWriteTsData.java
  61. 0 18
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/Coordinate.java
  62. 0 26
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/CoordinateTsData.java
  63. 0 21
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/CoordinateWriteTsData.java
  64. 0 30
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/DoubleStatData.java
  65. 0 25
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/DoubleTsData.java
  66. 0 19
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/DoubleWriteTsData.java
  67. 0 38
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/ErrorRequest.java
  68. 0 27
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/GeneralTsData.java
  69. 0 8
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/Interpolation.java
  70. 0 206
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/JsonObjectHelper.java
  71. 0 24
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/LongTsData.java
  72. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/LongWriteTsData.java
  73. 0 24
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/StringTsData.java
  74. 0 34
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/StringUtil.java
  75. 0 20
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/StringWriteTsData.java
  76. 0 15
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsData.java
  77. 0 15
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsDataType.java
  78. 0 12
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsPoint.java
  79. 0 36
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsPointData.java
  80. 0 23
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsPointDataList.java
  81. 0 17
      realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsQuery.java
  82. 0 98
      realtime/generationXa-service/src/main/resources/application-dev.yml
  83. 0 117
      realtime/generationXa-service/src/main/resources/application-jn.yml
  84. 0 119
      realtime/generationXa-service/src/main/resources/application-td.yml
  85. 0 98
      realtime/generationXa-service/src/main/resources/application-test.yml
  86. 0 18
      realtime/generationXa-service/src/main/resources/xxl-job-executor.properties
  87. 0 1
      web/consumer-hb/consumer-hb.iml
  88. 0 1
      web/initialpoint/initialpoint.iml

+ 0 - 2
.idea/encodings.xml

@@ -43,8 +43,6 @@
     <file url="file://$PROJECT_DIR$/realtime/generationGFTD-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/generationTD-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/generationTD-service/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/realtime/generationXa-service/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/realtime/generationXa-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/generationregion-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/generationregion-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/realtime/healthmodel-server-cph-jn/src/main/java" charset="UTF-8" />

+ 2 - 1
.idea/misc.xml

@@ -4,10 +4,11 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/realtime/generationXa-service/pom.xml" />
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="false">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

+ 1 - 2
realtime/datatraining-server-cph/datatraining-server-cph.iml

@@ -26,7 +26,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.7.RELEASE" level="project" />
@@ -198,6 +197,7 @@
     <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.3" level="project" />
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.0.4.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
     <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
@@ -240,6 +240,5 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
   </component>
 </module>

+ 0 - 1
realtime/failurestatistics-server-cph-jn/failurestatistics-server-cph-jn.iml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
-  <component name="ExternalSystem" externalSystem="Maven" />
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />

BIN
realtime/generationXa-service/lib/xxl-job-core-2.3.1-SNAPSHOT.jar


+ 0 - 118
realtime/generationXa-service/pom.xml

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>realtime</artifactId>
-        <groupId>com.gyee</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>generationXa-service</artifactId>
-
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.gyee</groupId>
-            <artifactId>common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.17</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- ********************** plugin ********************** -->
-        <!-- groovy-all -->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-        </dependency>
-        <!-- xxl-job-core -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>2.3.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/xxl-job-core-2.3.1-SNAPSHOT.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-
-
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 148
realtime/generationXa-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java

@@ -1,148 +0,0 @@
-package com.gyee.generation.config;
-
-
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.Scanner;
-
-/**
- *@ClassName GeneratorCodeConfig
- *@Description 自动生成mybatisplus的相关代码
- *@Author 谢生杰
- *@Date 2020/9/25 18:26
- *@Version 1.0
- **/
-public class GeneratorCodeConfig {
-    public static String scanner(String tip) {
-        Scanner scanner = new Scanner(System.in);
-        StringBuilder help = new StringBuilder();
-        help.append("请输入" + tip + ":");
-        System.out.println(help.toString());
-        if (scanner.hasNext()) {
-            String ipt = scanner.next();
-            if (StringUtils.isNotEmpty(ipt)) {
-                return ipt;
-            }
-        }
-        throw new MybatisPlusException("请输入正确的" + tip + "!");
-    }
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        String projectPath = System.getProperty("user.dir");
-        gc.setOutputDir(projectPath + "/src/main/java");
-        gc.setAuthor("谢生杰");
-        gc.setOpen(false);
-        //实体属性 Swagger2 注解
-        gc.setSwagger2(false);
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        /*dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true");
-        dsc.setDriverName("com.mysql.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("root");
-        mpg.setDataSource(dsc);*/
-//        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-//        dsc.setUsername("gdprod");
-//        dsc.setPassword("gd123");
-//        dsc.setUrl("jdbc:oracle:thin:@10.83.68.165:1521:gdsj");
-
-        dsc.setDriverName("org.postgresql.Driver");
-        dsc.setUsername("gdprod");
-        dsc.setPassword("gd123");
-        dsc.setUrl("jdbc:postgresql://10.81.3.151:5432/wisdom");
-        mpg.setDataSource(dsc);
-
-
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-//        pc.setModuleName(scanner("模块名"));
-        pc.setParent("com.gyee.generation");
-        pc.setEntity("model.auto");
-        pc.setMapper("mapper.auto");
-        pc.setService("service.auto");
-        pc.setServiceImpl("service.auto.impl");
-        mpg.setPackageInfo(pc);
-
-        // 自定义配置
-//        InjectionConfig cfg = new InjectionConfig() {
-//            @Override
-//            public void initMap() {
-//                // to do nothing
-//            }
-//        };
-
-        // 如果模板引擎是 freemarker
-//        String templatePath = "/templates/mapper.xml.ftl";
-        // 如果模板引擎是 velocity
-        // String templatePath = "/templates/mapper.xml.vm";
-
-        // 自定义输出配置
-//        List<FileOutConfig> focList = new ArrayList<>();
-        // 自定义配置会被优先输出
-//        focList.add(new FileOutConfig(templatePath) {
-//            @Override
-//            public String outputFile(TableInfo tableInfo) {
-//                // 自定义输出文件名 , 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化!!
-//                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
-//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-//            }
-//        });
-        /*
-        cfg.setFileCreate(new IFileCreate() {
-            @Override
-            public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
-                // 判断自定义文件夹是否需要创建
-                checkDir("调用默认方法创建的目录");
-                return false;
-            }
-        });
-        */
-//        cfg.setFileOutConfigList(focList);
-//        mpg.setCfg(cfg);
-
-        // 配置模板
-        TemplateConfig templateConfig = new TemplateConfig();
-
-        // 配置自定义输出模板
-        //指定自定义模板路径,注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别
-        // templateConfig.setEntity("templates/entity2.java");
-        // templateConfig.setService();
-        // templateConfig.setController();
-
-        templateConfig.setXml(null);
-        mpg.setTemplate(templateConfig);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setSuperEntityClass("com.baomidou.mybatisplus.extension.activerecord.Model");
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-
-        strategy.setEntityLombokModel(true);
-        // 公共父类
-//        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
-        // 写于父类中的公共字段
-//        strategy.setSuperEntityColumns("id");
-        strategy.setInclude(scanner("表名,多个英文逗号分割").split(","));
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setTablePrefix(pc.getModuleName() + "_");
-        mpg.setStrategy(strategy);
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-    }
-}

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/EquipmentmodelController.java

@@ -1,20 +0,0 @@
-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-28
- */
-@RestController
-@RequestMapping("//equipmentmodel")
-public class EquipmentmodelController {
-
-}

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/LineController.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/MeterpointController.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/MeterpointvalueController.java

@@ -1,20 +0,0 @@
-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-21
- */
-@RestController
-@RequestMapping("//meterpointvalue")
-public class MeterpointvalueController {
-
-}

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/ProjectController.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/ShutdowneventController.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/WindpowerstationtestingpointController.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/WindturbineController.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/controller/WindturbinetestingpointaiController.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/EquipmentmodelMapper.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/LineMapper.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/ProjectMapper.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationMapper.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindpowerstationpointnewMapper.java

@@ -1,16 +0,0 @@
-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> {
-
-}

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindturbineMapper.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/mapper/auto/WindturbinetestingpointnewMapper.java

@@ -1,16 +0,0 @@
-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> {
-
-}

+ 0 - 65
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Equipmentmodel.java

@@ -1,65 +0,0 @@
-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-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("EQUIPMENTMODEL")
-public class Equipmentmodel extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("DESCRIPTION")
-    private String description;
-
-    @TableField("POWERPRODUCTION")
-    private Double powerproduction;
-
-    @TableField("CUTINWINDSPEED")
-    private Double cutinwindspeed;
-
-    @TableField("RATEDWINDSPEED")
-    private Double ratedwindspeed;
-
-    @TableField("CUTOUTWINDSPEED")
-    private String cutoutwindspeed;
-
-    @TableField("WINDTURBINEMANUFACTURERID")
-    private String windturbinemanufacturerid;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("UNIT")
-    private String unit;
-
-    @TableField("SWEPTAREA")
-    private Double sweptarea;
-
-    @TableField("EQUIPMENTCATEGORY")
-    private Double equipmentcategory;
-
-
-}

+ 0 - 53
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Line.java

@@ -1,53 +0,0 @@
-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-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("LINE")
-public class Line extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("ORDERNUM")
-    private Integer ordernum;
-
-    @TableField("CAPACITY")
-    private Integer capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Integer quantity;
-
-
-}

+ 0 - 70
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Project.java

@@ -1,70 +0,0 @@
-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;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("PROJECT")
-public class Project extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("CAPACITY")
-    private Integer capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Integer quantity;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("COMMISSIONDATE")
-    private Date commissiondate;
-
-    @TableField("MASTERPHONE")
-    private String masterphone;
-
-    @TableField("SHIFTFOREMAN")
-    private String shiftforeman;
-
-    @TableField("SHIFTFOREMANPHONE")
-    private String shiftforemanphone;
-
-    @TableField("ORDERNUM")
-    private Integer ordernum;
-
-
-}

+ 0 - 86
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstation.java

@@ -1,86 +0,0 @@
-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-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERSTATION")
-public class Windpowerstation extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ADDRESS")
-    private String address;
-
-    @TableField("TELEPHONE")
-    private String telephone;
-
-    @TableField("CAPACITY")
-    private Double capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private Double quantity;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-    @TableField("LATITUDE")
-    private Double latitude;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("COMPANYID")
-    private String companyid;
-
-    @TableField("SYSTEMMANUFACT")
-    private String systemmanufact;
-
-    @TableField("HEADFARM")
-    private String headfarm;
-
-    @TableField("HEADFARMPHONE")
-    private String headfarmphone;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("ORDERNUM")
-    private Double ordernum;
-
-    @TableField("ALTITUDE")
-    private Double altitude;
-
-    @TableField("HEIGHT")
-    private Double height;
-
-
-}

+ 0 - 77
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationpointnew.java

@@ -1,77 +0,0 @@
-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;
-
-
-}

+ 0 - 40
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationstandardpoint.java

@@ -1,40 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERSTATIONSTANDARDPOINT")
-public class Windpowerstationstandardpoint extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableField("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("ORDERNUM")
-    private String ordernum;
-
-
-}

+ 0 - 74
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windpowerstationtestingpoint.java

@@ -1,74 +0,0 @@
-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-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDPOWERSTATIONTESTINGPOINT")
-public class Windpowerstationtestingpoint extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("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;
-
-
-}

+ 0 - 67
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbine.java

@@ -1,67 +0,0 @@
-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;
-
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINE")
-public class Windturbine extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("LONGITUDE")
-    private Double longitude;
-
-    @TableField("LATITUDE")
-    private Double latitude;
-
-    @TableField("MODELID")
-    private String modelid;
-
-    @TableField("STATUS")
-    private String status;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("FIRSTINTEGRATEDTIME")
-    private Date firstintegratedtime;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("STANDARDID")
-    private String standardid;
-
-
-}

+ 0 - 40
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinestandardpoint.java

@@ -1,40 +0,0 @@
-package com.gyee.generation.model.auto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2022-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINESTANDARDPOINT")
-public class Windturbinestandardpoint extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableField("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("ORDERNUM")
-    private String ordernum;
-
-
-}

+ 0 - 80
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinestatusdi.java

@@ -1,80 +0,0 @@
-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-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINESTATUSDI")
-public class Windturbinestatusdi 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;
-
-
-}

+ 0 - 80
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinetestingpointai.java

@@ -1,80 +0,0 @@
-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-02-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINETESTINGPOINTAI")
-public class Windturbinetestingpointai 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;
-
-
-}

+ 0 - 80
realtime/generationXa-service/src/main/java/com/gyee/generation/model/auto/Windturbinetestingpointnew.java

@@ -1,80 +0,0 @@
-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;
-
-
-}

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IEquipmentmodelService.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/ILineService.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IProjectService.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindpowerstationService.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindpowerstationpointnewService.java

@@ -1,16 +0,0 @@
-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> {
-
-}

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindturbineService.java

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

+ 0 - 16
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/IWindturbinetestingpointnewService.java

@@ -1,16 +0,0 @@
-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> {
-
-}

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/EquipmentmodelServiceImpl.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/LineServiceImpl.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/ProjectServiceImpl.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindpowerstationServiceImpl.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindpowerstationpointnewServiceImpl.java

@@ -1,20 +0,0 @@
-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 {
-
-}

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindturbineServiceImpl.java

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

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/service/auto/impl/WindturbinetestingpointnewServiceImpl.java

@@ -1,20 +0,0 @@
-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 {
-
-}

+ 0 - 48
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/ApiGolden.java

@@ -1,48 +0,0 @@
-/** 
- * Project Name:nxfd2 
- * File Name:ApiEdos.java 
- * Package Name:com.gyee.frame.util
- * Date:2016-7-25下午12:26:14 
- * Copyright (c) 2016, chenzhou1025@126.com All Rights Reserved. 
- * 
- */
-
-package com.gyee.generation.util.realtimesource;
-
-import org.springframework.web.client.RestTemplate;
-
-/**
- * ClassName:ApiEdos <br/>
- * Function: TODO ADD FUNCTION. <br/>
- * Reason: TODO ADD REASON. <br/>
- * Date: 2016-7-25 下午12:26:14 <br/>
- * 
- * @author 石林
- * @version
- * @since JDK 1.6
- * @see
- */
-public class ApiGolden {
-
-    private static RestTemplate restTemplate = null;
-
-  
-    private ApiGolden() {
-
-    }
-
-    public static RestTemplate getInstance() {
-    	
-    	
-
-        if (restTemplate == null) {
-        	
-        	restTemplate = new RestTemplate();
-
-        }
-
-        return restTemplate;
-
-    }
-
-}

+ 0 - 27
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/GoldenConfig.java

@@ -1,27 +0,0 @@
-package com.gyee.generation.util.realtimesource;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 读取项目相关配置
- * 
- * @author gyee
- */
-
-@Configuration
-@ConfigurationProperties(prefix = "golden")
-public class GoldenConfig
-{
-    private static String baseURL;
-
-    public static String getBaseurl() {
-        return baseURL;
-    }
-
-    public  void setBaseurl(String baseURL) {
-        GoldenConfig.baseURL = baseURL;
-    }
-}
-
-

+ 0 - 262
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java

@@ -1,262 +0,0 @@
-package com.gyee.generation.util.realtimesource;
-
-
-import com.gyee.common.model.DNAStatVal;
-import com.gyee.common.model.DNAVal;
-import com.gyee.common.model.PointData;
-import com.gyee.generation.model.auto.Windpowerstationpointnew;
-import com.gyee.generation.model.auto.Windturbinetestingpointnew;
-
-import java.util.List;
-import java.util.Map;
-
-
-public interface IEdosUtil {
-
-	/**
-	 * 通过风场测点获得测点实时数据
-	 * @param point 只是用了code字段,作为唯一标识
-	 * @return
-	 * @throws Exception
-	 */
-    public PointData getRealData(Windpowerstationpointnew point) throws Exception;
-
-
-    /**
-     * 通过风场测点获得测点切面数据
-     * @param point 只是用了code字段,作为唯一标识
-     * @param date 时间
-     * @return
-     * @throws Exception
-     */
-    public PointData getSectionData(String point,Long date) throws Exception;
-
-
-    /**
-     * 通过风场测点获得测点切面数据
-     * @param point 只是用了code字段,作为唯一标识
-     * @param date 时间
-     * @return
-     * @throws Exception
-     */
-    public PointData getSectionData(Windpowerstationpointnew point,Long date) throws Exception;
-
-    /**
-     * 通过风机测点获得测点切面数据
-     * @param point 只是用了code字段,作为唯一标识
-     * @param date 时间
-     * @return
-     * @throws Exception
-     */
-    public PointData getSectionData(Windturbinetestingpointnew point,Long date) throws Exception;
-
-    /**
-     * 通过风场测点获得测点历史快照数据
-     * @param point 只是用了code字段,作为唯一标识
-     * @param beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param count  点数
-     * @param pried  时间间隔
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
-
-    /**
-     * 通过风场测点获得测点历史存储数据,存多少取多少
-     * @param point 只是用了code字段,作为唯一标识
-     * @param beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception;
-
-    /**
-     * 通过风机测点获得测点实时数据
-     * @param point 只是用了id字段,作为唯一标识
-     * @return
-     * @throws Exception
-     */
-    public PointData getRealData(Windturbinetestingpointnew point) throws Exception;
-
-    /**
-     * 通过风机测点获得历史快照
-     * @param point  只是用了id字段,作为唯一标识
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param count  点数
-     * @param pried  时间间隔
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
-
-    /**
-     * 通过风机测点获得测点历史存储数据,存多少取多少
-     * @param point 只是用了id字段,作为唯一标识
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception;
-
-
-    /**
-     * 通过风机测点获得测点实时数据
-     * @param pointid 测点编号
-     * @return
-     * @throws Exception
-     */
-    public PointData getRealData(String pointid) throws Exception;
-
-    /**
-     * 通过全局点名获得测点实时数据 读取多个点
-     * @param pointids 测点的数组
-     * @return 列表集合
-     * @throws Exception
-     */
-    public List<PointData> getRealData(String... pointids) throws Exception;
-    /**
-     * 通过全局点名获得测点实时数据 读取多个点
-     * @param pointids 测点的列表
-     * @return 列表集合
-     * @throws Exception
-     */
-    public List<PointData> getRealData(List<String> pointids) throws Exception;
-    /**
-     * 通过全局点名获得测点实时数据 读取多个点
-     * @param pointids 测点的数组
-     * @return Map集合
-     * @throws Exception
-     */
-    public Map<String,Double> getRealDataMap(String... pointids) throws Exception;
-
-    /**
-     * 通过全局点名获得历史数据快照
-     * @param pointid  全局点名
-     * @param beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param count  点数
-     * @param pried  时间间隔
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
-
-    /**
-     * 通过风机测点获得测点历史存储数据,存多少取多少
-     * @param pointid 全局点名
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasRaw(String pointid, Long beginDate, Long endDate) throws Exception;
-
-
-    /**
-     * 通过风机测点获得测点指定时间周期的统计数据
-     * @param point 只是用了id字段,作为唯一标识
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param count  点数
-     * @param pried  时间间隔
-     * @type 0、最大值。1、最小值。、平均值
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
-
-    /**
-     * 通过风场测点获得测点指定时间周期的统计数据
-     * @param point 只是用了code字段,作为唯一标识
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param count  点数
-     * @param pried  时间间隔
-     * @type 0、最大值。1、最小值。、平均值
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
-
-    /**
-     * 通过全局点名获得测点指定时间周期的统计数据
-     * @param pointid 全局点名
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param count  点数
-     * @param pried  时间间隔
-     * @type 0、最大值。1、最小值。、平均值
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistStat(String pointid, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
-
-    /**
-     * 通过全局点名获得测点指定时间周期的统计数据 同时返回max、min、avg数据
-     * @param point 全局点名
-     * @param  beginDate 开始时间(秒级)
-     * @param endDate 结束时间(秒级)
-     * @param pried  时间间隔
-     * @return
-     * @throws Exception
-     */
-    public DNAStatVal[] getHistStat(String point, Long beginDate, Long endDate, Integer pried) throws Exception;
-    /**
-     * 补录单点历史数据
-     * @param point 测点对象
-     * @return
-     * @throws Exception
-     */
-    public void updatePoint(PointData point) throws Exception;
-
-    /**
-     * 批量查询实时数据
-     * @param tagNames 测点字符串数组
-     * @return
-     * @throws Exception
-     */
-
-    public DNAVal[] getRealtimeTagValues(String... tagNames) throws Exception;
-
-    /**
-     * 批量插入历史数据
-     * @param pointls 测点对象集合
-     * @throws Exception
-     */
-    public void updatePoint(List<PointData> pointls) throws Exception;
-
-    /**
-     * 单点写入实时数据
-     * @param point 测点对象
-     * @throws Exception
-     */
-    public void sendSinglePoint(PointData point) throws Exception ;
-    /**
-     * 批量写入实时数据
-     * @param pointls 测点对象列表
-     * @throws Exception
-     */
-    public void sendMultiPoint(List<PointData> pointls) throws Exception ;
-
-    /**
-     * 通过两个字符串数组对象批量写入实时数据
-     * @param realvalue 插入值字符串数组
-     * @param pointls 存储对象数组对象
-     * @throws Exception
-     */
-
-    public void sendMultiPoint(String[] realvalue,DNAVal[] pointls) throws Exception;
-    /**
-     *
-     * @param nameList 测点名称列表集合
-     * @param tTime  时间点(秒级)
-     * @return
-     * @throws Exception
-     */
-    public DNAVal[] getHistMatrix(String[] nameList, int tTime) throws Exception;
-
-}

+ 0 - 34
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/StringUtil.java

@@ -1,34 +0,0 @@
-package com.gyee.generation.util.realtimesource;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * String辅助类
- * 
- */
-public class StringUtil extends StringUtils {
-	
-	/**
-	 * 非空判断
-	 * 
-	 * @param obj
-	 * @return
-	 */
-	public static boolean isNotBlank(Object obj) {
-		return !isBlank(obj);
-	}
-
-	/**
-	 * 为空判断
-	 * 
-	 * @param obj
-	 * @return
-	 */
-	public static boolean isBlank(Object obj) {
-		if (obj == null || StringUtils.isBlank(obj.toString())) {
-			return true;
-		}
-		return false;
-	}
-
-}

+ 0 - 28
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BaseTsQuery.java

@@ -1,28 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-@Data
-public class BaseTsQuery implements TsQuery {
-
-    private final TsPoint tsPoint;
-    private final long startTs;
-    private final long endTs;
-    private final int interval;
-    private final int limit;
-    private final Interpolation interpolation;
-
-    public BaseTsQuery(TsPoint tsPoint, long startTs, long endTs, int interval, int limit, Interpolation interpolation) {
-        this.tsPoint = tsPoint;
-        this.startTs = startTs;
-        this.endTs = endTs;
-        this.interval = interval;
-        this.limit = limit;
-        this.interpolation = interpolation;
-    }
-
-    public BaseTsQuery(TsPoint tsPoint, long startTs, long endTs) {
-        this(tsPoint, startTs, endTs, 1, 1, Interpolation.RAW);
-    }
-
-}

+ 0 - 38
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BasicTsData.java

@@ -1,38 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public abstract class BasicTsData implements TsData, Comparable<BasicTsData>{
-
-    private final long ts;
-
-    private final short status;
-
-    public BasicTsData(long ts, short status) {
-        this.ts = ts;
-        this.status = status;
-    }
-
-    public long getTs() {
-        return ts;
-    }
-
-    public short getStatus() {
-        return status;
-    }
-
-    @Override
-    public int compareTo(BasicTsData o) {
-        return Long.compare(ts, o.ts);
-    }
-
-    @Override
-    public String toString() {
-        return "BasicTsData{ts='" + ts +
-                "', status='" + this.getStatus() +
-                "'}";
-    }
-
-}
-

+ 0 - 29
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BasicTsPoint.java

@@ -1,29 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class BasicTsPoint implements TsPoint {
-
-    private final String id;
-
-    private final TsDataType tsDataType;
-
-    public BasicTsPoint(String id,  TsDataType tsDataType) {
-        this.id = id;
-        this.tsDataType = tsDataType;
-    }
-
-    public String getId() { return id; }
-
-    public TsDataType getTsDataType() {return tsDataType; }
-
-    @Override
-    public String toString() {
-        return "BasicTsPoint{id='" + id +
-                "', dataType='" + this.getTsDataType() +
-                "'}";
-    }
-
-}
-

+ 0 - 24
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BlobTsData.java

@@ -1,24 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import java.util.Base64;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class BlobTsData extends BasicTsData {
-
-    private final byte[] blob;
-
-    public BlobTsData(long ts, short status, byte[] blob) {
-        super(ts, status);
-        this.blob = blob;
-    }
-
-    //public byte[] getBlob() { return  blob ;}
-
-    public String getBlobValue() {
-        return Base64.getEncoder().encodeToString(blob);
-    }
-
-}
-

+ 0 - 22
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BlobWriteTsData.java

@@ -1,22 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-import java.util.Base64;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2018-05-04
- */
-@Data
-public class BlobWriteTsData {
-    private String tagName;
-    private long ts;
-    private  byte[]blob;
-
-    public String getValue() {
-        return Base64.getEncoder().encodeToString(blob);
-    }
-
-}

+ 0 - 24
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BooleanTsData.java

@@ -1,24 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class BooleanTsData extends BasicTsData {
-
-    private final boolean actualValue;
-
-    public BooleanTsData(long ts, short status, boolean actualValue) {
-        super(ts, status);
-        this.actualValue = actualValue;
-    }
-
-//    public boolean getActualValue() {
-//        return actualValue;
-//    }
-
-    public String getBooleanValue() {
-        return Boolean.toString(actualValue);
-    }
-
-}
-

+ 0 - 19
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/BooleanWriteTsData.java

@@ -1,19 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2018-05-04
- */
-@Data
-public class BooleanWriteTsData  {
-    private String tagName;
-    private long ts;
-    private boolean actualValue;
-
-    public boolean getValue() {
-        return this.actualValue;
-    }
-}

+ 0 - 18
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/Coordinate.java

@@ -1,18 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-@Data
-@AllArgsConstructor
-public class Coordinate {
-
-    private double latitude;
-
-    private double longitude;
-
-}
-

+ 0 - 26
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/CoordinateTsData.java

@@ -1,26 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class CoordinateTsData extends BasicTsData {
-
-    private final Coordinate coordinate;
-
-    public CoordinateTsData(long ts, short status, double latitude, double longitude) {
-        super(ts, status);
-        this.coordinate = new Coordinate(latitude, longitude);
-    }
-
-    public CoordinateTsData(long ts, short status, Coordinate coordinate) {
-        super(ts, status);
-        this.coordinate = coordinate;
-    }
-
-    public Coordinate getCoordinateValue() {
-        return coordinate;
-        //return String.format("{\"longitude\":%f,\"latitude\":\"%f\"}", longitude, latitude);
-    }
-
-}
-

+ 0 - 21
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/CoordinateWriteTsData.java

@@ -1,21 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2018-05-04
- */
-@Data
-public class CoordinateWriteTsData  {
-
-    private String tagName;
-    private long ts;
-    private  double latitude;
-    private  double longitude;
-
-    public double getLatitude() { return  latitude ;}
-    public double getLongitude() {return  longitude; }
-
-}

+ 0 - 30
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/DoubleStatData.java

@@ -1,30 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class DoubleStatData {
-
-    private DoubleTsData avg;
-    private DoubleTsData max;
-    private DoubleTsData min;
-
-    public DoubleStatData(DoubleTsData avg, DoubleTsData max, DoubleTsData min) {
-        this.avg = avg;
-        this.max = max;
-        this.min = min;
-    }
-
-    public DoubleTsData getAvg() {
-        return avg;
-    }
-
-    public DoubleTsData getMax() {
-        return max;
-    }
-
-    public DoubleTsData getMin() {
-        return min;
-    }
-}
-

+ 0 - 25
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/DoubleTsData.java

@@ -1,25 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class DoubleTsData extends BasicTsData {
-
-    private final double actualValue;
-
-    public DoubleTsData(long ts, short status, double actualValue) {
-        super(ts, status);
-        this.actualValue = actualValue;
-    }
-
-
-    public double getDoubleValue() {
-        return actualValue;
-    }
-
-//    public String getValue() {
-//        return Double.toString(actualValue);
-//    }
-
-}
-

+ 0 - 19
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/DoubleWriteTsData.java

@@ -1,19 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2018-05-04
- */
-@Data
-public class DoubleWriteTsData  {
-    private String tagName;
-    private long ts;
-    private double actualValue;
-
-    public double getValue() {
-        return this.actualValue;
-    }
-}

+ 0 - 38
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/ErrorRequest.java

@@ -1,38 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import com.gyee.common.model.PointData;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @descrition:接口请求失败返回操作类
- * @author:Wanghs
- * @date:2018-05-21
- */
-public class ErrorRequest {
-
-    public static List<PointData> RequestListError(String pointId) {
-        List<PointData> dataList = new ArrayList<>();
-        return dataList;
-    }
-
-    public static List<PointData> RequestListError(String... pointId) {
-        List<PointData> dataList = new ArrayList<>();
-        return dataList;
-    }
-
-    public static PointData RequestError(String pointId) {
-        PointData data = new PointData();
-        data.setPointValueInDouble(0);
-        data.setPointName("0");
-        return data;
-    }
-
-    public static Map<String, Double> RequestMapError() {
-        Map<String, Double> resultMap = new HashMap();
-        return resultMap;
-    }
-}

+ 0 - 27
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/GeneralTsData.java

@@ -1,27 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Optional;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GeneralTsData implements TsData {
-
-    private long ts;
-    private short status;
-    private Optional<Double> doubleValue;
-    private Optional<Long> longValue;
-    private Optional<Boolean> booleanValue;
-    private Optional<String> stringValue;
-    private Optional<String> blobValue;
-    private Optional<Coordinate> coordinateValue;
-
-}
-

+ 0 - 8
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/Interpolation.java

@@ -1,8 +0,0 @@
-
-package com.gyee.generation.util.realtimesource.timeseries;
-
-public enum Interpolation {
-    SNAP,   // 历史快照数据
-    INTERPOLATION, //插值
-    RAW    //原始数据
-}

+ 0 - 206
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/JsonObjectHelper.java

@@ -1,206 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-
-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 java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * @descrition:JSONObject转实体辅助类
- * @author:Wanghs
- * @date:2018-05-10
- */
-public class JsonObjectHelper {
-    public static List<PointData> phrasePointData(JSONArray jsonArray, String tagName) {
-        List<PointData> result = new ArrayList<>();
-
-        for (int i = 0; i < jsonArray.size(); i++) {
-            JSONObject tsData = jsonArray.getJSONObject(i);
-
-            Long ts = tsData.getLong("ts");
-            String pointValue = null;
-            if (tsData.containsKey("doubleValue")) {
-                pointValue = tsData.getString("doubleValue");
-            } else if (tsData.containsKey("booleanValue")) {
-                pointValue = tsData.getString("booleanValue");
-            } else if (tsData.containsKey("longValue")) {
-                pointValue = tsData.getString("longValue");
-            } else if (tsData.containsKey("stringValue")) {
-                pointValue = tsData.getString("stringValue");
-            }
-            PointData pointData = new PointData();
-            pointData.setEdnaId(tagName);
-            pointData.setPointName("1");
-            pointData.setPointTime(ts / 1000);
-            pointData.setPointValue(pointValue);
-            pointData.setPointValueInDouble(Double.parseDouble(pointValue));
-            //System.out.println("key= " + tagName + ", ts = " + ts + ", value = " + pointValue);
-            result.add(pointData);
-        }
-        return result;
-    }
-
-
-    public static List<PointData> phrasePointData(JSONObject jsonObject) {
-        List<PointData> result = new ArrayList<>();
-        Iterator<String> sIterator = jsonObject.keySet().iterator();
-        while (sIterator.hasNext()) {
-            // 获得key
-            String key = sIterator.next();
-            // 根据key获得value, value也可以是JSONObject,JSONArray,使用对应的参数接收即可
-            JSONObject jsonData = jsonObject.getJSONObject(key);
-            Long ts = 0l;
-
-            if (jsonData!=null){
-                ts  = jsonData.getLong("ts");
-                String pointValue = null;
-                if (jsonData.containsKey("doubleValue")) {
-                    pointValue = jsonData.getString("doubleValue");
-                } else if (jsonData.containsKey("booleanValue")) {
-                    pointValue = jsonData.getString("booleanValue");
-                } else if (jsonData.containsKey("longValue")) {
-                    pointValue = jsonData.getString("longValue");
-                } else if (jsonData.containsKey("stringValue")) {
-                    pointValue = jsonData.getString("stringValue");
-                }
-                PointData pointData = new PointData();
-                pointData.setEdnaId(key);
-                pointData.setPointName("1");
-                pointData.setPointValue(pointValue);
-                pointData.setPointTime(ts/1000);
-                if(pointValue.equals("false")  )
-                {
-                    pointData.setPointValueInDouble(0.0);
-                }else  if(pointValue.equals("true") )
-                {
-                    pointData.setPointValueInDouble(1.0);
-                }else
-                {
-                    pointData.setPointValueInDouble(Double.parseDouble(pointValue));
-                }
-
-                //  System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
-                result.add(pointData);
-            }
-        }
-        return result;
-    }
-    /**
-     * @param arry    DoubleStatData集合
-     * @param tagName 标签点名
-     * @param type    0、最大值。1、最小值。2、平均值
-     */
-    public static List<PointData> GeneralTsDataToPointDataByStat(JSONArray arry, String tagName, int type) {
-        List<PointData> result = new ArrayList<>();
-        for (int i = 0; i < arry.size(); i++) {
-            JSONObject jsonData = arry.getJSONObject(i);
-            PointData data = new PointData();
-            data.setEdnaId(tagName);
-            data.setPointName("1");
-            JSONObject avgData = null;
-            JSONObject maxData = null;
-            JSONObject minData = null;
-            if (jsonData.containsKey("avg")) {
-                avgData = jsonData.getJSONObject("avg");
-            }
-            if (jsonData.containsKey("max")) {
-                maxData = jsonData.getJSONObject("max");
-            }
-            if (jsonData.containsKey("min")) {
-                minData = jsonData.getJSONObject("min");
-            }
-            switch (type) {
-                case 0:
-                    data.setPointValue(String.valueOf(maxData.getString("doubleValue")));
-                    data.setPointValueInDouble(Double.valueOf(maxData.getString("doubleValue")));
-                    data.setPointTime(Long.valueOf(maxData.getString("ts")) / 1000);
-                    break;
-                case 1:
-                    data.setPointValue(String.valueOf(minData.getString("doubleValue")));
-                    data.setPointValueInDouble(Double.valueOf(minData.getString("doubleValue")));
-                    data.setPointTime(Long.valueOf(minData.getString("ts")) / 1000);
-                    break;
-                case 2:
-                    data.setPointValue(String.valueOf(avgData.getString("doubleValue")));
-                    data.setPointValueInDouble(Double.valueOf(avgData.getString("doubleValue")));
-                    data.setPointTime(Long.valueOf(avgData.getString("ts")) / 1000);
-                    break;
-                default:
-                    break;
-            }
-            result.add(data);
-        }
-        return result;
-    }
-
-    public static DNAVal[] phraseDNAVal(JSONObject jsonObject, String[] tagName) {
-        DNAVal[] arr = new DNAVal[jsonObject.size()];
-        List<DNAVal> list = new ArrayList<>();
-        Iterator<String> sIterator = jsonObject.keySet().iterator();
-
-        for (int i = 0; i < tagName.length; i++) {
-            // 获得key
-            String key = tagName[i];
-            // 根据key获得value, value也可以是JSONObject,JSONArray,使用对应的参数接收即可
-            JSONObject jsonData = jsonObject.getJSONObject(key);
-            DNAVal data = new DNAVal();
-            data.Time = Integer.parseInt(String.valueOf(Long.valueOf(jsonData.getString("ts")) / 1000));
-            data.Status = (short) jsonData.getShortValue("status");
-            data.DValue = (Double.valueOf(jsonData.getDoubleValue("doubleValue")));
-            list.add(data);
-        }
-
-        return list.toArray(arr);
-    }
-
-    public static DNAStatVal[] phraseDNAVal(JSONArray jsonArray) {
-
-        DNAStatVal[] arr = new DNAStatVal[jsonArray.size()];
-        List<DNAStatVal> list = new ArrayList<>();
-        for (int i = 0; i < jsonArray.size(); i++) {
-            JSONObject jsonData = jsonArray.getJSONObject(i);
-            JSONObject avgData = null;
-            JSONObject maxData = null;
-            JSONObject minData = null;
-            if (jsonData.containsKey("avg")) {
-                avgData = jsonData.getJSONObject("avg");
-            }
-            if (jsonData.containsKey("max")) {
-                maxData = jsonData.getJSONObject("max");
-            }
-            if (jsonData.containsKey("min")) {
-                minData = jsonData.getJSONObject("min");
-            }
-            DNAStatVal statVal = new DNAStatVal();
-
-            DNAVal avgVal = new DNAVal();
-            DNAVal maxVal = new DNAVal();
-            DNAVal minVal = new DNAVal();
-
-            avgVal.Time = Integer.valueOf(String.valueOf(Long.valueOf(avgData.getString("ts")) / 1000));
-            avgVal.DValue = Double.valueOf(avgData.getString("doubleValue"));
-
-            maxVal.Time =  Integer.valueOf(String.valueOf(Long.valueOf(maxData.getString("ts")) / 1000));
-            maxVal.DValue = Double.valueOf(maxData.getString("doubleValue"));
-
-            minVal.Time =  Integer.valueOf(String.valueOf(Long.valueOf(minData.getString("ts")) / 1000));
-            minVal.DValue = Double.valueOf(minData.getString("doubleValue"));
-
-            statVal.max = maxVal;
-            statVal.min = minVal;
-            statVal.avg = avgVal;
-
-            list.add(statVal);
-        }
-
-        return list.toArray(arr);
-    }
-
-}

+ 0 - 24
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/LongTsData.java

@@ -1,24 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class LongTsData extends BasicTsData {
-
-    private final long actualValue;
-
-    public LongTsData(long ts, short status, long actualValue) {
-        super(ts, status);
-        this.actualValue = actualValue;
-    }
-
-    public long getLongValue() {
-        return actualValue;
-    }
-
-//    public String getValue() {
-//        return Long.toString(actualValue);
-//    }
-
-}
-

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/LongWriteTsData.java

@@ -1,20 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2018-05-04
- */
-@Data
-public class LongWriteTsData  {
-
-    private String tagName;
-    private long ts;
-    private long actualValue;
-
-    public long getValue() {
-        return this.actualValue;
-    }
-}

+ 0 - 24
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/StringTsData.java

@@ -1,24 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public class StringTsData extends BasicTsData {
-
-    private final String actualValue;
-
-    public StringTsData(long ts, short status, String actualValue) {
-        super(ts, status);
-        this.actualValue = actualValue;
-    }
-
-//    public String getActualValue() {
-//        return actualValue;
-//    }
-
-    public String getStringValue() {
-        return actualValue;
-    }
-
-}
-

+ 0 - 34
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/StringUtil.java

@@ -1,34 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * String辅助类
- * 
- */
-public class StringUtil extends StringUtils {
-	
-	/**
-	 * 非空判断
-	 * 
-	 * @param obj
-	 * @return
-	 */
-	public static boolean isNotBlank(Object obj) {
-		return !isBlank(obj);
-	}
-
-	/**
-	 * 为空判断
-	 * 
-	 * @param obj
-	 * @return
-	 */
-	public static boolean isBlank(Object obj) {
-		if (obj == null || StringUtils.isBlank(obj.toString())) {
-			return true;
-		}
-		return false;
-	}
-
-}

+ 0 - 20
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/StringWriteTsData.java

@@ -1,20 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-import lombok.Data;
-
-/**
- * @descrition:String类型写入实体类
- * @author:Wanghs
- * @date:2018-05-04
- */
-@Data
-public class StringWriteTsData  {
-    private String tagName;
-    private long ts;
-    private String actualValue;
-
-    public String getValue() {
-        return this.actualValue;
-    }
-
-}

+ 0 - 15
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsData.java

@@ -1,15 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public interface TsData {
-
-    long getTs();
-
-    short getStatus();
-
-    //double getValue();
-
-}
-

+ 0 - 15
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsDataType.java

@@ -1,15 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public enum TsDataType {
-    LONG,
-    DOUBLE,
-    BOOLEAN,
-    STRING,
-    BLOB,
-    COORDINATE
-
-}
-

+ 0 - 12
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsPoint.java

@@ -1,12 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-public interface TsPoint {
-
-    String getId();
-
-    TsDataType getTsDataType();
-}
-

+ 0 - 36
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsPointData.java

@@ -1,36 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TsPointData {
-
-    private String tagName;
-    private GeneralTsData tsData;
-
-    public TsDataType findDataType() {
-        if (tsData.getDoubleValue().isPresent())
-            return TsDataType.DOUBLE;
-        else if (tsData.getBooleanValue().isPresent())
-            return TsDataType.BOOLEAN;
-        else if (tsData.getLongValue().isPresent())
-            return TsDataType.LONG;
-        else if (tsData.getStringValue().isPresent())
-            return TsDataType.STRING;
-        else if (tsData.getBlobValue().isPresent())
-            return TsDataType.BLOB;
-        else if (tsData.getCoordinateValue().isPresent())
-            return TsDataType.COORDINATE;
-
-        return TsDataType.DOUBLE;
-    }
-}
-

+ 0 - 23
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsPointDataList.java

@@ -1,23 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author songwb<songwb@aliyun.com>
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TsPointDataList {
-
-    private String tagName;
-
-    private List<GeneralTsData> tsDataList;
-
-}
-

+ 0 - 17
realtime/generationXa-service/src/main/java/com/gyee/generation/util/realtimesource/timeseries/TsQuery.java

@@ -1,17 +0,0 @@
-package com.gyee.generation.util.realtimesource.timeseries;
-
-public interface TsQuery {
-
-    TsPoint getTsPoint();
-
-    long getStartTs();
-
-    long getEndTs();
-
-    int getInterval();
-
-    int getLimit();
-
-    Interpolation getInterpolation();
-
-}

+ 0 - 98
realtime/generationXa-service/src/main/resources/application-dev.yml

@@ -1,98 +0,0 @@
-server:
-  port: 7011
-  servlet:
-    context-path: /
-
-
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
-  #redis集群
-  redis:
-    host: 10.83.68.94
-    port: 6379
-    timeout: 100000
-    #    集群环境打开下面注释,单机不需要打开
-    #    cluster:
-    #      集群信息
-    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
-    #      #默认值是5 一般当此值设置过大时,容易报:Too many Cluster redirections
-    #      maxRedirects: 3
-    password:
-    application:
-      name: test
-    jedis:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 8
-        max-wait: -1
-    database: 19
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: oracle.jdbc.OracleDriver
-    #外网
-    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    username: gdprod
-    password: gd123
-    oracle-schema=:
-    #    type: com.alibaba.druid.pool.DruidDataSource
-    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
-    #    username: root
-    #    password: root
-    #    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-    auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  global-config:
-    # 逻辑删除配置
-    db-config:
-      id-type: auto
-      # 删除前
-      logic-not-delete-value: 1
-      # 删除后
-      logic-delete-value: 0
-logging:
-  level:
-    root: info
-    com.example: debug
-
-
-db:
-  url: http://10.83.68.205:8011/ts
-
-runWindpowerstation: CL_FDC,KB_FDC,DX_FDC,SY_FDC
-
-
-
-
-
-
-
-

+ 0 - 117
realtime/generationXa-service/src/main/resources/application-jn.yml

@@ -1,117 +0,0 @@
-server:
-  port: 7012
-  servlet:
-    context-path: /
-
-
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
-  #redis集群
-  redis:
-    host: 10.81.3.155
-    port: 6379
-    timeout: 100000
-    #    集群环境打开下面注释,单机不需要打开
-#    cluster:
-#      #集群信息
-#      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
-#      #默认值是5 一般当此值设置过大时,容易报:Too many Cluster redirections
-#      maxRedirects: 3
-    password:
-    application:
-      name: test
-    jedis:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 8
-        max-wait: -1
-    database: 0
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
-    oracle-schema=:
-    #    type: com.alibaba.druid.pool.DruidDataSource
-    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
-    #    username: root
-    #    password: root
-    #    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-    auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  global-config:
-    # 逻辑删除配置
-    db-config:
-      id-type: auto
-      # 删除前
-      logic-not-delete-value: 1
-      # 删除后
-      logic-delete-value: 0
-logging:
-  level:
-    root: info
-    com.example: debug
-#db url
-db:
-  url: http://10.81.3.152:8011/ts
-#参与计算的场站
-runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC,PTZ_FDC,YLZ_FDC,ZK_FDC,NJL_FDC,YTY_FDC,PDL_FDC
-#计算状态用ai或者di
-clauStatus:
-  ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
-  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC,YTY01_GC,PDL01_GC
-#判断数据终端
-second: 1800
-#判断降出力
-AI134: 17.4    #叶轮转速给定
-AI178: 17.4    #转矩给定
-#AI443:容量
-
-#计算电量直接取,如果不是1就是相减算
-typeOfElectric:
-  #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 119
realtime/generationXa-service/src/main/resources/application-td.yml

@@ -1,119 +0,0 @@
-server:
-  port: 7012
-  servlet:
-    context-path: /
-
-
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
-  #redis集群
-  redis:
-    host: 10.81.3.155
-    port: 6379
-    timeout: 100000
-    #    集群环境打开下面注释,单机不需要打开
-    #    cluster:
-    #      #集群信息
-    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
-    #      #默认值是5 一般当此值设置过大时,容易报:Too many Cluster redirections
-    #      maxRedirects: 3
-    password:
-    application:
-      name: test
-    jedis:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 8
-        max-wait: -1
-    database: 0
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
-    oracle-schema=:
-    #    type: com.alibaba.druid.pool.DruidDataSource
-    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
-    #    username: root
-    #    password: root
-    #    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-    auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  global-config:
-    # 逻辑删除配置
-    db-config:
-      id-type: auto
-      # 删除前
-      logic-not-delete-value: 1
-      # 删除后
-      logic-delete-value: 0
-logging:
-  level:
-    root: info
-    com.example: debug
-#db url
-db:
-  url: http://10.81.3.152:8011/ts
-td:
-  url: http://localhost:8011/ts
-#参与计算的场站
-runWindpowerstation: YLZ_FDC
-#计算状态用ai或者di
-clauStatus:
-  ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
-  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC
-#判断数据终端
-second: 1800
-#判断降出力
-AI134: 17.4    #叶轮转速给定
-AI178: 17.4    #转矩给定
-#AI443:容量
-
-#计算电量直接取,如果不是1就是相减算
-typeOfElectric:
-  #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 98
realtime/generationXa-service/src/main/resources/application-test.yml

@@ -1,98 +0,0 @@
-server:
-  port: 7011
-  servlet:
-    context-path: /
-
-
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
-  #redis集群
-  redis:
-    host: 10.83.68.151
-    port: 6379
-    timeout: 100000
-    #    集群环境打开下面注释,单机不需要打开
-    cluster:
-      #集群信息
-      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
-      #默认值是5 一般当此值设置过大时,容易报:Too many Cluster redirections
-      maxRedirects: 3
-    password: Dsjpt@2021
-    application:
-      name: test
-    jedis:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 8
-        max-wait: -1
-    database: 0
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: oracle.jdbc.OracleDriver
-    #外网
-    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    username: gdprod
-    password: gd123
-    oracle-schema=:
-    #    type: com.alibaba.druid.pool.DruidDataSource
-    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
-    #    username: root
-    #    password: root
-    #    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-    auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  global-config:
-    # 逻辑删除配置
-    db-config:
-      id-type: auto
-      # 删除前
-      logic-not-delete-value: 1
-      # 删除后
-      logic-delete-value: 0
-logging:
-  level:
-    root: info
-    com.example: debug
-
-
-db:
-  url: http://10.83.68.205:8011/ts
-
-runWindpowerstation: CL_FDC,KB_FDC,DX_FDC,SY_FDC
-
-
-
-
-
-
-
-

+ 0 - 18
realtime/generationXa-service/src/main/resources/xxl-job-executor.properties

@@ -1,18 +0,0 @@
-### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
-
-### xxl-job, access token
-xxl.job.accessToken=
-
-### xxl-job executor appname
-xxl.job.executor.appname=generation-job
-### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
-xxl.job.executor.address=
-### xxl-job executor server-info
-xxl.job.executor.ip=
-xxl.job.executor.port=9101
-### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generation-job
-### xxl-job executor log-retention-days
-xxl.job.executor.logretentiondays=30
-

+ 0 - 1
web/consumer-hb/consumer-hb.iml

@@ -209,6 +209,5 @@
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.5" level="project" />
   </component>
 </module>

+ 0 - 1
web/initialpoint/initialpoint.iml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
-  <component name="ExternalSystem" externalSystem="Maven" />
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />