解决时间差问题

common/src/main/java/com/gyee/common/vo/benchmark/RankingVo.java

@@ -2,8 +2,6 @@ package com.gyee.common.vo.benchmark;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class RankingVo {
 
@@ -11,8 +9,8 @@ public class RankingVo {
     private String wtid;
     private String wpname;
     private String wtname;
-    private Date beginDate;
-    private Date endDate;
+    private Long beginDate;
+    private Long endDate;
     private Double speed;
     private Double power;
     private Double rankdata;

realtime/meteorologicalcollection/src/main/java/com/gyee/meteorological/task/SaticScheduleTask.java

@@ -26,7 +26,7 @@ public class SaticScheduleTask {
     /**
      * 定时采集
      */
-    @Scheduled(cron = "0 0/30 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
     private void analysisTasks() {

realtime/meteorologicalcollection/src/main/resources/application.yml

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

realtime/meteorologicalcollection/target/classes/application.yml

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

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/controller/ranking/RankingController.java

@@ -26,7 +26,6 @@ public class RankingController {
      */
     @GetMapping("/efficiencyRanking")
     @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R efficiencyRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
                   @RequestParam(value = "endDate",required = true) String endDate,
                   @RequestParam(value = "wpid",required = true) String wpid,
@@ -53,7 +52,6 @@ public class RankingController {
      */
     @GetMapping("/electricRanking")
     @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R electricRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
                                @RequestParam(value = "endDate",required = true) String endDate,
                                @RequestParam(value = "wpid",required = true) String wpid,

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/ranking/RankingService.java

@@ -37,7 +37,7 @@ public class RankingService {
         List<Windturbine> wtls = CacheContext.wtls;//缓存中获取风机列表
         Map<String, Windpowerstation> wpmap = CacheContext.wpmap;//缓存中获取风场列表
 
-        wtls.stream().forEach(wt->{
+        wtls.stream().filter(i->i.getWindpowerstationid().equals(wpid)).forEach(wt->{
             RankingVo vo = new RankingVo();
             List<Windturbineinfoday> windturbineinfodayList = dataList.stream().filter(d -> d.getWindturbineid().equals(wt.getId())).collect(Collectors.toList());
             OptionalDouble speedAverage = windturbineinfodayList.stream().mapToDouble(Windturbineinfoday::getSpeed).average();
@@ -58,8 +58,8 @@ public class RankingService {
             vo.setWpname(wpmap.get(windpowerstationid).getName());
             vo.setWtid(wt.getId());
             vo.setWtname(wt.getName());
-            vo.setBeginDate(begin);
-            vo.setEndDate(end);
+            vo.setBeginDate(begin.getTime());
+            vo.setEndDate(end.getTime());
             vo.setSpeed(speed);
             vo.setPower(power);
             vo.setRankdata(rankdata);
@@ -89,7 +89,7 @@ public class RankingService {
         List<Windturbine> wtls = CacheContext.wtls;//缓存中获取风机列表
         Map<String, Windpowerstation> wpmap = CacheContext.wpmap;//缓存中获取风场列表
 
-        wtls.stream().forEach(wt -> {
+        wtls.stream().filter(i->i.getWindpowerstationid().equals(wpid)).forEach(wt->{
             RankingVo vo = new RankingVo();
             List<Windturbineinfoday> windturbineinfodayList = dataList.stream().filter(d -> d.getWindturbineid().equals(wt.getId())).collect(Collectors.toList());
             OptionalDouble speedAverage = windturbineinfodayList.stream().mapToDouble(Windturbineinfoday::getSpeed).average();
@@ -110,8 +110,8 @@ public class RankingService {
             vo.setWpname(wpmap.get(windpowerstationid).getName());
             vo.setWtid(wt.getId());
             vo.setWtname(wt.getName());
-            vo.setBeginDate(begin);
-            vo.setEndDate(end);
+            vo.setBeginDate(begin.getTime());
+            vo.setEndDate(end.getTime());
             vo.setSpeed(speed);
             vo.setPower(power);
             vo.setRankdata(rankdata);

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

@@ -6,7 +6,7 @@ server:
 
 spring:
   application:
-    name: benchmarking-provider
+    name: benchmarking-provider-test
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   cloud:

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

@@ -6,7 +6,7 @@ server:
 
 spring:
   application:
-    name: benchmarking-provider
+    name: benchmarking-provider-test
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   cloud:

web/consumer/src/main/java/com/gyee/consumer/controller/ranking/RankingController.java

@@ -12,7 +12,7 @@ import javax.annotation.Resource;
 public class RankingController {
     @Resource
     private RankingApi rankingApi;
-    @GetMapping("/consumer/efficiencyRanking")
+    @GetMapping("/consumer/ranking/efficiencyRanking")
     public R efficiencyRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
                                @RequestParam(value = "endDate",required = true) String endDate,
                                @RequestParam(value = "wpid",required = true) String wpid,
@@ -22,7 +22,7 @@ public class RankingController {
         return rankingApi.efficiencyRanking(beginDate,endDate,wpid,orderby,isAsc);
 
     }
-    @GetMapping("/consumer/electricRanking")
+    @GetMapping("/consumer/ranking/electricRanking")
     public R electricRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
                              @RequestParam(value = "endDate",required = true) String endDate,
                              @RequestParam(value = "wpid",required = true) String wpid,

web/consumer/src/main/resources/application-dev.yml

@@ -71,7 +71,13 @@ spring:
       max-file-size: 200MB
       # 最大请求大小
       max-request-size: 215MB
-
+# feign调用超时时间配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 600000
 
 mybatis-plus:
   configuration:
@@ -92,9 +98,4 @@ logging:
     root: info
     com.example: debug
 
-url:
-  benchmaring: http://192.168.2.216:8081
-  analysis: http://192.168.2.216:8082
-  knowleage: http://192.168.2.216:8086
-
 

web/consumer/src/main/resources/application-test.yml

@@ -3,10 +3,9 @@ server:
   servlet:
     context-path: /
 
-
 spring:
   application:
-    name: consumer
+    name: consumer-test
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   cloud:
@@ -71,7 +70,13 @@ spring:
       max-file-size: 200MB
       # 最大请求大小
       max-request-size: 215MB
-
+# feign调用超时时间配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 600000
 
 mybatis-plus:
   configuration:
@@ -92,9 +97,5 @@ logging:
     root: info
     com.example: debug
 
-url:
-  benchmaring: http://192.168.2.216:8081
-  analysis: http://192.168.2.216:8082
-  knowleage: http://192.168.2.216:8086
 
 

web/consumer/target/classes/application-dev.yml

@@ -71,7 +71,13 @@ spring:
       max-file-size: 200MB
       # 最大请求大小
       max-request-size: 215MB
-
+# feign调用超时时间配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 600000
 
 mybatis-plus:
   configuration:
@@ -92,9 +98,4 @@ logging:
     root: info
     com.example: debug
 
-url:
-  benchmaring: http://192.168.2.216:8081
-  analysis: http://192.168.2.216:8082
-  knowleage: http://192.168.2.216:8086
-
 

web/consumer/target/classes/application-test.yml

@@ -3,10 +3,9 @@ server:
   servlet:
     context-path: /
 
-
 spring:
   application:
-    name: consumer
+    name: consumer-test
   main:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   cloud:
@@ -71,7 +70,13 @@ spring:
       max-file-size: 200MB
       # 最大请求大小
       max-request-size: 215MB
-
+# feign调用超时时间配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 600000
 
 mybatis-plus:
   configuration:
@@ -92,9 +97,5 @@ logging:
     root: info
     com.example: debug
 
-url:
-  benchmaring: http://192.168.2.216:8081
-  analysis: http://192.168.2.216:8082
-  knowleage: http://192.168.2.216:8086
 
 

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

@@ -1,14 +1,24 @@
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\ranking\RankingController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\healthmanagement\LevelAssessmentController.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\config\CorsConfig.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\specific\SpecificApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\ConsumerMain.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\benching\BenchmarkingApi.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\healthmanagement\LevelAssessmentApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\targetdata\TargetdataController.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\specific\SpecificController.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\datacenter\ParameterComparisonApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\AlgorithmController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\ranking\RankingApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\datacenter\DatacenterApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\config\RestTemplateConfig.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\targetdata\TargetdataApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\benching\BenchmarkingController.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\datacenter\DatacenterController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\threerate\ThreeRateApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\analysis\AnalysisController.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\knowleage\KnowleageController.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\analysis\AnalysisApi.java
+D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\api\knowleage\KnowledgeApi.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\threerate\ThreerateController.java
 D:\work\ideawork\sis\sis\web\consumer\src\main\java\com\gyee\consumer\controller\datacenter\ParameterComparisonController.java

web/monitor-web/pom.xml

@@ -1,82 +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>web</artifactId>
-        <groupId>com.gyee</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>monitor-web</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.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>
-            <version>2.3.28</version>
-        </dependency>
-        <!--mysql-connector-java-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.gyee</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.17</version>
-        </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>

web/monitor-web/src/main/java/com/gyee/knowledge/Monitor8083Main.java

@@ -1,19 +0,0 @@
-package com.gyee.knowledge;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @ClassName : Monitor8083Main
- * @Author : xieshengjie
- * @Date: 2021/12/10 10:46
- * @Description :
- */
-@SpringBootApplication
-@MapperScan("com.gyee.monitor.mapper")
-public class Monitor8083Main {
-    public static void main(String[] args) {
-        SpringApplication.run(Monitor8083Main.class,args);
-    }
-}

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

@@ -1,26 +0,0 @@
-package com.gyee.knowledge.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @ClassName : CorsConfig
- * @Author : xieshengjie
- * @Date: 2021/6/28 20:00
- * @Description :
- */
-@Configuration
-public class CorsConfig implements WebMvcConfigurer {
-
-    static final String[] ORIGINS = new String[]{"GET", "POST", "PUT", "DELETE"};  //请求方式
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**") //所有的当前站点的请求地址，都支持跨域访问
-                .allowedOrigins("*")// 所有的外部域都可跨域访问,这里注意2.4.0以后是allowedOriginPatterns，以前是allowedOrigins
-                .allowCredentials(true)  //是否支持跨域用户凭证
-                .allowedMethods(ORIGINS) //当前站点支持的跨域请求类型是什么
-                .maxAge(3600);  //超是时长，单位为秒。
-    }
-}

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

@@ -1,158 +0,0 @@
-package com.gyee.knowledge.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("nxfdprod");
-//        dsc.setPassword("gdnxfd123");
-////        dsc.setUrl("jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd");
-//        dsc.setUrl("jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd");
-//        mpg.setDataSource(dsc);
-
-        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-        dsc.setUsername("gdprod");
-        dsc.setPassword("gd123");
-//        dsc.setUrl("jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd");
-        dsc.setUrl("jdbc:oracle:thin:@10.83.68.165:1521:gdsj");
-        mpg.setDataSource(dsc);
-
-//        dsc.setDriverName("com.cloudera.impala.jdbc41.Driver");
-//        dsc.setUrl("jdbc:impala://192.168.1.67:21050/gyee_test");
-//        mpg.setDataSource(dsc);
-
-
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-//        pc.setModuleName(scanner("模块名"));
-        pc.setParent("com.gyee.monitor");
-        pc.setEntity("model.auto");
-        pc.setMapper("mapper.auto");
-        pc.setService("service.auto");
-        pc.setServiceImpl("service.auto.impl");
-        pc.setController("controller.auto");
-        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();
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.gyee.knowledge.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- *@ClassName MybatisPlusConfig
- *@Description 配置分页插件
- *@Author 谢生杰
- *@Date 2020/9/25 18:24
- *@Version 1.0
- **/
-@Configuration
-public class MybatisPlusConfig {
-    /**
-     * 分页插件
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
-}

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

@@ -1,71 +0,0 @@
-package com.gyee.knowledge.config;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @ClassName : R
- * @Author : xieshengjie
- * @Date: 2021/5/16 16:59
- * @Description : 结果集
- */
-@Data
-public class R {
-    @ApiModelProperty(value = "是否成功")
-    private Boolean success;
-    @ApiModelProperty(value = "返回码")
-    private Integer code;
-    @ApiModelProperty(value = "返回消息")
-    private String message;
-    @ApiModelProperty(value = "总数量")
-    private Integer count;
-    @ApiModelProperty(value = "返回数据")
-    private Object data = new Object();
-    private R(){}
-    public static R ok(){
-        R r = new R();
-        r.setSuccess(true);
-        r.setCode(ResultCode.SUCCESS);
-        r.setMessage("成功");
-        return r;
-    }
-    public static R ok(Integer count){
-        R r = new R();
-        r.setSuccess(true);
-        r.setCode(ResultCode.SUCCESS);
-        r.setMessage("成功");
-        r.setCount(count);
-        return r;
-    }
-    public static R error(){
-        R r = new R();
-        r.setSuccess(false);
-        r.setCode(ResultCode.ERROR);
-        r.setMessage("失败");
-        return r;
-    }
-    public R success(Boolean success){
-        this.setSuccess(success);
-        return this;
-    }
-    public R message(String message){
-        this.setMessage(message);
-        return this;
-    }
-    public R code(Integer code){
-        this.setCode(code);
-        return this;
-    }
-//    public R data(String key, Object value){
-//        this.data.put(key, value);
-//        return this;
-//    }
-//    public R data(Map<String, Object> map){
-//        this.setData(map);
-//        return this;
-//    }
-    public R data(Object value){
-        this.setData(value);
-        return this;
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.gyee.knowledge.config;
-
-/**
- * @ClassName : ResultCode
- * @Author : xieshengjie
- * @Date: 2021/5/16 17:01
- * @Description : 结果状态
- */
-public class ResultCode {
-    public static Integer SUCCESS = 200;
-    public static Integer ERROR = 500;
-}

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

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

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

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

web/monitor-web/src/main/java/com/gyee/knowledge/init/CacheContext.java

@@ -1,78 +0,0 @@
-package com.gyee.knowledge.init;
-
-
-import com.gyee.knowledge.model.auto.Windpowerstation;
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.knowledge.service.auto.IWindpowerstationService;
-import com.gyee.knowledge.service.auto.IWindpowerstationtestingpoint2Service;
-import com.gyee.knowledge.service.auto.IWindpowerstationtestingpointService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName : CacheContext
- * @Author : xieshengjie
- * @Date: 2021/11/16 16:29
- * @Description :
- */
-@Component
-public class CacheContext implements CommandLineRunner {
-
-    private static final Logger log = LoggerFactory.getLogger(CacheContext.class);
-    @Value("${isnx}")
-    private Boolean isnx;
-    @Resource
-    private IWindpowerstationService windpowerstationService;
-    @Resource
-    private IWindpowerstationtestingpoint2Service windpowerstationtestingpoint2Service;
-    @Resource
-    private IWindpowerstationtestingpointService windpowerstationtestingpointService;
-
-    public static Map<String,Map<String, Windpowerstationtestingpoint2>> wppointmap =new HashMap<>();
-
-    public static Map<String,Map<String, Windpowerstationtestingpoint>> wpointmap =new HashMap<>();
-
-    public static List<Windpowerstation> wpls = new ArrayList<>();
-
-    @Override
-    public void run(String... args) throws Exception {
-
-        log.info("-------------------------------缓存开始--------------------------------------");
-        if (!isnx){
-            wpls = windpowerstationService.list();
-            List<Windpowerstationtestingpoint> wplist = windpowerstationtestingpointService.list();
-            for (Windpowerstationtestingpoint windpowerstationtestingpoint : wplist) {
-                if (wpointmap.containsKey(windpowerstationtestingpoint.getWindpowerstationid())){
-                    wpointmap.get(windpowerstationtestingpoint.getWindpowerstationid()).put(windpowerstationtestingpoint.getUniformcode(),windpowerstationtestingpoint);
-                }else{
-                    Map<String,Windpowerstationtestingpoint> wpmap = new HashMap<>();
-                    wpmap.put(windpowerstationtestingpoint.getUniformcode(),windpowerstationtestingpoint);
-                    wpointmap.put(windpowerstationtestingpoint.getWindpowerstationid(),wpmap);
-                }
-            }
-        }else {
-            List<Windpowerstationtestingpoint2> wplist = windpowerstationtestingpoint2Service.list();
-            for (Windpowerstationtestingpoint2 windpowerstationtestingpoint2 : wplist) {
-                if (wppointmap.containsKey(windpowerstationtestingpoint2.getWindpowerstationid())){
-                    wppointmap.get(windpowerstationtestingpoint2.getWindpowerstationid()).put(windpowerstationtestingpoint2.getUniformcode(),windpowerstationtestingpoint2);
-                }else{
-                    Map<String,Windpowerstationtestingpoint2> wpmap = new HashMap<>();
-                    wpmap.put(windpowerstationtestingpoint2.getUniformcode(),windpowerstationtestingpoint2);
-                    wppointmap.put(windpowerstationtestingpoint2.getWindpowerstationid(),wpmap);
-                }
-            }
-        }
-
-        log.info("-------------------------------缓存结束--------------------------------------");
-    }
-}

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

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

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

@@ -1,16 +0,0 @@
-package com.gyee.knowledge.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface Windpowerstationtestingpoint2Mapper extends BaseMapper<Windpowerstationtestingpoint2> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.gyee.knowledge.mapper.auto;
-
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-12-10
- */
-public interface WindpowerstationtestingpointMapper extends BaseMapper<Windpowerstationtestingpoint> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.gyee.knowledge.mapper.auto;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface Windturbinetestingpointai2Mapper extends BaseMapper<Windturbinetestingpointai2> {
-
-}

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

@@ -1,87 +0,0 @@
-package com.gyee.knowledge.model.auto;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-12-10
- */
-@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 BigDecimal capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private BigDecimal quantity;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("LONGITUDE")
-    private BigDecimal longitude;
-
-    @TableField("LATITUDE")
-    private BigDecimal 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 BigDecimal ordernum;
-
-    @TableField("ALTITUDE")
-    private BigDecimal altitude;
-
-    @TableField("HEIGHT")
-    private BigDecimal height;
-
-
-}

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

@@ -1,75 +0,0 @@
-package com.gyee.knowledge.model.auto;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-12-10
- */
-@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 BigDecimal maxval;
-
-    @TableField("MINVAL")
-    private BigDecimal minval;
-
-    @TableField("REASONABLEMAXVAL")
-    private BigDecimal reasonablemaxval;
-
-    @TableField("REASONABLEMINVAL")
-    private BigDecimal reasonableminval;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("SHORTID")
-    private String shortid;
-
-    @TableField("LONGID")
-    private String longid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("REALTIMEID")
-    private String realtimeid;
-
-
-}

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

@@ -1,76 +0,0 @@
-package com.gyee.knowledge.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.math.BigDecimal;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("Windpowerstationtestingpoint2")
-public class Windpowerstationtestingpoint2 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 BigDecimal maxval;
-
-    @TableField("MINVAL")
-    private BigDecimal minval;
-
-    @TableField("REASONABLEMAXVAL")
-    private BigDecimal reasonablemaxval;
-
-    @TableField("REASONABLEMINVAL")
-    private BigDecimal reasonableminval;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("SHORTID")
-    private String shortid;
-
-    @TableField("LONGID")
-    private String longid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("REALTIMEID")
-    private String realtimeid;
-
-
-}

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

@@ -1,82 +0,0 @@
-package com.gyee.knowledge.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.math.BigDecimal;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("WINDTURBINETESTINGPOINTAI2")
-public class Windturbinetestingpointai2 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 BigDecimal maxval;
-
-    @TableField("MINVAL")
-    private BigDecimal minval;
-
-    @TableField("REASONABLEMAXVAL")
-    private BigDecimal reasonablemaxval;
-
-    @TableField("REASONABLEMINVAL")
-    private BigDecimal reasonableminval;
-
-    @TableField("WINDTURBINEID")
-    private String windturbineid;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("SHORTID")
-    private String shortid;
-
-    @TableField("LONGID")
-    private String longid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("REALTIMEID")
-    private String realtimeid;
-
-
-}

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

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

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

@@ -1,16 +0,0 @@
-package com.gyee.knowledge.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface IWindpowerstationtestingpoint2Service extends IService<Windpowerstationtestingpoint2> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.gyee.knowledge.service.auto;
-
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-12-10
- */
-public interface IWindpowerstationtestingpointService extends IService<Windpowerstationtestingpoint> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.gyee.knowledge.service.auto;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-public interface IWindturbinetestingpointai2Service extends IService<Windturbinetestingpointai2> {
-
-}

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

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

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

@@ -1,21 +0,0 @@
-package com.gyee.knowledge.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.knowledge.mapper.auto.Windpowerstationtestingpoint2Mapper;
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.knowledge.service.auto.IWindpowerstationtestingpoint2Service;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Service
-public class Windpowerstationtestingpoint2ServiceImpl extends ServiceImpl<Windpowerstationtestingpoint2Mapper, Windpowerstationtestingpoint2> implements IWindpowerstationtestingpoint2Service {
-
-}

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

@@ -1,20 +0,0 @@
-package com.gyee.knowledge.service.auto.impl;
-
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint;
-import com.gyee.knowledge.mapper.auto.WindpowerstationtestingpointMapper;
-import com.gyee.knowledge.service.auto.IWindpowerstationtestingpointService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-12-10
- */
-@Service
-public class WindpowerstationtestingpointServiceImpl extends ServiceImpl<WindpowerstationtestingpointMapper, Windpowerstationtestingpoint> implements IWindpowerstationtestingpointService {
-
-}

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

@@ -1,21 +0,0 @@
-package com.gyee.knowledge.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.gyee.knowledge.mapper.auto.Windturbinetestingpointai2Mapper;
-import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
-import com.gyee.knowledge.service.auto.IWindturbinetestingpointai2Service;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 谢生杰
- * @since 2021-05-13
- */
-@Service
-public class Windturbinetestingpointai2ServiceImpl extends ServiceImpl<Windturbinetestingpointai2Mapper, Windturbinetestingpointai2> implements IWindturbinetestingpointai2Service {
-
-}

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

@@ -1,22 +0,0 @@
-package com.gyee.knowledge.service.winpower;
-
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * @ClassName : WindpowerService
- * @Author : xieshengjie
- * @Date: 2021/12/10 11:14
- * @Description : 风功率监视service
- */
-@Service
-public class WindpowerService {
-    /**
-     * 获取风功率指标数据
-     * @return
-     */
-    public Map<String,Double> getWindpowertargetdata(){
-        return null;
-    }
-}

web/monitor-web/src/main/java/com/gyee/knowledge/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.knowledge.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;
-
-    }
-
-}

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

@@ -1,27 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}
-
-

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

@@ -1,234 +0,0 @@
-package com.gyee.knowledge.util.realtimesource;
-
-
-
-import com.gyee.common.model.DNAStatVal;
-import com.gyee.common.model.DNAVal;
-import com.gyee.common.model.PointData;
-import com.gyee.knowledge.model.auto.Windpowerstationtestingpoint2;
-import com.gyee.knowledge.model.auto.Windturbinetestingpointai2;
-
-import java.util.List;
-import java.util.Map;
-
-
-public interface IEdosUtil {
-
-	/**
-	 * 通过风场测点获得测点实时数据
-	 * @param point 只是用了code字段，作为唯一标识
-	 * @return
-	 * @throws Exception
-	 */
-    public PointData getRealData(Windpowerstationtestingpoint2 point) throws Exception;
-
-    /**
-     * 通过风场测点获得测点历史快照数据
-     * @param point 只是用了code字段，作为唯一标识
-     * @param beginDate 开始时间（秒级）
-     * @param endDate 结束时间（秒级）
-     * @param count  点数
-     * @param pried  时间间隔
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasSnap(Windpowerstationtestingpoint2 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(Windpowerstationtestingpoint2 point, Long beginDate, Long endDate) throws Exception;
-
-    /**
-     * 通过风机测点获得测点实时数据
-     * @param point 只是用了id字段，作为唯一标识
-     * @return
-     * @throws Exception
-     */
-    public PointData getRealData(Windturbinetestingpointai2 point) throws Exception;
-
-    /**
-     * 通过风机测点获得历史快照
-     * @param point  只是用了id字段，作为唯一标识
-     * @param  beginDate 开始时间（秒级）
-     * @param endDate 结束时间（秒级）
-     * @param count  点数
-     * @param pried  时间间隔
-     * @return
-     * @throws Exception
-     */
-    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointai2 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(Windturbinetestingpointai2 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(Windturbinetestingpointai2 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(Windpowerstationtestingpoint2 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;
-
-}

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

@@ -1,34 +0,0 @@
-package com.gyee.knowledge.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;
-	}
-
-}

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

@@ -1,28 +0,0 @@
-package com.gyee.knowledge.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);
-    }
-
-}

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

@@ -1,38 +0,0 @@
-package com.gyee.knowledge.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() +
-                "'}";
-    }
-
-}
-

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

@@ -1,29 +0,0 @@
-package com.gyee.knowledge.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() +
-                "'}";
-    }
-
-}
-

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

@@ -1,24 +0,0 @@
-package com.gyee.knowledge.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);
-    }
-
-}
-

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

@@ -1,22 +0,0 @@
-package com.gyee.knowledge.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);
-    }
-
-}

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

@@ -1,24 +0,0 @@
-package com.gyee.knowledge.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);
-    }
-
-}
-

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

