Merge remote-tracking branch 'origin/master'

gyee-sample-impala/pom.xml

@@ -70,6 +70,11 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
         <!--常用工具类 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -112,6 +117,7 @@
             <artifactId>quartz</artifactId>
         </dependency>
 
+        <!--mybatis依赖-->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -144,14 +150,31 @@
         <!--http请求-->
 
         <!--redis-->
+        <!--<dependency>-->
+            <!--<groupId>redis.clients</groupId>-->
+            <!--<artifactId>jedis</artifactId>-->
+            <!--<version>3.2.0</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
+        <!--</dependency>-->
+
+        <!--常用工具类 -->
         <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>3.2.0</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
         </dependency>
 
         <!-- 添加 lib -->

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/GyeeSampleImpalaApplication.java

@@ -1,16 +1,20 @@
-package com.gyee.sampleimpala;
+package com.gyee.impala;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
+/**
+ * 使用exclude = {DataSourceAutoConfiguration.class}
+ * 禁用springboot默认加载的application.properties单数据源配置
+ * 关闭springBoot关于mybatisPlus的一些自动注入
+ */
 @EnableCaching
 @EnableScheduling
-@SpringBootApplication
-@MapperScan("com.gyee.sampleimpala.mapper")
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class GyeeSampleImpalaApplication {
 
     public static void main(String[] args) {

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/base/ExcludeQueryWrapper.java

@@ -1,10 +1,9 @@
-package com.gyee.sampleimpala.common.base;
+package com.gyee.impala.common.base;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 
 import java.util.Collection;
-import java.util.Objects;
 
 public class ExcludeQueryWrapper<T> extends QueryWrapper<T> {
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/config/CorsConfig.java

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

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/config/BaseConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.config;
+package com.gyee.impala.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 @Data
 @Component
 @ConfigurationProperties(prefix = "gyee")
-public class BaseConfig {
+public class GyeeConfig {
 
     /**数据适配器网址 **/
     private String baseurl;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/config/MapperGenerator.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.config;
+package com.gyee.impala.common.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
@@ -23,21 +23,21 @@ public class MapperGenerator {
     private static String canonicalPath = "";
 
     //基本包名
-    private static String basePackage = "com.gyee.sampleimpala";
+    private static String basePackage = "com.gyee.impala";
     //作者
     private static String authorName = "chenmh";
     //要生成的表名
-    private static String[] tables = {"caseperformance"};
+    private static String[] tables = {""};
     //table前缀
     private static String prefix = "";
 
     //数据库类型
-    private static DbType dbType = DbType.MYSQL;
+    private static DbType dbType = DbType.ORACLE;
     //数据库配置四要素
-    private static String driverName = "com.mysql.cj.jdbc.Driver";
-    private static String url = "jdbc:mysql://localhost:3306/gyee_sample_kudu?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC";
-    private static String username = "root";
-    private static String password = "";
+    private static String driverName = "oracle.jdbc.driver.OracleDriver";
+    private static String url = "jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd";
+    private static String username = "nxfdprod";
+    private static String password = "gdnxfd123";
 
     public static void main(String[] args) {
         AutoGenerator gen = new AutoGenerator();

gyee-sample-impala/src/main/java/com/gyee/impala/common/config/datasource/MasterDataSourceConfig.java

@@ -0,0 +1,65 @@
+package com.gyee.impala.common.config.datasource;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+
+/**
+ *@ClassName MybatisPlusConfig
+ *@Description
+ *@Version 1.0
+ *
+ * 大数据 kudu 库
+ *
+ **/
+
+@Configuration
+@MapperScan(basePackages = "com.gyee.impala.mapper.master",sqlSessionFactoryRef = "masterSqlSessionFactory")
+public class MasterDataSourceConfig {
+
+    @Bean(name = "master")
+    @Primary
+    @ConfigurationProperties("spring.datasource.druid.master")
+    public DataSource masterDataSource(){
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "masterSqlSessionFactory")
+    @Primary
+    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("master") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean sessionFactoryBean = new MybatisSqlSessionFactoryBean();
+        sessionFactoryBean.setDataSource(dataSource);
+
+        sessionFactoryBean.setMapperLocations(
+                new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/master/*.xml"));
+
+        return sessionFactoryBean.getObject();
+    }
+
+    @Bean("masterSqlSessionTemplate")
+    @Primary
+    public SqlSessionTemplate masterSqlSessionTemplate(
+            @Qualifier("masterSqlSessionFactory") SqlSessionFactory sessionFactory) {
+        return new SqlSessionTemplate(sessionFactory);
+    }
+
+    /**
+     * 分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/impala/common/config/datasource/SlaveDataSourceConfig.java

@@ -0,0 +1,46 @@
+package com.gyee.impala.common.config.datasource;
+
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * 三区oracle库
+ */
+@Configuration
+@MapperScan(basePackages = "com.gyee.impala.mapper.slave",sqlSessionFactoryRef = "slaveSqlSessionFactory")
+public class SlaveDataSourceConfig {
+
+    @Bean(name = "slave")
+    @ConfigurationProperties("spring.datasource.druid.slave")
+    public DataSource slaveDataSource(){
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "slaveSqlSessionFactory")
+    public SqlSessionFactory slaveSqlSessionFactory(@Qualifier("slave") DataSource dataSource) throws Exception {
+        MybatisSqlSessionFactoryBean sessionFactoryBean = new MybatisSqlSessionFactoryBean();
+        sessionFactoryBean.setDataSource(dataSource);
+
+        sessionFactoryBean.setMapperLocations(
+                new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/slave/*.xml"));
+
+        return sessionFactoryBean.getObject();
+    }
+
+    @Bean("slaveSqlSessionTemplate")
+    public SqlSessionTemplate slaveSqlSessionTemplate(
+            @Qualifier("slaveSqlSessionFactory") SqlSessionFactory sessionFactory) {
+        return new SqlSessionTemplate(sessionFactory);
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/constant/Constants.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.constant;
+package com.gyee.impala.common.constant;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -19,4 +19,8 @@ public class Constants {
     public static final String POINT_POWER = "AI130";
     // 风机理论功率
     public static final String POINT_POWER_LLGL = "LLGL";
+    // 风向
+    public static final String POINT_WIND_DIRECT = "AI008";
+    // 对风角度（对风误差）
+    public static final String POINT_WIND_ANGLE = "AI036";
 }

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/exception/AdviceException.java

@@ -1,8 +1,8 @@
-package com.gyee.sampleimpala.common.exception;
+package com.gyee.impala.common.exception;
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.web.bind.annotation.ExceptionHandler;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/exception/CustomException.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.common.exception;
+package com.gyee.impala.common.exception;
 
-import com.gyee.sampleimpala.common.result.ResultCode;
+import com.gyee.impala.common.result.ResultCode;
 import lombok.Data;
 
 @Data

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/feign/IAdapterService.java

@@ -1,7 +1,7 @@
-package com.gyee.sampleimpala.common.feign;
+package com.gyee.impala.common.feign;
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.model.custom.TsPointData;
+import com.gyee.impala.model.custom.TsPointData;
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/feign/RemoteServiceBuilder.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.feign;
+package com.gyee.impala.common.feign;
 
 import feign.Feign;
 import feign.Request;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/result/JsonResult.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.result;
+package com.gyee.impala.common.result;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
@@ -53,7 +53,7 @@ public class JsonResult extends HashMap<String, Object> implements Serializable
         JSONObject json = new JSONObject();
         json.put("code", code.getCode());
         json.put("msg", code.getMessage());
-        json.put("data", data);
+        json.put("data", data != null ? data : "");
         return json;
     }
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/result/ResultCode.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.result;
+package com.gyee.impala.common.result;
 
 /*
  * #1001～1999 区间表示参数错误

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/spring/InitialRunner.java

@@ -1,10 +1,9 @@
-package com.gyee.sampleimpala.common.spring;
+package com.gyee.impala.common.spring;
 
-import com.gyee.sampleimpala.common.cache.IGlobalCache;
-import com.gyee.sampleimpala.model.kudu.Windpowerstation;
-import com.gyee.sampleimpala.model.kudu.Windturbine;
-import com.gyee.sampleimpala.service.kudu.WindpowerstationService;
-import com.gyee.sampleimpala.service.kudu.WindturbineService;
+import com.gyee.impala.model.master.Windpowerstation;
+import com.gyee.impala.model.master.Windturbine;
+import com.gyee.impala.service.master.WindpowerstationService;
+import com.gyee.impala.service.master.WindturbineService;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
@@ -31,13 +30,13 @@ public class InitialRunner implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-        wpList = windpowerstationService.getAll();
-
-        if (wpList != null && wpList.size() > 0){
-            for (Windpowerstation station : wpList){
-                List<Windturbine> winds = windturbineService.getWindTurbineId(station.getId());
-                wtMap.put(station.getId(), winds);
-            }
-        }
+//        wpList = windpowerstationService.getAll();
+//
+//        if (wpList != null && wpList.size() > 0){
+//            for (Windpowerstation station : wpList){
+//                List<Windturbine> winds = windturbineService.getWindTurbineId(station.getId());
+//                wtMap.put(station.getId(), winds);
+//            }
+//        }
     }
 }

gyee-sample-impala/src/main/java/com/gyee/impala/common/util/DateUtil.java

@@ -0,0 +1,445 @@
+package com.gyee.impala.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+@Slf4j
+public class DateUtil extends DateUtils {
+
+    /**
+     * 获取当前时间
+     *
+     * @return
+     */
+    public static String getCurrentDate() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        String date = df.format(new Date());
+        return date;
+    }
+
+    /**
+     * 获取前 N 小时的时间
+     *
+     * @param hour
+     * @return
+     */
+    public static String getPreviousDate(int hour) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - hour);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = df.format(calendar.getTime());
+        return date;
+    }
+
+    /**
+     * 获取当前时间后 N 小时的时间
+     *
+     * @param hour
+     * @return
+     */
+    public static String getNextDate(int hour) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) + hour);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = df.format(calendar.getTime());
+        return date;
+    }
+
+    /**
+     * 获取当前时间后 N 小时的时间
+     *
+     * @param hour
+     * @return
+     */
+    public static Long getNextDateTimestamp(int hour) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) + hour);
+        long time = calendar.getTime().getTime();
+        return time;
+    }
+
+
+    /**
+     * 字符串时间转时间戳
+     * @param time
+     * @return
+     */
+    public static Long covertDateTimestamp(String time){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long stamp = 0;
+        try {
+            stamp = sdf.parse(time).getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return stamp;
+    }
+
+    /**
+     * 时间格式(yyyy-MM-dd)
+     */
+    public final static String DATE_PATTERN = "yyyy-MM-dd";
+    /**
+     * 时间格式(yyyy-MM-dd HH:mm:ss)
+     */
+    public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+    public static String format(Date date) {
+        return format(date, DATE_PATTERN);
+    }
+
+    public static String formatDateTime(Date date) {
+        return format(date, DATE_TIME_PATTERN);
+    }
+    /**
+     * 时间转换
+     *
+     * @param date
+     * @param pattern
+     * @return
+     */
+    public static String format(Date date, String pattern) {
+        if (date != null) {
+            SimpleDateFormat df = new SimpleDateFormat(pattern);
+            return df.format(date);
+        }
+        return null;
+    }
+
+    /**
+     * 时间转换
+     *
+     * @param time
+     * @param pattern
+     * @return
+     */
+    public static String format(Long time, String pattern) {
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date date = new Date(time);
+        String format = sdf.format(date);
+        return format;
+    }
+
+
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     *
+     * @return String
+     */
+    public static String getDate() {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTime() {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow() {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format) {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date) {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date) {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts) {
+        try {
+            return new SimpleDateFormat(format).parse(ts);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            return parseDate(str.toString(), parsePatterns);
+        } catch (ParseException e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate() {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算两个时间差
+     */
+    public static String getDatePoor(Date endDate, Date nowDate) {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+
+    /**
+     * 将时间的时分秒毫秒字段去掉
+     *
+     * @param date
+     * @return
+     */
+    public static Date truncate(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+
+    /**
+     * 计算两个时间之间差的天数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static int daysDiff(Date d1, Date d2) {
+        return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 60 * 24 * 1000));
+    }
+
+    /**
+     * 将字符串日期转换成日期类型
+     *
+     * @param time
+     * @return
+     */
+    public static Date parseStrtoDate(String time) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return dateTime;
+    }
+
+    public static Date parseStrtoDate(String time,String pattern) {
+
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date dateTime = null;
+        try {
+            dateTime = sdf.parse(time);
+        } catch (ParseException e) {
+            e.printStackTrace();
+
+        }
+        return dateTime;
+    }
+
+    public static double hoursDiff1(Date d1, Date d2) {
+        return Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (double) (60 * 60 * 1000));
+    }
+
+    public static double hoursDiff2(Date d1, Date d2) {
+        return Math.abs((d1.getTime() - d2.getTime())) / (double) (60 * 60 * 1000);
+    }
+
+    /**
+     * 计算两个时间之间差的分钟数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static int minutesDiff(Date d1, Date d2) {
+        return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 1000));
+    }
+
+    /**
+     * 计算两个时间之间差的分钟数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static double minutesDiff2(Date d1, Date d2) {
+        return Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 1000));
+    }
+
+    /**
+     * 获取系统时间
+     *
+     * @return
+     */
+    public static Date now() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前月的第一天
+     *
+     * @return
+     */
+    public static String getCurrtenFirstDay() {
+
+        Calendar c = Calendar.getInstance();
+        // c.add(Calendar.MONTH, 0);
+        c.set(Calendar.DAY_OF_MONTH, 1);
+        return new SimpleDateFormat("yyyy-MM-dd").format(c.getTime());
+    }
+
+    /**
+     * 获取当前月的最后一天
+     *
+     * @return
+     */
+    public static String getCurrtenLastDay() {
+
+        Calendar ca = Calendar.getInstance();
+        ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+        return new SimpleDateFormat("yyyy-MM-dd").format(ca.getTime());
+    }
+    /**
+     * 计算两个时间之间差的小时数(取整后)
+     *
+     * @param d1
+     * @param d2
+     * @return
+     */
+    public static int hoursDiff(Date d1, Date d2) {
+        return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 60 * 1000));
+    }
+
+    /**
+     * 获取当前整点数
+     *
+     * @return
+     */
+    public static Date getCurrHourTime(Date date) {
+        Calendar ca = Calendar.getInstance();
+        int minute = ca.get(Calendar.MINUTE);
+        if (minute < 30) {
+            ca.set(Calendar.MINUTE, 30);
+        } else {
+            ca.add(Calendar.HOUR, 1);
+            ca.set(Calendar.MINUTE, 0);
+        }
+
+        ca.set(Calendar.SECOND, 5);
+        date = ca.getTime();
+
+        return date;
+    }
+
+    //普通时间转为UTC
+    public static String localToUTC(String localTimeStr) {
+        try {
+            Date localDate = getLocalSDF().parse(localTimeStr);
+            return getUTCSDF().format(localDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    //UTC转为普通时间
+    public static String utcToLocal(String utcTimeStr) {
+        try {
+            Date date = getUTCSDF().parse(utcTimeStr);
+            return getLocalSDF().format(date);
+
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static SimpleDateFormat getLocalSDF() {
+        return new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    private static SimpleDateFormat getUTCSDF() {
+        SimpleDateFormat utcSDF = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        utcSDF.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return utcSDF;
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(getCurrentDate());
+        System.out.println(getPreviousDate(3 * 360 * 24));
+//        System.out.println(covertDateTimestamp("2021-05-12 00:00:00"));
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/impala/common/util/FileUtil.java

@@ -0,0 +1,48 @@
+package com.gyee.impala.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
+@Slf4j
+public class FileUtil {
+
+    /**
+     * 写入文件
+     * @param fileName
+     * @param list
+     */
+    public static void writeFile(String fileName, List<String> list){
+        File file = null;
+        BufferedWriter bw = null;
+
+        if (list == null || list.size() < 0)
+            return;
+
+        try {
+            file = new File("D://" + fileName + ".txt");
+            if (file.exists()) file.delete();
+            else file.createNewFile();
+
+            bw = new BufferedWriter(new FileWriter(file, false));
+
+            for (String str : list){
+                bw.write(str);
+                bw.flush();
+            }
+
+        } catch (Exception e){
+            log.error(e.getMessage());
+        } finally {
+            try {
+                bw.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/util/SnowFlakeGenerator.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.util;
+package com.gyee.impala.common.util;
 
 
 /**
@@ -13,7 +13,7 @@ package com.gyee.sampleimpala.common.util;
  * 加起来刚好64位，为一个Long型。<br>
  * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
  */
-public class SnowFlakeGenerator {
+public class SnowFlakeUtil {
 
     // ==============================Fields===========================================
     /** 开始时间截 (2015-01-01) */
@@ -64,7 +64,7 @@ public class SnowFlakeGenerator {
      * @param workerId 工作ID (0~31)
      * @param datacenterId 数据中心ID (0~31)
      */
-    public SnowFlakeGenerator(long workerId, long datacenterId) {
+    public SnowFlakeUtil(long workerId, long datacenterId) {
         if (workerId > maxWorkerId || workerId < 0) {
             throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
         }
@@ -135,11 +135,11 @@ public class SnowFlakeGenerator {
     }
 
 
-    private static SnowFlakeGenerator idWorker = null;
+    private static SnowFlakeUtil idWorker = null;
 
     public static String generateId() {
         if (idWorker == null)
-            idWorker = new SnowFlakeGenerator(0, 0);
+            idWorker = new SnowFlakeUtil(0, 0);
 
         return String.valueOf(idWorker.nextId());
 //        for (int i = 0; i < 1000; i++) {

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/util/StationMapperUtil.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.common.util;
+package com.gyee.impala.common.util;
 
 import org.apache.commons.lang3.StringUtils;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/AnalysePerformanceWarningController.java

@@ -1,12 +1,11 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Casefault;
-import com.gyee.sampleimpala.model.kudu.Caseperformance;
-import com.gyee.sampleimpala.service.kudu.CaseperformanceService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Caseperformance;
+import com.gyee.impala.service.master.CaseperformanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;

gyee-sample-impala/src/main/java/com/gyee/impala/controller/AnalyseScatterController.java

@@ -0,0 +1,109 @@
+package com.gyee.impala.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.gyee.impala.common.constant.Constants;
+import com.gyee.impala.common.feign.RemoteServiceBuilder;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.model.custom.TsPointData;
+import com.gyee.impala.model.custom.YawValuesVo;
+import com.gyee.impala.model.master.Tempscatterpoint;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.model.slave.Windturbinecurvefittingmonth;
+import com.gyee.impala.model.slave.Windturbinewindyaw;
+import com.gyee.impala.service.custom.AnalyseScatterService;
+import com.gyee.impala.service.master.TempscatterpointService;
+import com.gyee.impala.service.master.WindturbinepointService;
+import com.gyee.impala.service.slave.WindturbinecurvefittingmonthService;
+import com.gyee.impala.service.slave.WindturbinewindyawService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * 功率曲线拟合
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/scatter")
+public class AnalyseScatterController {
+
+    @Autowired
+    private WindturbinewindyawService windturbinewindyawService;
+    @Autowired
+    private AnalyseScatterService scatterService;
+
+
+    /**
+     * 查询风机功率曲线拟合数据
+     *
+     * @param station 场站
+     * @param wtId    风机ID
+     * @param time    时间
+     * @return
+     */
+    @PostMapping("/list")
+    public JSONObject getScatterItem(String station, String wtId, String time){
+        Map<String, List<List<Double>>> result = scatterService.getScatterList(station, wtId, time);
+
+        if (null != result) {
+            return JsonResult.successData(ResultCode.SUCCESS, result);
+        } else {
+            return JsonResult.error(ResultCode.ERROR);
+        }
+    }
+
+
+    /**
+     * 偏航对风 通过计算服务取数
+     * @param wtId
+     * @param time
+     * @return
+     */
+    @PostMapping("/range")
+    public JSONObject getTotalRanges(String wtId, String time){
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(DateUtil.dateTime(DateUtil.YYYY_MM, time));
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+        Date startDate = cal.getTime();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        Date endDate = cal.getTime();
+
+        List<YawValuesVo> list = windturbinewindyawService.getYawTotalAll(wtId, startDate, endDate);
+
+        if (null != list) {
+            return JsonResult.successData(ResultCode.SUCCESS, list);
+        } else {
+            return JsonResult.error(ResultCode.ERROR);
+        }
+    }
+
+    /**
+     * 偏航对风 通过测点自己计算
+     * @param wtId
+     * @param time
+     * @return
+     */
+    @PostMapping("/range/cal")
+    public JSONObject getTotalRangeCal(String wtId, String time){
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+        long startTime = cal.getTime().getTime();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        long endTime = cal.getTime().getTime();
+
+        scatterService.getTotalRangeCal(wtId, startTime, endTime);
+
+        if (null != list) {
+            return JsonResult.successData(ResultCode.SUCCESS, list);
+        } else {
+            return JsonResult.error(ResultCode.ERROR);
+        }
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/BasicQueryConditionsController.java

@@ -1,16 +1,15 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.common.config.DatabasesConfig;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Knowfaulttype;
-import com.gyee.sampleimpala.model.kudu.Windpowerstation;
-import com.gyee.sampleimpala.service.custom.TablePropService;
-import com.gyee.sampleimpala.service.kudu.KnowfaulttypeService;
-import com.gyee.sampleimpala.service.kudu.WindpowerstationService;
-import com.gyee.sampleimpala.service.kudu.WindturbineService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Knowfaulttype;
+import com.gyee.impala.model.master.Windpowerstation;
+import com.gyee.impala.service.custom.TablePropService;
+import com.gyee.impala.service.master.KnowfaulttypeService;
+import com.gyee.impala.service.master.WindpowerstationService;
+import com.gyee.impala.service.master.WindturbineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,8 +33,6 @@ public class BasicQueryConditionsController {
     @Autowired
     private TablePropService tablePropService;
     @Autowired
-    private DatabasesConfig databasesConfig;
-    @Autowired
     private WindturbineService windturbineService;
     @Autowired
     private KnowfaulttypeService knowfaulttypeServicet;
@@ -48,26 +45,15 @@ public class BasicQueryConditionsController {
 
 
     /**
-     * 查询表
-     * @return
-     */
-    @GetMapping("/tables")
-    public JSONObject tables(){
-        List<String> list = databasesConfig.getBasictables();
-        return JsonResult.successData(ResultCode.SUCCESS, list);
-    }
-
-
-    /**
      * 查询表的所有数据
      * @param table
      * @return
      */
-    @GetMapping("/tables/data")
-    public JSONObject tableDataAll(String table){
-        List<Object> list = tablePropService.listData(table);
-        return JsonResult.successData(ResultCode.SUCCESS, list);
-    }
+//    @GetMapping("/tables/data")
+////    public JSONObject tableDataAll(String table){
+////        List<Object> list = tablePropService.listData(table);
+////        return JsonResult.successData(ResultCode.SUCCESS, list);
+////    }
 
 
     /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/CaseFaultAlgController.java

@@ -1,13 +1,11 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Casefault;
-import com.gyee.sampleimpala.model.kudu.Casefaultalg;
-import com.gyee.sampleimpala.model.kudu.Knowfaultfix;
-import com.gyee.sampleimpala.service.kudu.CasefaultalgService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Casefaultalg;
+import com.gyee.impala.service.master.CasefaultalgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/CaseFaultController.java

@@ -1,12 +1,10 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.cloudera.impala.jdbc41.internal.com.cloudera.altus.shaded.javax.ws.rs.HEAD;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Casefault;
-import com.gyee.sampleimpala.model.kudu.Casefaultalg;
-import com.gyee.sampleimpala.service.kudu.CasefaultService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Casefault;
+import com.gyee.impala.service.master.CasefaultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,17 +29,20 @@ public class CaseFaultController {
      * @param widget   故障部件
      * @param st       开始时间
      * @param et       结束时间
+     * @param category 故障分类  0-检修故障数据  1-无监督学习手动打标签  2-有监督算法打标签  3-scada报警
      * @param ids      oracle关联的faultid
      * @return
      */
     @GetMapping("/fault/list")
     public JSONObject faultAll(String station, String[] model, String[] widget,
-                                 String st, String et, Long[] ids){
-        List<Casefault> list = casefaultService.getAll(station, model, widget, st, et, ids);
+                               String st, String et, String category, Long[] ids){
+
+        List<Casefault> list = casefaultService.getAll(station, model, widget, st, et, category, ids);
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 
 
+
     /**
      * 批量新增或修改数据
      * @param list

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/CasePerformanceController.java

@@ -1,13 +1,13 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Caseperformance;
-import com.gyee.sampleimpala.service.custom.GoldenService;
-import com.gyee.sampleimpala.service.kudu.CaseperformanceService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Caseperformance;
+import com.gyee.impala.service.custom.GoldenService;
+import com.gyee.impala.service.master.CaseperformanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/KnowBasicController.java

@@ -1,15 +1,15 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Knowfaultfix;
-import com.gyee.sampleimpala.model.kudu.Knowfaultsymptom;
-import com.gyee.sampleimpala.model.kudu.Knowfaulttype;
-import com.gyee.sampleimpala.service.kudu.KnowfaultfixService;
-import com.gyee.sampleimpala.service.kudu.KnowfaultsymptomService;
-import com.gyee.sampleimpala.service.kudu.KnowfaulttypeService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Knowfaultfix;
+import com.gyee.impala.model.master.Knowfaultsymptom;
+import com.gyee.impala.model.master.Knowfaulttype;
+import com.gyee.impala.service.master.KnowfaultfixService;
+import com.gyee.impala.service.master.KnowfaultsymptomService;
+import com.gyee.impala.service.master.KnowfaulttypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/WindturbinePointController.java

@@ -1,12 +1,12 @@
-package com.gyee.sampleimpala.controller;
+package com.gyee.impala.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.gyee.sampleimpala.common.result.JsonResult;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
-import com.gyee.sampleimpala.service.custom.GoldenService;
-import com.gyee.sampleimpala.service.kudu.WindturbinepointService;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.service.custom.GoldenService;
+import com.gyee.impala.service.master.WindturbinepointService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/CasefaultMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Casefault;
+import com.gyee.impala.model.master.Casefault;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/CasefaultalgMapper.java

@@ -1,8 +1,8 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.sampleimpala.model.kudu.Casefaultalg;
+import com.gyee.impala.model.master.Casefaultalg;
 
 /**
  * <p>

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/CaseperformanceMapper.java

@@ -1,7 +1,7 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.sampleimpala.model.kudu.Caseperformance;
+import com.gyee.impala.model.master.Caseperformance;
 
 /**
  * <p>

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/KnowalgMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowalg;
+import com.gyee.impala.model.master.Knowalg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/KnowfaultfixMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowfaultfix;
+import com.gyee.impala.model.master.Knowfaultfix;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/KnowfaultsymptomMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowfaultsymptom;
+import com.gyee.impala.model.master.Knowfaultsymptom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/KnowfaulttypeMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowfaulttype;
+import com.gyee.impala.model.master.Knowfaulttype;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/impala/mapper/master/TempscatterpointMapper.java

@@ -0,0 +1,8 @@
+package com.gyee.impala.mapper.master;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.impala.model.master.Tempscatterpoint;
+
+public interface TempscatterpointMapper extends BaseMapper<Tempscatterpoint> {
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/WindpowerstationMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Windpowerstation;
+import com.gyee.impala.model.master.Windpowerstation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/WindturbineMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Windturbine;
+import com.gyee.impala.model.master.Windturbine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/WindturbinemetricsMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Windturbinemetrics;
+import com.gyee.impala.model.master.Windturbinemetrics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/mapper/kudu/WindturbinepointMapper.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.mapper.kudu;
+package com.gyee.impala.mapper.master;
 
-import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
+import com.gyee.impala.model.master.Windturbinepoint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/impala/mapper/slave/WindturbinecurvefittingmonthMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.impala.mapper.slave;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.impala.model.slave.Windturbinecurvefittingmonth;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+public interface WindturbinecurvefittingmonthMapper extends BaseMapper<Windturbinecurvefittingmonth> {
+
+}

gyee-sample-impala/src/main/java/com/gyee/impala/mapper/slave/WindturbinewindyawMapper.java

@@ -0,0 +1,38 @@
+package com.gyee.impala.mapper.slave;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.impala.model.custom.YawValuesVo;
+import com.gyee.impala.model.slave.Windturbinewindyaw;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+@Mapper
+public interface WindturbinewindyawMapper extends BaseMapper<Windturbinewindyaw> {
+
+    @Select("select windturbineid wtId, sum(\"R-50\") \"Rf50\",\n" +
+            "sum(\"R-49\") \"Rf49\",sum(\"R-48\") \"Rf48\",sum(\"R-47\") \"Rf47\",sum(\"R-46\") \"Rf46\",sum(\"R-45\") \"Rf45\",sum(\"R-44\") \"Rf44\",sum(\"R-43\") \"Rf43\",sum(\"R-42\") \"Rf42\",sum(\"R-41\") \"Rf41\",sum(\"R-40\") \"Rf40\",\n" +
+            "sum(\"R-39\") \"Rf39\",sum(\"R-38\") \"Rf38\",sum(\"R-37\") \"Rf37\",sum(\"R-36\") \"Rf36\",sum(\"R-35\") \"Rf35\",sum(\"R-34\") \"Rf34\",sum(\"R-33\") \"Rf33\",sum(\"R-32\") \"Rf32\",sum(\"R-31\") \"Rf31\",sum(\"R-30\") \"Rf30\",\n" +
+            "sum(\"R-29\") \"Rf29\",sum(\"R-28\") \"Rf28\",sum(\"R-27\") \"Rf27\",sum(\"R-26\") \"Rf26\",sum(\"R-25\") \"Rf25\",sum(\"R-24\") \"Rf24\",sum(\"R-23\") \"Rf23\",sum(\"R-22\") \"Rf22\",sum(\"R-21\") \"Rf21\",sum(\"R-20\") \"Rf20\",\n" +
+            "sum(\"R-19\") \"Rf19\",sum(\"R-18\") \"Rf18\",sum(\"R-17\") \"Rf17\",sum(\"R-16\") \"Rf16\",sum(\"R-15\") \"Rf15\",sum(\"R-14\") \"Rf14\",sum(\"R-13\") \"Rf13\",sum(\"R-12\") \"Rf12\",sum(\"R-11\") \"Rf11\",sum(\"R-10\") \"Rf10\",\n" +
+            "sum(\"R-9\") \"Rf9\",sum(\"R-8\") \"Rf8\",sum(\"R-7\") \"Rf7\",sum(\"R-6\") \"Rf6\",sum(\"R-5\") \"Rf5\",sum(\"R-4\") \"Rf4\",sum(\"R-3\") \"Rf3\",sum(\"R-2\") \"Rf2\",sum(\"R-1\") \"Rf1\",\n" +
+            "sum(\"R0\") \"R0\",sum(\"R1\") \"R1\",sum(\"R2\") \"R2\",sum(\"R3\") \"R3\",sum(\"R4\") \"R4\",sum(\"R5\") \"R5\",sum(\"R6\") \"R6\",sum(\"R7\") \"R7\",sum(\"R8\") \"R8\",sum(\"R9\") \"R9\",\n" +
+            "sum(\"R10\") \"R10\",sum(\"R11\") \"R11\",sum(\"R12\") \"R12\",sum(\"R13\") \"R13\",sum(\"R14\") \"R14\",sum(\"R15\") \"R15\", sum(\"R16\") \"R16\",sum(\"R17\") \"R17\",sum(\"R18\") \"R18\",sum(\"R19\") \"R19\",\n" +
+            "sum(\"R20\") \"R20\",sum(\"R21\") \"R21\",sum(\"R22\") \"R22\",sum(\"R23\") \"R23\",sum(\"R24\") \"R24\",sum(\"R25\") \"R25\", sum(\"R26\") \"R26\",sum(\"R27\") \"R27\",sum(\"R28\") \"R28\",sum(\"R29\") \"R29\",\n" +
+            "sum(\"R30\") \"R30\",sum(\"R31\") \"R31\",sum(\"R32\") \"R32\",sum(\"R33\") \"R33\",sum(\"R34\") \"R34\",sum(\"R35\") \"R35\", sum(\"R36\") \"R36\",sum(\"R37\") \"R37\",sum(\"R38\") \"R38\",sum(\"R39\") \"R39\",\n" +
+            "sum(\"R40\") \"R40\",sum(\"R41\") \"R41\",sum(\"R42\") \"R42\",sum(\"R43\") \"R43\",sum(\"R44\") \"R44\",sum(\"R45\") \"R45\", sum(\"R46\") \"R46\",sum(\"R47\") \"R47\",sum(\"R48\") \"R48\",sum(\"R49\") \"R49\",sum(\"R50\") \"R50\" \n" +
+            "from WindturbineWindYaw where windturbineid=#{wtId} and recorddate >= #{beginDate} and recorddate <= #{endDate} group by windturbineid")
+    List<YawValuesVo> getYawTotalAll(@Param("wtId")String wtId, @Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/custom/TableProp.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.custom;
+package com.gyee.impala.model.custom;
 
 import lombok.Data;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/custom/TsPointData.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.custom;
+package com.gyee.impala.model.custom;
 
 import java.math.BigDecimal;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/custom/WindPowerStationTestingPoint2.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.custom;
+package com.gyee.impala.model.custom;
 
 
 import java.io.Serializable;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/custom/WindTurbineTestingPointAi2.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.custom;
+package com.gyee.impala.model.custom;
 
 
 import java.io.Serializable;

gyee-sample-impala/src/main/java/com/gyee/impala/model/custom/YawValuesVo.java

@@ -0,0 +1,926 @@
+package com.gyee.impala.model.custom;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class YawValuesVo implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private String wtId;
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-50
+     *
+     * @mbg.generated
+     */
+    private Integer rf50;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-49
+     *
+     * @mbg.generated
+     */
+    private Integer rf49;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-48
+     *
+     * @mbg.generated
+     */
+    private Integer rf48;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-47
+     *
+     * @mbg.generated
+     */
+    private Integer rf47;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-46
+     *
+     * @mbg.generated
+     */
+    private Integer rf46;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-45
+     *
+     * @mbg.generated
+     */
+    private Integer rf45;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-44
+     *
+     * @mbg.generated
+     */
+    private Integer rf44;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-43
+     *
+     * @mbg.generated
+     */
+    private Integer rf43;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-42
+     *
+     * @mbg.generated
+     */
+    private Integer rf42;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-41
+     *
+     * @mbg.generated
+     */
+    private Integer rf41;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-40
+     *
+     * @mbg.generated
+     */
+    private Integer rf40;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-39
+     *
+     * @mbg.generated
+     */
+    private Integer rf39;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-38
+     *
+     * @mbg.generated
+     */
+    private Integer rf38;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-37
+     *
+     * @mbg.generated
+     */
+    private Integer rf37;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-36
+     *
+     * @mbg.generated
+     */
+    private Integer rf36;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-35
+     *
+     * @mbg.generated
+     */
+    private Integer rf35;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-34
+     *
+     * @mbg.generated
+     */
+    private Integer rf34;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-33
+     *
+     * @mbg.generated
+     */
+    private Integer rf33;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-32
+     *
+     * @mbg.generated
+     */
+    private Integer rf32;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-31
+     *
+     * @mbg.generated
+     */
+    private Integer rf31;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-30
+     *
+     * @mbg.generated
+     */
+    private Integer rf30;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-29
+     *
+     * @mbg.generated
+     */
+    private Integer rf29;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-28
+     *
+     * @mbg.generated
+     */
+    private Integer rf28;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-27
+     *
+     * @mbg.generated
+     */
+    private Integer rf27;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-26
+     *
+     * @mbg.generated
+     */
+    private Integer rf26;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-25
+     *
+     * @mbg.generated
+     */
+    private Integer rf25;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-24
+     *
+     * @mbg.generated
+     */
+    private Integer rf24;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-23
+     *
+     * @mbg.generated
+     */
+    private Integer rf23;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-22
+     *
+     * @mbg.generated
+     */
+    private Integer rf22;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-21
+     *
+     * @mbg.generated
+     */
+    private Integer rf21;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-20
+     *
+     * @mbg.generated
+     */
+    private Integer rf20;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-19
+     *
+     * @mbg.generated
+     */
+    private Integer rf19;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-18
+     *
+     * @mbg.generated
+     */
+    private Integer rf18;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-17
+     *
+     * @mbg.generated
+     */
+    private Integer rf17;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-16
+     *
+     * @mbg.generated
+     */
+    private Integer rf16;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-15
+     *
+     * @mbg.generated
+     */
+    private Integer rf15;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-14
+     *
+     * @mbg.generated
+     */
+    private Integer rf14;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-13
+     *
+     * @mbg.generated
+     */
+    private Integer rf13;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-12
+     *
+     * @mbg.generated
+     */
+    private Integer rf12;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-11
+     *
+     * @mbg.generated
+     */
+    private Integer rf11;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-10
+     *
+     * @mbg.generated
+     */
+    private Integer rf10;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-9
+     *
+     * @mbg.generated
+     */
+    private Integer rf9;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-8
+     *
+     * @mbg.generated
+     */
+    private Integer rf8;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-7
+     *
+     * @mbg.generated
+     */
+    private Integer rf7;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-6
+     *
+     * @mbg.generated
+     */
+    private Integer rf6;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-5
+     *
+     * @mbg.generated
+     */
+    private Integer rf5;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-4
+     *
+     * @mbg.generated
+     */
+    private Integer rf4;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-3
+     *
+     * @mbg.generated
+     */
+    private Integer rf3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-2
+     *
+     * @mbg.generated
+     */
+    private Integer rf2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R-1
+     *
+     * @mbg.generated
+     */
+    private Integer rf1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R0
+     *
+     * @mbg.generated
+     */
+    private Integer r0;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R1
+     *
+     * @mbg.generated
+     */
+    private Integer r1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R2
+     *
+     * @mbg.generated
+     */
+    private Integer r2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R3
+     *
+     * @mbg.generated
+     */
+    private Integer r3;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R4
+     *
+     * @mbg.generated
+     */
+    private Integer r4;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R5
+     *
+     * @mbg.generated
+     */
+    private Integer r5;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R6
+     *
+     * @mbg.generated
+     */
+    private Integer r6;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R7
+     *
+     * @mbg.generated
+     */
+    private Integer r7;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R8
+     *
+     * @mbg.generated
+     */
+    private Integer r8;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R9
+     *
+     * @mbg.generated
+     */
+    private Integer r9;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R10
+     *
+     * @mbg.generated
+     */
+    private Integer r10;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R11
+     *
+     * @mbg.generated
+     */
+    private Integer r11;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R12
+     *
+     * @mbg.generated
+     */
+    private Integer r12;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R13
+     *
+     * @mbg.generated
+     */
+    private Integer r13;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R14
+     *
+     * @mbg.generated
+     */
+    private Integer r14;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R15
+     *
+     * @mbg.generated
+     */
+    private Integer r15;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R16
+     *
+     * @mbg.generated
+     */
+    private Integer r16;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R17
+     *
+     * @mbg.generated
+     */
+    private Integer r17;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R18
+     *
+     * @mbg.generated
+     */
+    private Integer r18;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R19
+     *
+     * @mbg.generated
+     */
+    private Integer r19;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R20
+     *
+     * @mbg.generated
+     */
+    private Integer r20;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R21
+     *
+     * @mbg.generated
+     */
+    private Integer r21;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R22
+     *
+     * @mbg.generated
+     */
+    private Integer r22;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R23
+     *
+     * @mbg.generated
+     */
+    private Integer r23;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R24
+     *
+     * @mbg.generated
+     */
+    private Integer r24;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R25
+     *
+     * @mbg.generated
+     */
+    private Integer r25;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R26
+     *
+     * @mbg.generated
+     */
+    private Integer r26;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R27
+     *
+     * @mbg.generated
+     */
+    private Integer r27;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R28
+     *
+     * @mbg.generated
+     */
+    private Integer r28;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R29
+     *
+     * @mbg.generated
+     */
+    private Integer r29;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R30
+     *
+     * @mbg.generated
+     */
+    private Integer r30;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R31
+     *
+     * @mbg.generated
+     */
+    private Integer r31;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R32
+     *
+     * @mbg.generated
+     */
+    private Integer r32;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R33
+     *
+     * @mbg.generated
+     */
+    private Integer r33;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R34
+     *
+     * @mbg.generated
+     */
+    private Integer r34;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R35
+     *
+     * @mbg.generated
+     */
+    private Integer r35;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R36
+     *
+     * @mbg.generated
+     */
+    private Integer r36;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R37
+     *
+     * @mbg.generated
+     */
+    private Integer r37;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R38
+     *
+     * @mbg.generated
+     */
+    private Integer r38;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R39
+     *
+     * @mbg.generated
+     */
+    private Integer r39;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R40
+     *
+     * @mbg.generated
+     */
+    private Integer r40;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R41
+     *
+     * @mbg.generated
+     */
+    private Integer r41;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R42
+     *
+     * @mbg.generated
+     */
+    private Integer r42;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R43
+     *
+     * @mbg.generated
+     */
+    private Integer r43;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R44
+     *
+     * @mbg.generated
+     */
+    private Integer r44;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R45
+     *
+     * @mbg.generated
+     */
+    private Integer r45;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R46
+     *
+     * @mbg.generated
+     */
+    private Integer r46;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R47
+     *
+     * @mbg.generated
+     */
+    private Integer r47;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R48
+     *
+     * @mbg.generated
+     */
+    private Integer r48;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R49
+     *
+     * @mbg.generated
+     */
+    private Integer r49;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column WINDTURBINEPOWERYAW.R50
+     *
+     * @mbg.generated
+     */
+    private Integer r50;
+}
+

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Casefault.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -74,6 +74,15 @@ public class Casefault extends Model<Casefault> {
     private String category;
 
 
+    /**
+     * 前端精度丢失
+     * @return
+     */
+    public String getFaultIds(){
+        return this.faultid + "";
+    }
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Casefaultalg.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Caseperformance.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Knowalg.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Knowfaultfix.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Knowfaultsymptom.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Knowfaulttype.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/impala/model/master/Tempscatterpoint.java

@@ -0,0 +1,37 @@
+package com.gyee.impala.model.master;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tempscatterpoint")
+public class Tempscatterpoint extends Model<Tempscatterpoint> {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+
+    private String station;
+
+    private String windturbineid;
+
+    private String time;
+
+    private String scatter;
+
+    private String lineactual;
+
+    private String lineoptimal;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Windpowerstation.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Windturbine.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Windturbinemetrics.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Windturbinepoint.java

@@ -1,4 +1,4 @@
-package com.gyee.sampleimpala.model.kudu;
+package com.gyee.impala.model.master;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

gyee-sample-impala/src/main/java/com/gyee/impala/model/slave/Windturbinecurvefittingmonth.java

@@ -0,0 +1,56 @@
+package com.gyee.impala.model.slave;
+
+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 java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("WINDTURBINECURVEFITTINGMONTH")
+public class Windturbinecurvefittingmonth extends Model<Windturbinecurvefittingmonth> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+    private Integer id;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("SPEED")
+    private Double speed;
+
+    @TableField("ACTUALPOWER")
+    private Double actualpower;
+
+    @TableField("OPTIMALPOWER")
+    private Double optimalpower;
+
+    @TableField("YEAR")
+    private String year;
+
+    @TableField("MONTH")
+    private String month;
+
+    @TableField("MAINID")
+    private String mainid;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

gyee-sample-impala/src/main/java/com/gyee/impala/model/slave/Windturbinewindyaw.java

@@ -0,0 +1,357 @@
+package com.gyee.impala.model.slave;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("WINDTURBINEWINDYAW")
+public class Windturbinewindyaw extends Model<Windturbinewindyaw> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+    private String id;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("\"RECORDDATE")
+    private Date recorddate;
+
+    @TableField("SPEED")
+    private String speed;
+
+    @TableField("QUALIFIED")
+    private String qualified;
+
+    @TableField("UNQUALIFIED")
+    private String unqualified;
+
+    @TableField("\"R-50\"")
+    private Integer Rf50;
+
+    @TableField("\"R-49\"")
+    private Integer Rf49;
+
+    @TableField("\"R-48\"")
+    private Integer Rf48;
+
+    @TableField("\"R-47\"")
+    private Integer Rf47;
+
+    @TableField("\"R-46\"")
+    private Integer Rf46;
+
+    @TableField("\"R-45\"")
+    private Integer Rf45;
+
+    @TableField("\"R-44\"")
+    private Integer Rf44;
+
+    @TableField("\"R-43\"")
+    private Integer Rf43;
+
+    @TableField("\"R-42\"")
+    private Integer Rf42;
+
+    @TableField("\"R-41\"")
+    private Integer Rf41;
+
+    @TableField("\"R-40\"")
+    private Integer Rf40;
+
+    @TableField("\"R-39\"")
+    private Integer Rf39;
+
+    @TableField("\"R-38\"")
+    private Integer Rf38;
+
+    @TableField("\"R-37\"")
+    private Integer Rf37;
+
+    @TableField("\"R-36\"")
+    private Integer Rf36;
+
+    @TableField("\"R-35\"")
+    private Integer Rf35;
+
+    @TableField("\"R-34\"")
+    private Integer Rf34;
+
+    @TableField("\"R-33\"")
+    private Integer Rf33;
+
+    @TableField("\"R-32\"")
+    private Integer Rf32;
+
+    @TableField("\"R-31\"")
+    private Integer Rf31;
+
+    @TableField("\"R-30\"")
+    private Integer Rf30;
+
+    @TableField("\"R-29\"")
+    private Integer Rf29;
+
+    @TableField("\"R-28\"")
+    private Integer Rf28;
+
+    @TableField("\"R-27\"")
+    private Integer Rf27;
+
+    @TableField("\"R-26\"")
+    private Integer Rf26;
+
+    @TableField("\"R-25\"")
+    private Integer Rf25;
+
+    @TableField("\"R-24\"")
+    private Integer Rf24;
+
+    @TableField("\"R-23\"")
+    private Integer Rf23;
+
+    @TableField("\"R-22\"")
+    private Integer Rf22;
+
+    @TableField("\"R-21\"")
+    private Integer Rf21;
+
+    @TableField("\"R-20\"")
+    private Integer Rf20;
+
+    @TableField("\"R-19\"")
+    private Integer Rf19;
+
+    @TableField("\"R-18\"")
+    private Integer Rf18;
+
+    @TableField("\"R-17\"")
+    private Integer Rf17;
+
+    @TableField("\"R-16\"")
+    private Integer Rf16;
+
+    @TableField("\"R-15\"")
+    private Integer Rf15;
+
+    @TableField("\"R-14\"")
+    private Integer Rf14;
+
+    @TableField("\"R-13\"")
+    private Integer Rf13;
+
+    @TableField("\"R-12\"")
+    private Integer Rf12;
+
+    @TableField("\"R-11\"")
+    private Integer Rf11;
+
+    @TableField("\"R-10\"")
+    private Integer Rf10;
+
+    @TableField("\"R-9\"")
+    private Integer Rf9;
+
+    @TableField("\"R-8\"")
+    private Integer Rf8;
+
+    @TableField("\"R-7\"")
+    private Integer Rf7;
+
+    @TableField("\"R-6\"")
+    private Integer Rf6;
+
+    @TableField("\"R-5\"")
+    private Integer Rf5;
+
+    @TableField("\"R-4\"")
+    private Integer Rf4;
+
+    @TableField("\"R-3\"")
+    private Integer Rf3;
+
+    @TableField("\"R-2\"")
+    private Integer Rf2;
+
+    @TableField("\"R-1\"")
+    private Integer Rf1;
+
+    @TableField("R0")
+    private Integer R0;
+
+    @TableField("R1")
+    private Integer R1;
+
+    @TableField("R2")
+    private Integer R2;
+
+    @TableField("R3")
+    private Integer R3;
+
+    @TableField("R4")
+    private Integer R4;
+
+    @TableField("R5")
+    private Integer R5;
+
+    @TableField("R6")
+    private Integer R6;
+
+    @TableField("R7")
+    private Integer R7;
+
+    @TableField("\"R8")
+    private Integer R8;
+
+    @TableField("R9")
+    private Integer R9;
+
+    @TableField("R10")
+    private Integer R10;
+
+    @TableField("R11")
+    private Integer R11;
+
+    @TableField("R12")
+    private Integer R12;
+
+    @TableField("R13")
+    private Integer R13;
+
+    @TableField("R14")
+    private Integer R14;
+
+    @TableField("R15")
+    private Integer R15;
+
+    @TableField("R16")
+    private Integer R16;
+
+    @TableField("R17")
+    private Integer R17;
+
+    @TableField("R18")
+    private Integer R18;
+
+    @TableField("R19")
+    private Integer R19;
+
+    @TableField("R20")
+    private Integer R20;
+
+    @TableField("R21")
+    private Integer r21;
+
+    @TableField("R22")
+    private Integer r22;
+
+    @TableField("R23")
+    private Integer r23;
+
+    @TableField("R24")
+    private Integer r24;
+
+    @TableField("R25")
+    private Integer r25;
+
+    @TableField("R26")
+    private Integer r26;
+
+    @TableField("R27")
+    private Integer r27;
+
+    @TableField("R28")
+    private Integer r28;
+
+    @TableField("R29")
+    private Integer r29;
+
+    @TableField("R30")
+    private Integer R30;
+
+    @TableField("R31")
+    private Integer R31;
+
+    @TableField("R32")
+    private Integer R32;
+
+    @TableField("R33")
+    private Integer R33;
+
+    @TableField("R34")
+    private Integer R34;
+
+    @TableField("R35")
+    private Integer R35;
+
+    @TableField("R36")
+    private Integer R36;
+
+    @TableField("R37")
+    private Integer R37;
+
+    @TableField("R38")
+    private Integer R38;
+
+    @TableField("R39")
+    private Integer R39;
+
+    @TableField("R40")
+    private Integer R40;
+
+    @TableField("R41")
+    private Integer R41;
+
+    @TableField("R42")
+    private Integer R42;
+
+    @TableField("R43")
+    private Integer R43;
+
+    @TableField("R44")
+    private Integer R44;
+
+    @TableField("R45")
+    private Integer R45;
+
+    @TableField("R46")
+    private Integer R46;
+
+    @TableField("R47")
+    private Integer R47;
+
+    @TableField("R48")
+    private Integer R48;
+
+    @TableField("R49")
+    private Integer R49;
+
+    @TableField("R50")
+    private Integer R50;
+
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

gyee-sample-impala/src/main/java/com/gyee/impala/schdule/TaskPerformance.java

@@ -0,0 +1,126 @@
+package com.gyee.impala.schdule;
+
+import com.gyee.impala.common.feign.RemoteServiceBuilder;
+import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.common.util.FileUtil;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.model.custom.TsPointData;
+import com.gyee.impala.model.master.Windturbine;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.service.master.WindturbineService;
+import com.gyee.impala.service.master.WindturbinepointService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//@Component
+@Slf4j
+public class TaskPerformance {
+
+    // 分钟 * 秒
+    private final Integer interval = 5 * 60;
+
+    // 实时欠发状态
+    private final String RSSQFZT = "RSSQFZT";
+    // 发电机转速
+    private final String FDJZS = "AI012";
+    private final String FDJZSB = "AI012B";
+    // 明细状态
+    private final String FJMXZT = "ZTMX";
+    // 桨叶角度
+    private final String JYJD = "AI031";
+
+    private final String START_TIME = "2021-06-01 00:00:00";
+    private final String END_TIME = "2021-11-20 00:00:00";
+
+    @Autowired
+    private RemoteServiceBuilder remoteServiceBuilder;
+    @Autowired
+    private WindturbineService windturbineService;
+    @Autowired
+    private WindturbinepointService windturbinepointService;
+
+
+    /**
+     * 性能下降统计
+     * 延时30s执行
+     * 每隔60s执行一次
+     */
+    @Scheduled(initialDelay = 30 * 1000, fixedRate = 2 * 86400000 * 1000)
+    public void performanceNSS(){
+        List<Windturbine> listNSS = windturbineService.getWindTurbineId("NSS_FDC");
+
+        if (listNSS == null || listNSS.size() < 0)
+            return;
+
+        List<String> data = new ArrayList<>();
+        for (int i = 0; i < listNSS.size(); i++){
+            if (i > 10)
+                break;
+
+            System.out.println("======: " + listNSS.get(i).getId());
+            Windturbinepoint wp_zs = windturbinepointService.getListByWtIdAndUniformCode(listNSS.get(i).getId(), FDJZS);
+            Windturbinepoint wp_zt = windturbinepointService.getListByWtIdAndUniformCode(listNSS.get(i).getId(), FJMXZT);
+            Windturbinepoint wp_qf = windturbinepointService.getListByWtIdAndUniformCode(listNSS.get(i).getId(), RSSQFZT);
+            Windturbinepoint wp_jy = windturbinepointService.getListByWtIdAndUniformCode(listNSS.get(i).getId(), JYJD);
+
+            List<TsPointData> zsData = remoteServiceBuilder.ShardingService().getHistorySnap(wp_zs.getPoint(),
+                    DateUtil.covertDateTimestamp(START_TIME), DateUtil.covertDateTimestamp(END_TIME), interval);
+            List<TsPointData> ztData = remoteServiceBuilder.ShardingService().getHistorySnap(wp_zt.getPoint(),
+                    DateUtil.covertDateTimestamp(START_TIME), DateUtil.covertDateTimestamp(END_TIME), interval);
+            List<TsPointData> qfData = remoteServiceBuilder.ShardingService().getHistorySnap(wp_qf.getPoint(),
+                    DateUtil.covertDateTimestamp(START_TIME), DateUtil.covertDateTimestamp(END_TIME), interval);
+            List<TsPointData> jdData = remoteServiceBuilder.ShardingService().getHistorySnap(wp_jy.getPoint(),
+                    DateUtil.covertDateTimestamp(START_TIME), DateUtil.covertDateTimestamp(END_TIME), interval);
+
+            int k = 0;
+            int m = 0;
+            List<String> list = new ArrayList<>();
+            List<String> list1 = new ArrayList<>();
+            for (int j = 0; j < zsData.size(); j++) {
+                if (zsData.get(j).getDoubleValue() >= 14
+                        && ztData.get(j).getDoubleValue() == 2
+                        && qfData.get(j).getDoubleValue() > 3
+                        && jdData.get(j).getDoubleValue() == 0) {
+                    k++;
+                    list.add(DateUtil.format(zsData.get(j).getTs(), DateUtil.DATE_TIME_PATTERN));
+                } else if(zsData.get(j).getDoubleValue() >= 14
+                        && ztData.get(j).getDoubleValue() == 2
+                        && qfData.get(j).getDoubleValue() <= 2
+                        && jdData.get(j).getDoubleValue() == 0){
+                    m++;
+                    list1.add(DateUtil.format(zsData.get(j).getTs(), DateUtil.DATE_TIME_PATTERN));
+                }
+                else {
+                    // 统计欠发
+                    if (k >= 5) {
+                        data.add(SnowFlakeUtil.generateId() + "^0^NSS_FDC^"
+                                + listNSS.get(i).getId() + "^" + list.get(0) + "^"
+                                + list.get(list.size() - 1) + "^"
+                                + String.format("%.1f",(double)(k * interval) / 3600)
+                                + "^0^牛首山风电场^^^^\n");
+                    }
+                    k = 0;
+                    list.clear();
+
+                    // 统计不欠发 大于5小时
+                    if (m >= 60) {
+                        data.add(SnowFlakeUtil.generateId() + "^1^NSS_FDC^"
+                                + listNSS.get(i).getId() + "^" + list1.get(0) + "^"
+                                + list1.get(list1.size() - 1) + "^"
+                                + String.format("%.1f",(double)(m * interval) / 3600)
+                                + "^0^牛首山风电场^^^^\n");
+                    }
+                    m = 0;
+                    list1.clear();
+                }
+            }
+        }
+
+        FileUtil.writeFile("nss_caseperformence_1_45", data);
+    }
+
+}

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/AnalyseScatterService.java

@@ -0,0 +1,154 @@
+package com.gyee.impala.service.custom;
+
+
+import com.gyee.impala.common.constant.Constants;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.feign.RemoteServiceBuilder;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.model.custom.TsPointData;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.model.slave.Windturbinecurvefittingmonth;
+import com.gyee.impala.service.master.TempscatterpointService;
+import com.gyee.impala.service.master.WindturbinepointService;
+import com.gyee.impala.service.slave.WindturbinecurvefittingmonthService;
+import com.gyee.impala.service.slave.WindturbinewindyawService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * 功率曲线拟合和偏航对风分析
+ */
+@Slf4j
+@Service
+public class AnalyseScatterService {
+
+    // 读取golden数据库的时间间隔
+    private final int interval = 150;
+
+    @Autowired
+    private WindturbinepointService windturbinepointService;
+    @Autowired
+    private TempscatterpointService tempscatterpointService;
+    @Autowired
+    private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
+    @Autowired
+    private RemoteServiceBuilder remoteServiceBuilder;
+
+
+    /**
+     * 偏航对风 通过计算服务取数
+     * @param station
+     * @param wtId
+     * @param time
+     * @return
+     */
+    public Map<String, List<List<Double>>> getScatterList(String station, String wtId, String time) {
+        Map<String, List<List<Double>>> result = new HashMap<>();
+
+        List<List<Double>> scatter = new ArrayList<>();  //散点
+        List<List<Double>> actual = new ArrayList<>(); //实际功率
+        List<List<Double>> optimal = new ArrayList<>(); //最优功率
+
+        Calendar cal = Calendar.getInstance();
+//        Tempscatterpoint item = tempscatterpointService.getOne(station, wtId, time);
+//
+//        if (item != null){
+//            // 缓存有数据直接读取
+//            scatter = JSONObject.parseObject(item.getScatter(), new TypeReference<List<List<Double>>>() {});
+//            actual = JSONObject.parseObject(item.getLineactual(), new TypeReference<List<List<Double>>>() {});
+//            optimal = JSONObject.parseObject(item.getLineoptimal(), new TypeReference<List<List<Double>>>() {});
+//        } else{
+        // 缓存没数据，先查golden，在缓存
+        cal.setTime(DateUtil.dateTime(DateUtil.YYYY_MM, time));
+        int year = cal.get(Calendar.YEAR);
+        int month = cal.get(Calendar.MONTH);
+
+        time = year + "-" + StringUtils.leftPad(String.valueOf(month + 1), 2, "0");
+
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+        long startTime = cal.getTime().getTime();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        long endTime = cal.getTime().getTime();
+
+        try{
+            /** --------------  散点图  风速、功率  -------------**/
+            Windturbinepoint power = windturbinepointService.getListByWtIdAndUniformCode(wtId, Constants.POINT_POWER);
+            Windturbinepoint speed = windturbinepointService.getListByWtIdAndUniformCode(wtId, Constants.POINT_SPEED);
+            List<TsPointData> listPower = remoteServiceBuilder.ShardingService().getHistorySnap(power.getPoint(), startTime, endTime, interval);
+            List<TsPointData> listSpeed = remoteServiceBuilder.ShardingService().getHistorySnap(speed.getPoint(), startTime, endTime, interval);
+            /** --------------  散点图  风速、功率  -------------**/
+
+            DecimalFormat dcmFmt = new DecimalFormat("0.00");
+            if (!listPower.isEmpty() && !listSpeed.isEmpty()) {
+                for (int i = 0; i < listPower.size(); i++) {
+                    List<Double> ds = new ArrayList<>();
+
+                    double f = listSpeed.get(i).getDoubleValue();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    f = listPower.get(i).getDoubleValue();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    ds.add((double) listPower.get(i).getTs());
+                    scatter.add(ds);
+                }
+            }
+
+            List<Windturbinecurvefittingmonth> curve = windturbinecurvefittingmonthService.getListByWtIdAndYearAndMonth(wtId, String.valueOf(year), String.valueOf(month));
+            for (Windturbinecurvefittingmonth wc : curve) {
+                List<Double> ap = new ArrayList<>();
+                List<Double> op = new ArrayList<>();
+                int c = wc.getSpeed().intValue();
+
+                if (c == wc.getSpeed()) {
+                    ap.add(wc.getSpeed());
+                    ap.add(wc.getActualpower());// 实际拟合功率
+                    op.add(wc.getSpeed());// 风速
+                    op.add(wc.getOptimalpower());// 最优拟合功率
+                    actual.add(ap);
+                    optimal.add(op);
+                }
+            }
+
+            //新风机的拟合数据插入缓存
+//            Tempscatterpoint temp = new Tempscatterpoint();
+//            temp.setStation(station);
+//            temp.setWindturbineid(wtId);
+//            temp.setTime(time);
+//            temp.setScatter(JSON.toJSONString(scatter));
+//            temp.setLineactual(JSON.toJSONString(actual));
+//            temp.setLineoptimal(JSON.toJSONString(optimal));
+//            tempscatterpointService.insertItem(temp);
+//        }
+
+            result.put("scatter", scatter);
+            result.put("lineactual", actual);
+            result.put("lineoptimal", optimal);
+
+            return result;
+        } catch (CustomException e) {
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
+    }
+
+
+    public void getTotalRangeCal(String wtId, long startTime, long endTime) {
+        try{
+            /** --------------  对风偏差  风速、风向  -------------**/
+            Windturbinepoint direct = windturbinepointService.getListByWtIdAndUniformCode(wtId, Constants.POINT_WIND_DIRECT);
+            Windturbinepoint angle = windturbinepointService.getListByWtIdAndUniformCode(wtId, Constants.POINT_WIND_ANGLE);
+            List<TsPointData> listDirect = remoteServiceBuilder.ShardingService().getHistorySnap(direct.getPoint(), startTime, endTime, interval);
+            List<TsPointData> listAngle = remoteServiceBuilder.ShardingService().getHistorySnap(angle.getPoint(), startTime, endTime, interval);
+            /** --------------  对风偏差  风速、风向  -------------**/
+
+        } catch (CustomException e) {
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/custom/GoldenService.java

@@ -1,17 +1,16 @@
-package com.gyee.sampleimpala.service.custom;
-
-
-import com.gyee.sampleimpala.common.config.UniformcodeConfig;
-import com.gyee.sampleimpala.common.constant.Constants;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.feign.RemoteServiceBuilder;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.common.util.DateUtil;
-import com.gyee.sampleimpala.model.custom.TsPointData;
-import com.gyee.sampleimpala.model.kudu.Caseperformance;
-import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
-import com.gyee.sampleimpala.service.kudu.CaseperformanceService;
-import com.gyee.sampleimpala.service.kudu.WindturbinepointService;
+package com.gyee.impala.service.custom;
+
+
+import com.gyee.impala.common.constant.Constants;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.feign.RemoteServiceBuilder;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.model.custom.TsPointData;
+import com.gyee.impala.model.master.Caseperformance;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.service.master.CaseperformanceService;
+import com.gyee.impala.service.master.WindturbinepointService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,15 +23,10 @@ public class GoldenService {
 
     @Autowired
     private RemoteServiceBuilder remoteService;
-
     @Autowired
     private WindturbinepointService windturbinepointService;
-
-
     @Autowired
     private CaseperformanceService caseperformanceService;
-    @Autowired
-    private UniformcodeConfig uniformcodeConfig;
 
 
     /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/custom/IRealTimeData.java

@@ -1,7 +1,7 @@
-package com.gyee.sampleimpala.service.custom;
+package com.gyee.impala.service.custom;
 
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.model.custom.TsPointData;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.model.custom.TsPointData;
 
 import java.util.List;
 

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/TablePropService.java

@@ -0,0 +1,61 @@
+package com.gyee.impala.service.custom;
+
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.custom.TableProp;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class TablePropService {
+
+//    @Autowired
+//    private DataSource dataSource;
+//
+//    public List<Object> listData(String table){
+//        List<Object> list = new ArrayList<>();
+//        try {
+//            String sql = "select * from " + table;
+//            Statement st = dataSource.getConnection().createStatement();
+//            ResultSet rs = st.executeQuery(sql);
+//
+//            Map<String, Object> map = new HashMap<>();
+//
+//            // 设置表头信息
+//            int columns = rs.getMetaData().getColumnCount();
+//            List<TableProp> header = new ArrayList<>();
+//            for (int i = 1; i <= columns; i++) {
+//                String name = rs.getMetaData().getColumnName(i);
+//                TableProp prop = new TableProp();
+//                prop.setLabel(name);
+//                prop.setProp(name);
+//                header.add(prop);
+//            }
+//            map.put("header", header);
+//
+//            while (rs.next()) {
+//                Map<String, String> data = new HashMap<>();
+//                for (int i = 1; i <= columns; i++) {
+//                    data.put(header.get(i - 1).getProp(), rs.getString(i));
+//                }
+//            }
+//
+////            map.put("data", list);
+//        } catch (SQLException e) {
+//            throw new CustomException(ResultCode.ERROR_DATA);
+//        }
+//
+//        return list;
+//    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/CasefaultServiceImpl.java

@@ -1,26 +1,21 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.feign.RemoteServiceBuilder;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
-import com.gyee.sampleimpala.model.custom.TsPointData;
-import com.gyee.sampleimpala.model.kudu.Casefault;
-import com.gyee.sampleimpala.mapper.kudu.CasefaultMapper;
-import com.gyee.sampleimpala.model.kudu.Casefaultalg;
-import com.gyee.sampleimpala.service.kudu.CasefaultService;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.feign.RemoteServiceBuilder;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.model.master.Casefault;
+import com.gyee.impala.mapper.master.CasefaultMapper;
+import com.gyee.impala.service.master.CasefaultService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -37,7 +32,7 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
     private RemoteServiceBuilder serviceBuilder;
 
     @Override
-    public List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et, Long[] ids) {
+    public List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et,String category, Long[] ids) {
         ExcludeQueryWrapper<Casefault> wrapper = new ExcludeQueryWrapper<>();
 
 //        List<Long> collect = null;
@@ -46,6 +41,7 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
 //            collect = Arrays.stream(ids).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
 
         wrapper.eq("stationen", station)
+                .eq("category", category)
                 .in("model", model)
                 .in("faultcode", widget)
                 .in("faultid", ids)
@@ -64,6 +60,7 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
     }
 
 
+    @Transactional
     @Override
     public boolean insertOrUpdate(List<Casefault> list) {
         boolean flag = false;
@@ -75,7 +72,7 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
             for (Casefault fault : list){
                 if (StringUtils.isEmpty(fault.getId())) {
                     // 新增
-                    fault.setId(SnowFlakeGenerator.generateId());
+                    fault.setId(SnowFlakeUtil.generateId());
                 }
             }
 
@@ -105,7 +102,7 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
         try {
             // 设置一个新ID
             if (obj != null && StringUtils.isEmpty(obj.getId()))
-                obj.setId(SnowFlakeGenerator.generateId());
+                obj.setId(SnowFlakeUtil.generateId());
 
             baseMapper.insert(obj);
             return true;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/CasefaultalgServiceImpl.java

@@ -1,15 +1,14 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.mapper.kudu.CasefaultalgMapper;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.mapper.master.CasefaultalgMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.sampleimpala.model.kudu.Casefault;
-import com.gyee.sampleimpala.model.kudu.Casefaultalg;
-import com.gyee.sampleimpala.service.kudu.CasefaultalgService;
+import com.gyee.impala.model.master.Casefaultalg;
+import com.gyee.impala.service.master.CasefaultalgService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/CaseperformanceServiceImpl.java

@@ -1,23 +1,22 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
-import com.gyee.sampleimpala.common.constant.Constants;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.feign.RemoteServiceBuilder;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.common.util.DateUtil;
-import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
-import com.gyee.sampleimpala.common.util.StationMapperUtil;
-import com.gyee.sampleimpala.mapper.kudu.CaseperformanceMapper;
-import com.gyee.sampleimpala.model.custom.TsPointData;
-import com.gyee.sampleimpala.model.kudu.Caseperformance;
-import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
-import com.gyee.sampleimpala.service.kudu.CaseperformanceService;
-import com.gyee.sampleimpala.service.kudu.WindturbinepointService;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.constant.Constants;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.feign.RemoteServiceBuilder;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.common.util.StationMapperUtil;
+import com.gyee.impala.mapper.master.CaseperformanceMapper;
+import com.gyee.impala.model.custom.TsPointData;
+import com.gyee.impala.model.master.Caseperformance;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.service.master.CaseperformanceService;
+import com.gyee.impala.service.master.WindturbinepointService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.velocity.runtime.directive.Foreach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -71,7 +70,7 @@ public class CaseperformanceServiceImpl extends ServiceImpl<CaseperformanceMappe
         try {
             // 设置一个新ID
             if (performance != null && performance.getId() <= 0)
-                performance.setId(Long.valueOf(SnowFlakeGenerator.generateId()));
+                performance.setId(Long.valueOf(SnowFlakeUtil.generateId()));
 
             int code = baseMapper.insert(performance);
             if (code > 0) {

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/KnowalgServiceImpl.java

@@ -1,8 +1,8 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowalg;
-import com.gyee.sampleimpala.mapper.kudu.KnowalgMapper;
-import com.gyee.sampleimpala.service.kudu.KnowalgService;
+import com.gyee.impala.model.master.Knowalg;
+import com.gyee.impala.mapper.master.KnowalgMapper;
+import com.gyee.impala.service.master.KnowalgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/KnowfaultfixServiceImpl.java

@@ -1,12 +1,12 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
-import com.gyee.sampleimpala.model.kudu.Knowfaultfix;
-import com.gyee.sampleimpala.mapper.kudu.KnowfaultfixMapper;
-import com.gyee.sampleimpala.service.kudu.KnowfaultfixService;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.model.master.Knowfaultfix;
+import com.gyee.impala.mapper.master.KnowfaultfixMapper;
+import com.gyee.impala.service.master.KnowfaultfixService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ public class KnowfaultfixServiceImpl extends ServiceImpl<KnowfaultfixMapper, Kno
         try {
             // 设置一个新ID
             if (obj != null && StringUtils.isEmpty(obj.getId()))
-                obj.setId(SnowFlakeGenerator.generateId());
+                obj.setId(SnowFlakeUtil.generateId());
 
             baseMapper.insert(obj);
             return true;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/KnowfaultsymptomServiceImpl.java

@@ -1,13 +1,13 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
-import com.gyee.sampleimpala.model.kudu.Knowfaultsymptom;
-import com.gyee.sampleimpala.mapper.kudu.KnowfaultsymptomMapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.model.master.Knowfaultsymptom;
+import com.gyee.impala.mapper.master.KnowfaultsymptomMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.sampleimpala.service.kudu.KnowfaultsymptomService;
+import com.gyee.impala.service.master.KnowfaultsymptomService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -55,7 +55,7 @@ public class KnowfaultsymptomServiceImpl extends ServiceImpl<KnowfaultsymptomMap
         try {
             // 设置一个新ID
             if (obj != null && StringUtils.isEmpty(obj.getId()))
-                obj.setId(SnowFlakeGenerator.generateId());
+                obj.setId(SnowFlakeUtil.generateId());
 
             // 判断该类型是否已经存在
             QueryWrapper<Knowfaultsymptom> query = new QueryWrapper<>();

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/KnowfaulttypeServiceImpl.java

@@ -1,14 +1,14 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
-import com.gyee.sampleimpala.model.kudu.Knowfaulttype;
-import com.gyee.sampleimpala.mapper.kudu.KnowfaulttypeMapper;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.model.master.Knowfaulttype;
+import com.gyee.impala.mapper.master.KnowfaulttypeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.sampleimpala.service.kudu.KnowfaulttypeService;
+import com.gyee.impala.service.master.KnowfaulttypeService;
 import org.springframework.stereotype.Service;
 
 
@@ -61,7 +61,7 @@ public class KnowfaulttypeServiceImpl extends ServiceImpl<KnowfaulttypeMapper, K
         try {
             // 设置一个新ID
             if (obj != null && obj.getId() <= 0)
-                obj.setId(Long.valueOf(SnowFlakeGenerator.generateId()));
+                obj.setId(Long.valueOf(SnowFlakeUtil.generateId()));
 
             // 判断该类型是否已经存在
             QueryWrapper<Knowfaulttype> query = new QueryWrapper<>();

gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/master/TempscatterpointServiceImpl.java

@@ -0,0 +1,51 @@
+package com.gyee.impala.service.impl.master;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.util.SnowFlakeUtil;
+import com.gyee.impala.mapper.master.TempscatterpointMapper;
+import com.gyee.impala.model.master.Tempscatterpoint;
+import com.gyee.impala.service.master.TempscatterpointService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class TempscatterpointServiceImpl extends ServiceImpl<TempscatterpointMapper, Tempscatterpoint> implements TempscatterpointService {
+
+
+    @Override
+    public Tempscatterpoint getOne(String station, String wtId, String time) {
+        ExcludeQueryWrapper<Tempscatterpoint> wrapper = new ExcludeQueryWrapper<>();
+
+        wrapper.eq("station", station)
+                .eq("windturbineid", wtId)
+                .eq("time", time);
+        try {
+            Tempscatterpoint obj = baseMapper.selectOne(wrapper);
+
+            return obj;
+
+        } catch (CustomException e){
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
+    }
+
+    @Override
+    public boolean insertItem(Tempscatterpoint obj) {
+        try {
+            // 设置一个新ID
+            if (obj != null)
+                obj.setId(SnowFlakeUtil.generateId());
+
+            baseMapper.insert(obj);
+
+            return true;
+        } catch (CustomException e) {
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/WindpowerstationServiceImpl.java

@@ -1,11 +1,11 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Windpowerstation;
-import com.gyee.sampleimpala.mapper.kudu.WindpowerstationMapper;
-import com.gyee.sampleimpala.service.kudu.WindpowerstationService;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Windpowerstation;
+import com.gyee.impala.mapper.master.WindpowerstationMapper;
+import com.gyee.impala.service.master.WindpowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/WindturbineServiceImpl.java

@@ -1,14 +1,14 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.sampleimpala.mapper.kudu.WindturbineMapper;
-import com.gyee.sampleimpala.model.kudu.Windturbine;
-import com.gyee.sampleimpala.service.kudu.WindturbineService;
+import com.gyee.impala.mapper.master.WindturbineMapper;
+import com.gyee.impala.model.master.Windturbine;
+import com.gyee.impala.service.master.WindturbineService;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -56,7 +56,7 @@ public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windt
     @Cacheable(value = "windturbineid")
     @Override
     public List<Windturbine> getWindTurbineId(String station) {
-        List<Windturbine> list = null;
+        List<Windturbine> list;
         try {
             QueryWrapper<Windturbine> wrapper = new QueryWrapper<>();
             wrapper.eq("station", station);
@@ -64,11 +64,11 @@ public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windt
 
             list = baseMapper.selectList(wrapper);
 
+            return list;
+
         } catch (CustomException e){
             log.error(e.getMessage());
             throw new CustomException(ResultCode.ERROR_DATA);
         }
-
-        return list;
     }
 }

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/WindturbinemetricsServiceImpl.java

@@ -1,8 +1,8 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
-import com.gyee.sampleimpala.model.kudu.Windturbinemetrics;
-import com.gyee.sampleimpala.mapper.kudu.WindturbinemetricsMapper;
-import com.gyee.sampleimpala.service.kudu.WindturbinemetricsService;
+import com.gyee.impala.model.master.Windturbinemetrics;
+import com.gyee.impala.mapper.master.WindturbinemetricsMapper;
+import com.gyee.impala.service.master.WindturbinemetricsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/WindturbinepointServiceImpl.java

@@ -1,14 +1,13 @@
-package com.gyee.sampleimpala.service.impl.kudu;
+package com.gyee.impala.service.impl.master;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
-import com.gyee.sampleimpala.common.exception.CustomException;
-import com.gyee.sampleimpala.common.result.ResultCode;
-import com.gyee.sampleimpala.model.kudu.Casefault;
-import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
-import com.gyee.sampleimpala.mapper.kudu.WindturbinepointMapper;
-import com.gyee.sampleimpala.service.kudu.CasefaultService;
-import com.gyee.sampleimpala.service.kudu.WindturbinepointService;
+import com.gyee.impala.common.base.ExcludeQueryWrapper;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.model.master.Windturbinepoint;
+import com.gyee.impala.mapper.master.WindturbinepointMapper;
+import com.gyee.impala.service.master.CasefaultService;
+import com.gyee.impala.service.master.WindturbinepointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -36,21 +35,19 @@ public class WindturbinepointServiceImpl extends ServiceImpl<WindturbinepointMap
     @Cacheable(value = "windturbinepointall")
     @Override
     public List<Windturbinepoint> getAll(String wtId, String widget) {
-        List<Windturbinepoint> list = new ArrayList<>();
-
         try {
             ExcludeQueryWrapper<Windturbinepoint> wrapper = new ExcludeQueryWrapper<>();
             wrapper.eq("windturbineid", wtId)
                     .eq("widgetcode", widget);
 
-            list = baseMapper.selectList(wrapper);
+            List<Windturbinepoint> list = baseMapper.selectList(wrapper);
+
+            return list;
 
         } catch (CustomException e) {
             log.error(e.getMessage());
             throw new CustomException(ResultCode.ERROR_DATA);
         }
-
-        return list;
     }
 
     @Cacheable(value = "windturbinepointuniformcode")
@@ -125,25 +122,28 @@ public class WindturbinepointServiceImpl extends ServiceImpl<WindturbinepointMap
         return null;
     }
 
+
+    @Cacheable(value = "windturbinepointone")
+    @Override
     public Windturbinepoint getByPoint(String point) {
-        List<Windturbinepoint> list = new ArrayList<>();
         try {
             ExcludeQueryWrapper<Windturbinepoint> wrapper = new ExcludeQueryWrapper<>();
             wrapper.eq("point", point);
 
-            list = baseMapper.selectList(wrapper);
+            Windturbinepoint one = baseMapper.selectOne(wrapper);
+
+            return one;
 
         } catch (CustomException e) {
             log.error(e.getMessage());
             throw new CustomException(ResultCode.ERROR_DATA);
         }
-        return list.get(0);
     }
 
+
+    @Cacheable(value = "windturbinepointstationandncode")
     @Override
     public List<Windturbinepoint> getListByStationAndWtIdAndUniformCode(String station, String wtId, String[] uniformCode) {
-        List<Windturbinepoint> list = new ArrayList<>();
-
         try {
             ExcludeQueryWrapper<Windturbinepoint> wrapper = new ExcludeQueryWrapper<>();
             wrapper.eq("stationen", station)
@@ -151,16 +151,31 @@ public class WindturbinepointServiceImpl extends ServiceImpl<WindturbinepointMap
                     .in("uniformcode", uniformCode)
             .orderByAsc("uniformcode");
 
-            list = baseMapper.selectList(wrapper);
-            if (null != list && list.size() > 0) {
-                return list;
-            }
+            List<Windturbinepoint> list = baseMapper.selectList(wrapper);
 
+            return list;
         } catch (CustomException e) {
             log.error(e.getMessage());
             throw new CustomException(ResultCode.ERROR_DATA);
         }
-        return null;
+    }
+
+
+    @Cacheable(value = "windturbinepointidandncode")
+    @Override
+    public Windturbinepoint getListByWtIdAndUniformCode(String wtId, String uniformCode) {
+        try {
+            ExcludeQueryWrapper<Windturbinepoint> wrapper = new ExcludeQueryWrapper<>();
+            wrapper.eq("windturbineid", wtId)
+                    .in("uniformcode", uniformCode);
+
+            Windturbinepoint point = baseMapper.selectOne(wrapper);
 
+            return point;
+
+        } catch (CustomException e) {
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
     }
 }

gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/slave/WindturbinecurvefittingmonthServiceImpl.java

@@ -0,0 +1,41 @@
+package com.gyee.impala.service.impl.slave;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.mapper.slave.WindturbinecurvefittingmonthMapper;
+import com.gyee.impala.model.slave.Windturbinecurvefittingmonth;
+import com.gyee.impala.service.slave.WindturbinecurvefittingmonthService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+@Service
+public class WindturbinecurvefittingmonthServiceImpl extends ServiceImpl<WindturbinecurvefittingmonthMapper, Windturbinecurvefittingmonth> implements WindturbinecurvefittingmonthService {
+
+    @Override
+    public List<Windturbinecurvefittingmonth> getListByWtIdAndYearAndMonth(String wtId, String year, String month) {
+        QueryWrapper<Windturbinecurvefittingmonth> wrapper = new QueryWrapper<>();
+        wrapper.eq("windturbineid", wtId)
+                .eq("year", year)
+                .eq("month", month)
+                .orderByAsc("speed");
+
+        try{
+            return baseMapper.selectList(wrapper);
+        } catch (CustomException e){
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
+    }
+}

gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/slave/WindturbinewindyawServiceImpl.java

@@ -0,0 +1,49 @@
+package com.gyee.impala.service.impl.slave;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.impala.common.exception.CustomException;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.mapper.slave.WindturbinewindyawMapper;
+import com.gyee.impala.model.custom.YawValuesVo;
+import com.gyee.impala.model.slave.Windturbinewindyaw;
+import com.gyee.impala.service.slave.WindturbinewindyawService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+@Service
+public class WindturbinewindyawServiceImpl extends ServiceImpl<WindturbinewindyawMapper, Windturbinewindyaw> implements WindturbinewindyawService {
+
+    @Override
+    public List<YawValuesVo> getYawTotalAll(String wtId, Date beginDate, Date endDate) {
+        return baseMapper.getYawTotalAll(wtId, beginDate, endDate);
+    }
+
+//    @Override
+//    public List<Windturbinewindyaw> getListByWtIdAndTime(String wtId, Date startDate, Date endDate) {
+//        QueryWrapper<Windturbinewindyaw> wrapper = new QueryWrapper<>();
+//        wrapper.eq("windturbineid", wtId)
+//                .ge("recorddate", startDate)
+//                .le("recorddate", endDate);
+//
+//        try{
+//            return baseMapper.selectList(wrapper);
+//
+//        } catch (CustomException e){
+//            log.error(e.getMessage());
+//            throw new CustomException(ResultCode.ERROR_DATA);
+//        }
+//    }
+
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/CasefaultService.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Casefault;
+import com.gyee.impala.model.master.Casefault;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -22,10 +22,11 @@ public interface CasefaultService extends IService<Casefault> {
      * @param widget   风机部件
      * @param st       开始时间
      * @param et       结束时间
+     * @param category 故障分类  0-检修故障数据  1-无监督学习手动打标签  2-有监督算法打标签  3-scada报警
      * @param ids      与oracle关联的snapid
      * @return
      */
-    List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et, Long[] ids);
+    List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et, String category, Long[] ids);
 
     /**
      * 批量插入或更新

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/CasefaultalgService.java

@@ -1,7 +1,7 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.sampleimpala.model.kudu.Casefaultalg;
+import com.gyee.impala.model.master.Casefaultalg;
 
 import java.util.List;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/CaseperformanceService.java

@@ -1,7 +1,7 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.sampleimpala.model.kudu.Caseperformance;
+import com.gyee.impala.model.master.Caseperformance;
 
 import java.util.List;
 import java.util.Map;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/KnowalgService.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowalg;
+import com.gyee.impala.model.master.Knowalg;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/KnowfaultfixService.java

@@ -1,8 +1,7 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowfaultfix;
+import com.gyee.impala.model.master.Knowfaultfix;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.sampleimpala.model.kudu.Knowfaulttype;
 
 import java.util.List;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/KnowfaultsymptomService.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowfaultsymptom;
+import com.gyee.impala.model.master.Knowfaultsymptom;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/KnowfaulttypeService.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Knowfaulttype;
+import com.gyee.impala.model.master.Knowfaulttype;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

gyee-sample-impala/src/main/java/com/gyee/impala/service/master/TempscatterpointService.java

@@ -0,0 +1,26 @@
+package com.gyee.impala.service.master;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.impala.model.master.Tempscatterpoint;
+
+/**
+ * 缓存的风功率数据
+ */
+public interface TempscatterpointService extends IService<Tempscatterpoint> {
+
+    /**
+     * 通过风机ID和时间查询缓存的风功率数据
+     * @param station
+     * @param wtId
+     * @param time
+     * @return
+     */
+    Tempscatterpoint getOne(String station, String wtId, String time);
+
+    /**
+     * 插入数据
+     * @param obj
+     * @return
+     */
+    boolean insertItem(Tempscatterpoint obj);
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/WindpowerstationService.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Windpowerstation;
+import com.gyee.impala.model.master.Windpowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/WindturbineService.java

@@ -1,7 +1,7 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.sampleimpala.model.kudu.Windturbine;
+import com.gyee.impala.model.master.Windturbine;
 
 import java.util.List;
 

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/WindturbinemetricsService.java

@@ -1,6 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.kudu.Windturbinemetrics;
+import com.gyee.impala.model.master.Windturbinemetrics;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/kudu/WindturbinepointService.java

@@ -1,7 +1,6 @@
-package com.gyee.sampleimpala.service.kudu;
+package com.gyee.impala.service.master;
 
-import com.gyee.sampleimpala.model.custom.TsPointData;
-import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
+import com.gyee.impala.model.master.Windturbinepoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -83,7 +82,7 @@ public interface WindturbinepointService extends IService<Windturbinepoint> {
 
 
     /**
-     * 通过场风机编码站和统一编码查询测点
+     * 通过场站\风机ID和统一编码查询测点
      *
      * @param station     场站
      * @param wtId        风机编码
@@ -91,4 +90,14 @@ public interface WindturbinepointService extends IService<Windturbinepoint> {
      * @return
      */
     List<Windturbinepoint> getListByStationAndWtIdAndUniformCode(String station, String wtId, String[] uniformCode);
+
+
+    /**
+     * 通过风机ID和统一编码查询测点
+     *
+     * @param wtId        风机编码
+     * @param uniformCode 统一编码
+     * @return
+     */
+    Windturbinepoint getListByWtIdAndUniformCode(String wtId, String uniformCode);
 }

gyee-sample-impala/src/main/java/com/gyee/impala/service/slave/WindturbinecurvefittingmonthService.java

@@ -0,0 +1,30 @@
+package com.gyee.impala.service.slave;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.impala.model.slave.Windturbinecurvefittingmonth;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ *
+ *  风电机月拟合曲线  oracle表
+ *
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+public interface WindturbinecurvefittingmonthService extends IService<Windturbinecurvefittingmonth> {
+
+
+    /**
+     * 通过风机ID、年月查询
+     * @param wtId
+     * @param year
+     * @param month
+     * @return
+     */
+    List<Windturbinecurvefittingmonth> getListByWtIdAndYearAndMonth(String wtId, String year, String month);
+}

gyee-sample-impala/src/main/java/com/gyee/impala/service/slave/WindturbinewindyawService.java

@@ -0,0 +1,31 @@
+package com.gyee.impala.service.slave;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.impala.model.custom.YawValuesVo;
+import com.gyee.impala.model.slave.Windturbinewindyaw;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-01-05
+ */
+public interface WindturbinewindyawService extends IService<Windturbinewindyaw> {
+
+
+    /**
+     * 根据风机ID和起始时间查询
+     * @param wtId
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    List<YawValuesVo> getYawTotalAll(String wtId, Date beginDate, Date endDate);
+
+}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/cache/AppRedisCacheManager.java

@@ -1,419 +0,0 @@
-package com.gyee.sampleimpala.common.cache;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @description: 移动端Redis缓存实现类
- * @author: YuXD
- * @create: 2021-01-05 10:40
- **/
-@Getter
-@AllArgsConstructor
-public final class AppRedisCacheManager implements IGlobalCache {
-
-    private RedisTemplate<String, Object> redisTemplate;
-
-    @Override
-    public boolean expire(String key, long time) {
-        try {
-            if (time > 0) {
-                redisTemplate.expire(key, time, TimeUnit.SECONDS);
-            }
-
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public long getExpire(String key) {
-        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public boolean hasKey(String key) {
-        try {
-            return redisTemplate.hasKey(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void del(String... key) {
-        if (key != null && key.length > 0) {
-            if (key.length == 1) {
-                redisTemplate.delete(key[0]);
-            } else {
-                redisTemplate.delete(CollectionUtils.arrayToList(key));
-            }
-        }
-    }
-
-    @Override
-    public Object get(String key) {
-        return key == null ? null : redisTemplate.opsForValue().get(key);
-    }
-
-    @Override
-    public boolean set(String key, Object value) {
-        try {
-            redisTemplate.opsForValue().set(key, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean set(String key, Object value, long time) {
-        try {
-            if (time > 0) {
-                redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
-            } else {
-                set(key, value);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public long incr(String key, long delta) {
-        if (delta < 0) {
-            throw new RuntimeException("递增因子必须大于0");
-        }
-        return redisTemplate.opsForValue().increment(key, delta);
-    }
-
-    @Override
-    public long decr(String key, long delta) {
-        if (delta < 0) {
-            throw new RuntimeException("递减因子必须大于0");
-        }
-        return redisTemplate.opsForValue().increment(key, -delta);
-    }
-
-    @Override
-    public Object hget(String key, String item) {
-        return redisTemplate.opsForHash().get(key, item);
-    }
-
-    @Override
-    public Map<Object, Object> hmget(String key) {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-    @Override
-    public boolean hmset(String key, Map<String, Object> map) {
-        try {
-            redisTemplate.opsForHash().putAll(key, map);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean hmset(String key, Map<String, Object> map, long time) {
-        try {
-            redisTemplate.opsForHash().putAll(key, map);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean hset(String key, String item, Object value) {
-        try {
-            redisTemplate.opsForHash().put(key, item, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean hset(String key, String item, Object value, long time) {
-        try {
-            redisTemplate.opsForHash().put(key, item, value);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public void hdel(String key, Object... item) {
-        redisTemplate.opsForHash().delete(key, item);
-    }
-
-    @Override
-    public boolean hHasKey(String key, String item) {
-        return redisTemplate.opsForHash().hasKey(key, item);
-    }
-
-    @Override
-    public double hincr(String key, String item, double by) {
-        return redisTemplate.opsForHash().increment(key, item, by);
-    }
-
-    @Override
-    public double hdecr(String key, String item, double by) {
-        return redisTemplate.opsForHash().increment(key, item, -by);
-    }
-
-    @Override
-    public Set<Object> sGet(String key) {
-        try {
-            return redisTemplate.opsForSet().members(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public boolean sHasKey(String key, Object value) {
-        try {
-            return redisTemplate.opsForSet().isMember(key, value);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public long sSet(String key, Object... values) {
-        try {
-            return redisTemplate.opsForSet().add(key, values);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    @Override
-    public long sSetAndTime(String key, long time, Object... values) {
-        try {
-            Long count = redisTemplate.opsForSet().add(key, values);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return count;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    @Override
-    public long sGetSetSize(String key) {
-        try {
-            return redisTemplate.opsForSet().size(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    @Override
-    public long setRemove(String key, Object... values) {
-        try {
-            Long count = redisTemplate.opsForSet().remove(key, values);
-            return count;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    @Override
-    public List<Object> lGet(String key, long start, long end) {
-        try {
-            return redisTemplate.opsForList().range(key, start, end);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public long lGetListSize(String key) {
-        try {
-            return redisTemplate.opsForList().size(key);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    @Override
-    public Object lGetIndex(String key, long index) {
-        try {
-            return redisTemplate.opsForList().index(key, index);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public boolean lSetAll(String key, List<Object> value) {
-        try {
-            redisTemplate.opsForList().leftPushAll(key, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean lSet(String key, Object value) {
-        try {
-            redisTemplate.opsForList().leftPushIfPresent(key, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean lSet(String key, Object value, long time) {
-        try {
-            redisTemplate.opsForList().leftPush(key, value);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-    }
-
-    @Override
-    public boolean lSetAll(String key, List<Object> value, long time) {
-        try {
-            redisTemplate.opsForList().leftPushAll(key, value);
-            if (time > 0)
-                expire(key, time);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean rSet(String key, Object value) {
-        try {
-            redisTemplate.opsForList().rightPush(key, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean rSet(String key, Object value, long time) {
-        try {
-            redisTemplate.opsForList().rightPush(key, value);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-    }
-
-    @Override
-    public boolean rSetAll(String key, List<Object> value) {
-        try {
-            redisTemplate.opsForList().rightPushAll(key, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
-    }
-
-    @Override
-    public boolean rSetAll(String key, List<Object> value, long time) {
-        try {
-            redisTemplate.opsForList().rightPushAll(key, value);
-            if (time > 0)
-                expire(key, time);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean lUpdateIndex(String key, long index, Object value) {
-        try {
-            redisTemplate.opsForList().set(key, index, value);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @Override
-    public long lRemove(String key, long count, Object value) {
-        try {
-            Long remove = redisTemplate.opsForList().remove(key, count, value);
-            return remove;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    @Override
-    public void rangeRemove(String key, Long stard, Long end) {
-        try {
-            redisTemplate.opsForList().trim(key, stard, end);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/cache/IGlobalCache.java

@@ -1,383 +0,0 @@
-package com.gyee.sampleimpala.common.cache;
-
-import org.springframework.data.redis.core.RedisTemplate;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 系统全局Cache接口，具体缓存方式需要实现该接口
- *
- * @author YuXD
- * @date 2021-01-05 10:38
- * @since v1.0
- */
-public interface IGlobalCache {
-
-    /**
-     * 指定缓存失效时间
-     *
-     * @param key  键
-     * @param time 时间(秒)
-     * @return
-     */
-    boolean expire(String key, long time);
-
-    /**
-     * @param key 键 不能为null
-     * @return 时间(秒) 返回0代表为永久有效
-     */
-    long getExpire(String key);
-
-    /**
-     * 判断key是否存在
-     *
-     * @param key 键
-     * @return true 存在 false不存在
-     */
-    boolean hasKey(String key);
-
-    /**
-     * 删除缓存
-     *
-     * @param key 可以传一个值 或多个
-     */
-    void del(String... key);
-// ============================String=============================
-
-    /**
-     * 普通缓存获取
-     *
-     * @param key 键
-     * @return 值
-     */
-    Object get(String key);
-
-    /**
-     * 普通缓存放入
-     *
-     * @param key   键
-     * @param value 值
-     * @return true成功 false失败
-     */
-    boolean set(String key, Object value);
-
-    /**
-     * 普通缓存放入并设置时间
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
-     * @return true成功 false 失败
-     */
-    boolean set(String key, Object value, long time);
-
-    /**
-     * 递增
-     *
-     * @param key   键
-     * @param delta 要增加几(大于0)
-     * @return
-     */
-    long incr(String key, long delta);
-
-    /**
-     * 递减
-     *
-     * @param key   键
-     * @param delta 要减少几(小于0)
-     * @return
-     */
-    long decr(String key, long delta);
-
-    /**
-     * HashGet
-     *
-     * @param key  键 不能为null
-     * @param item 项 不能为null
-     * @return 值
-     */
-    Object hget(String key, String item);
-
-    /**
-     * 获取hashKey对应的所有键值
-     *
-     * @param key 键
-     * @return 对应的多个键值
-     */
-    Map<Object, Object> hmget(String key);
-
-    /**
-     * HashSet
-     *
-     * @param key 键
-     * @param map 对应多个键值
-     * @return true 成功 false 失败
-     */
-    boolean hmset(String key, Map<String, Object> map);
-
-    /**
-     * HashSet 并设置时间
-     *
-     * @param key  键
-     * @param map  对应多个键值
-     * @param time 时间(秒)
-     * @return true成功 false失败
-     */
-    boolean hmset(String key, Map<String, Object> map, long time);
-
-    /**
-     * 向一张hash表中放入数据,如果不存在将创建
-     *
-     * @param key   键
-     * @param item  项
-     * @param value 值
-     * @return true 成功 false失败
-     */
-    boolean hset(String key, String item, Object value);
-
-    /**
-     * 向一张hash表中放入数据,如果不存在将创建
-     *
-     * @param key   键
-     * @param item  项
-     * @param value 值
-     * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
-     * @return true 成功 false失败
-     */
-    boolean hset(String key, String item, Object value, long time);
-
-    /**
-     * 删除hash表中的值
-     *
-     * @param key  键 不能为null
-     * @param item 项 可以使多个 不能为null
-     */
-    void hdel(String key, Object... item);
-
-    /**
-     * 判断hash表中是否有该项的值
-     *
-     * @param key  键 不能为null
-     * @param item 项 不能为null
-     * @return true 存在 false不存在
-     */
-    boolean hHasKey(String key, String item);
-
-    /**
-     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
-     *
-     * @param key  键
-     * @param item 项
-     * @param by   要增加几(大于0)
-     * @return
-     */
-    double hincr(String key, String item, double by);
-
-    /**
-     * hash递减
-     *
-     * @param key  键
-     * @param item 项
-     * @param by   要减少记(小于0)
-     * @return
-     */
-    double hdecr(String key, String item, double by);
-
-    /**
-     * 根据key获取Set中的所有值
-     *
-     * @param key 键
-     * @return
-     */
-    Set<Object> sGet(String key);
-
-    /**
-     * 根据value从一个set中查询,是否存在
-     *
-     * @param key   键
-     * @param value 值
-     * @return true 存在 false不存在
-     */
-    boolean sHasKey(String key, Object value);
-
-    /**
-     * 将数据放入set缓存
-     *
-     * @param key    键
-     * @param values 值 可以是多个
-     * @return 成功个数
-     */
-    long sSet(String key, Object... values);
-
-    /**
-     * 将set数据放入缓存
-     *
-     * @param key    键
-     * @param time   时间(秒)
-     * @param values 值 可以是多个
-     * @return 成功个数
-     */
-    long sSetAndTime(String key, long time, Object... values);
-
-
-    /**
-     * 获取set缓存的长度
-     *
-     * @param key 键
-     * @return
-     */
-    long sGetSetSize(String key);
-
-    /**
-     * 移除值为value的
-     *
-     * @param key    键
-     * @param values 值 可以是多个
-     * @return 移除的个数
-     */
-    long setRemove(String key, Object... values);
-
-    /**
-     * 获取list缓存的内容
-     *
-     * @param key   键
-     * @param start 开始
-     * @param end   结束 0 到 -1代表所有值
-     * @return
-     */
-    List<Object> lGet(String key, long start, long end);
-
-    /**
-     * 获取list缓存的长度
-     *
-     * @param key 键
-     * @return
-     */
-    long lGetListSize(String key);
-
-    /**
-     * 通过索引 获取list中的值
-     *
-     * @param key   键
-     * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
-     * @return
-     */
-    Object lGetIndex(String key, long index);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    boolean lSet(String key, Object value);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    boolean lSet(String key, Object value, long time);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    boolean lSetAll(String key, List<Object> value);
-
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒)
-     * @return
-     */
-    boolean lSetAll(String key, List<Object> value, long time);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-
-    boolean rSet(String key, Object value);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒)
-     * @return
-     */
-
-    boolean rSet(String key, Object value, long time);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    boolean rSetAll(String key, List<Object> value);
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒)
-     * @return
-     */
-    boolean rSetAll(String key, List<Object> value, long time);
-
-    /**
-     * 根据索引修改list中的某条数据
-     *
-     * @param key   键
-     * @param index 索引
-     * @param value 值
-     * @return
-     */
-    boolean lUpdateIndex(String key, long index, Object value);
-
-    /**
-     * 移除N个值为value
-     *
-     * @param key   键
-     * @param count 移除多少个
-     * @param value 值
-     * @return 移除的个数
-     */
-    long lRemove(String key, long count, Object value);
-
-    /**
-     * 从redis集合中移除[start,end]之间的元素
-     *
-     * @param key
-     * @param stard
-     * @param end
-     * @return
-     */
-    void rangeRemove(String key, Long stard, Long end);
-
-    /**
-     * 返回当前redisTemplate
-     *
-     * @return
-     */
-    RedisTemplate getRedisTemplate();
-}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/config/DatabasesConfig.java

@@ -1,17 +0,0 @@
-package com.gyee.sampleimpala.common.config;
-
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "databases")
-public class DatabasesConfig {
-
-    private List<String> basictables;
-}

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/config/MybatisPlusConfig.java

@@ -1,22 +0,0 @@
-package com.gyee.sampleimpala.common.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- *@ClassName MybatisPlusConfig
- *@Description 配置分页插件
- *@Version 1.0
- **/
-
-@Configuration
-public class MybatisPlusConfig {
-    /**
-     * 分页插件
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
-}