@@ -1,19 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.gyee.knowledge.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;
-
-}
-

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

@@ -1,26 +0,0 @@
-package com.gyee.knowledge.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);
-    }
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.gyee.knowledge.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; }
-
-}

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

@@ -1,30 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}
-

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

@@ -1,25 +0,0 @@
-package com.gyee.knowledge.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);
-//    }
-
-}
-

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

@@ -1,19 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.gyee.knowledge.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;
-
-}
-

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

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

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

@@ -1,206 +0,0 @@
-package com.gyee.knowledge.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);
-    }
-
-}

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

@@ -1,24 +0,0 @@
-package com.gyee.knowledge.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);
-//    }
-
-}
-

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

@@ -1,20 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-
-}
-

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

@@ -1,34 +0,0 @@
-package com.gyee.knowledge.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;
-	}
-
-}

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

@@ -1,20 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-
-}

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

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

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

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

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

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

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

@@ -1,36 +0,0 @@
-package com.gyee.knowledge.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;
-    }
-}
-

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

@@ -1,23 +0,0 @@
-package com.gyee.knowledge.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;
-
-}
-

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

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

web/monitor-web/src/main/resources/application.yml

@@ -1,92 +0,0 @@
-server:
-  port: 8023
-  servlet:
-    context-path: /
-
-
-spring:
-  main:
-    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
-  #redis集群
-  redis:
-    #    host: 49.4.50.80
-    host: 10.155.32.4
-    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: gdnxfd123
-    application:
-      name: test
-    jedis:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 8
-        max-wait: -1
-    database: 1
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driver-class-name: oracle.jdbc.OracleDriver
-    #外网
-    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    #    url: jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd
-    #    url: jdbc:oracle:thin:@172.168.1.14:1521:gdnxfd
-    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
-
-golden:
-  baseURL: http://10.155.32.4:8011/ts
-
-isnx: false

web/monitor-web/src/test/java/com/gyee/knowledge/Monitortest.java

@@ -1,35 +0,0 @@
-package com.gyee.knowledge;
-
-import com.gyee.knowledge.model.auto.Windpowerstation;
-import com.gyee.knowledge.service.auto.IWindpowerstationService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @ClassName : Monitortest
- * @Author : xieshengjie
- * @Date: 2021/12/10 14:55
- * @Description :
- */
-@Slf4j
-@SpringBootTest
-@RunWith(SpringRunner.class)
-@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
-public class Monitortest {
-    @Resource
-    private IWindpowerstationService windpowerstationService;
-    @Test
-    public void test(){
-        List<Windpowerstation> list = windpowerstationService.list();
-        System.out.println(list);
-
-    }
-}

web/pom.xml

@@ -15,7 +15,6 @@
         <module>algorithm-web</module>
         <module>benchmarking-web</module>
         <module>consumer</module>
-        <module>monitor-web</module>
         <module>adapter-td-hb</module>
         <module>benchmarking-web-hb</module>
         <module>analysis-web-hb</module>