建库建表查询接口

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.gyee'
-version = '0.0.1-SNAPSHOT'
+version = '0.0.1'
 sourceCompatibility = '1.8'
 
 configurations {
@@ -35,11 +35,12 @@ dependencies {
 
     implementation 'redis.clients:jedis:4.3.1'
     implementation 'xerces:xercesImpl:2.12.2'
-    implementation('org.apache.poi:poi-ooxml:5.2.3')
+    implementation 'org.apache.poi:poi-ooxml:5.2.3'
     implementation 'cn.hutool:hutool-poi:5.8.12'
     implementation 'cn.hutool:hutool-core:5.8.13'
     implementation 'com.taosdata.jdbc:taos-jdbcdriver:3.1.0'
     implementation 'com.alibaba:druid:1.2.16'
+    implementation 'com.baomidou:mybatis-plus-boot-starter:3.5.3.1'
 }
 
 tasks.named('test') {

src/main/java/com/gyee/redis2taos/Redis2taosApp.java

@@ -1,9 +1,11 @@
 package com.gyee.redis2taos;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
+@MapperScan("com.gyee.redis2taos.mapper")
 public class Redis2taosApp {
 
     public static void main(String[] args) {

src/main/java/com/gyee/redis2taos/config/FilePathConfig.java

@@ -8,7 +8,7 @@ import java.io.File;
 @Component
 public class FilePathConfig {
     private static String filePath;
-    private static String excelPath;
+    private static String taosTemplatePath;
 
     public static String getFilePath() {
         if (filePath == null) {
@@ -18,13 +18,13 @@ public class FilePathConfig {
         return filePath;
     }
 
-    public static String getExcelPath() {
-        if (excelPath == null) {
+    public static String getTaosInfoTablePath() {
+        if (taosTemplatePath == null) {
             getFilePath();
-            excelPath = filePath + "\\excel\\";
-            File file = new File(excelPath);
+            taosTemplatePath = filePath + File.separator + "Taos更新表.xlsx";
+            File file = new File(taosTemplatePath);
             if (!file.exists()) file.mkdirs();
         }
-        return excelPath;
+        return taosTemplatePath;
     }
 }

src/main/java/com/gyee/redis2taos/config/MybatisPlusConfig.java

@@ -0,0 +1,38 @@
+package com.gyee.redis2taos.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+
+    /**
+     * mybatis 3.4.1 pagination config start
+     ***/
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+        return interceptor;
+    }
+
+    //    @Bean
+    //    public ConfigurationCustomizer configurationCustomizer() {
+    //        return configuration -> configuration.setUseDeprecatedExecutor(false);
+    //    }
+
+/*    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+//        return new PaginationInterceptor();
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        //TODO: mybatis-plus do not support TDengine, use postgresql Dialect
+        paginationInterceptor.setDialectType("postgresql");
+
+        return paginationInterceptor;
+    }*/
+
+}

src/main/java/com/gyee/redis2taos/config/RedisConfig.java

@@ -26,10 +26,10 @@ public class RedisConfig {
             jedisPoolConfig.setMaxIdle(64);
             // 最小空闲连接
             jedisPoolConfig.setMinIdle(0);
-            if("".equals(password)){
+            if ("".equals(password)) {
                 jedisPool = new JedisPool(jedisPoolConfig, host, port, 5000);
-            }else {
-                jedisPool = new JedisPool(jedisPoolConfig, host, port, 5000,password);
+            } else {
+                jedisPool = new JedisPool(jedisPoolConfig, host, port, 5000, password);
             }
         }
         return jedisPool.getResource();

src/main/java/com/gyee/redis2taos/config/TaosConfig.java

@@ -1,13 +1,16 @@
 package com.gyee.redis2taos.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.gyee.redis2taos.util.TaosDatabaseInfo;
 import com.taosdata.jdbc.TSDBDriver;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.Statement;
 import java.util.Properties;
 
 @Slf4j
@@ -49,14 +52,24 @@ public class TaosConfig {
     private DruidDataSource dataSource = null;
 
     public Connection getInstance() throws Exception {
-        if (null == connection || connection.isClosed())
-            connection = getConnection();
+        if (null == connection || connection.isClosed()) {
+
+            Properties connProps = new Properties();
+            connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+            connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+            connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+            connection = DriverManager.getConnection(getJdbcUrl(), connProps);
+        }
 
         return connection;
     }
 
+    public Statement getStatement() throws Exception {
+        return getConnectionPool().getConnection().createStatement();
+    }
     /**
      * 建表用的链接，没有数据库
+     *
      * @return
      * @throws Exception
      */
@@ -75,20 +88,16 @@ public class TaosConfig {
         return createCon;
     }
 
-    private Connection getConnection() throws Exception {
-        Connection connection = null;
+    private String getJdbcUrl() throws ClassNotFoundException {
 
         Class.forName(driverType);
-        String jdbcUrl = "jdbc:TAOS-RS://" + serverIp + ":" + serverPort + "/" + dbName + "?user=" + userName + "&password=" + password;
-        if (driverType.equals("com.taosdata.jdbc.TSDBDriver"))
-            jdbcUrl = "jdbc:TAOS://" + serverIp + ":" + serverPort + "/" + dbName + "?user=" + userName + "&password=" + password;
-        Properties connProps = new Properties();
-        connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-        connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-        connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection(jdbcUrl, connProps);
+        String mydbname = TaosDatabaseInfo.map.get("mydbname");
+        if (StringUtil.isBlank(mydbname)) mydbname = dbName;
 
-        return connection;
+        String jdbcUrl = "jdbc:TAOS-RS://" + serverIp + ":" + serverPort + "/" + mydbname + "?user=" + userName + "&password=" + password;
+        if (driverType.equals("com.taosdata.jdbc.TSDBDriver"))
+            jdbcUrl = "jdbc:TAOS://" + serverIp + ":" + serverPort + "/" + mydbname + "?user=" + userName + "&password=" + password;
+        return jdbcUrl;
     }
 
     public String getTableName(String tagName) {
@@ -109,16 +118,11 @@ public class TaosConfig {
     }
 
     private DruidDataSource getConnectionPool() throws ClassNotFoundException {
-        if(dataSource==null){
+        if (dataSource == null) {
             dataSource = new DruidDataSource();
-            // jdbc properties
-            Class.forName(driverType);
-            String jdbcUrl = "jdbc:TAOS-RS://" + serverIp + ":" + serverPort + "/" + dbName;
-            if (driverType.equals("com.taosdata.jdbc.TSDBDriver"))
-                jdbcUrl = "jdbc:TAOS://" + serverIp + ":" + serverPort + "/" + dbName;
-            //
+
             dataSource.setDriverClassName(driverType);
-            dataSource.setUrl(jdbcUrl);
+            dataSource.setUrl(getJdbcUrl());
             dataSource.setUsername(userName);
             dataSource.setPassword(password);
             // pool configurations

src/main/java/com/gyee/redis2taos/config/ThreadPoolTaskConfig.java

@@ -18,11 +18,11 @@ public class ThreadPoolTaskConfig {
     /**
      * 核心线程数（默认线程数）
      */
-    private static final int corePoolSize = 256;
+    private static final int corePoolSize = 128;
     /**
      * 最大线程数
      */
-    private static final int maxPoolSize = 512;
+    private static final int maxPoolSize = 256;
     /**
      * 允许线程空闲时间（单位：默认为秒）
      */

src/main/java/com/gyee/redis2taos/controller/TaosController.java

@@ -1,16 +1,35 @@
 package com.gyee.redis2taos.controller;
 
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.gyee.redis2taos.config.FilePathConfig;
+import com.gyee.redis2taos.entity.TaosEntity;
+import com.gyee.redis2taos.mapper.PointAiMapper;
+import com.gyee.redis2taos.mapper.PointDiMapper;
+import com.gyee.redis2taos.result.Result;
+import com.gyee.redis2taos.result.ResultCode;
+import com.gyee.redis2taos.service.FileService;
 import com.gyee.redis2taos.service.ReadAndWriteService;
 import com.gyee.redis2taos.service.RedisService;
 import com.gyee.redis2taos.service.TaosService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import com.gyee.redis2taos.util.FileUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.IOUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-
-@RestController("/taos")
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController()
+@RequestMapping("/taos")
 public class TaosController {
 
     @Resource
@@ -19,41 +38,58 @@ public class TaosController {
     private TaosService taosService;
     @Resource
     private ReadAndWriteService readAndWriteService;
+    @Resource
+    private PointAiMapper pointAiMapper;
+    @Resource
+    private PointDiMapper pointDiMapper;
+    @Resource
+    private FileService fileService;
 
     //TODO 升级用mybatis-plus
 
-    @GetMapping("/database/create")
-    private boolean stableCreat(int keepday) {
+    @GetMapping("/create/database")
+    private JSONObject stableCreat(@RequestParam("dbname") String dbname, @RequestParam("keepday") int keepday) {
         try {
-            return taosService.createDataBase(keepday);
+            taosService.createDataBase(dbname, keepday);
+            return Result.seccess("数据库创建成功！");
         } catch (Exception e) {
             e.printStackTrace();
+            return Result.error();
         }
-        return false;
     }
 
-    @GetMapping("/stable/create")
-    private void stableCreat() {
+    @GetMapping("/create/supertable")
+    private JSONObject stableCreat(@RequestParam(value = "aiSTablename", required = false) String aiSTablename,
+                                   @RequestParam(value = "diSTablename", required = false) String diSTablename) {
         try {
-            taosService.createStables();
+            boolean b = taosService.createStables(aiSTablename, diSTablename);
+            if (b) return Result.seccess("超级表创建成功！");
+            return Result.error();
         } catch (Exception e) {
             e.printStackTrace();
+            return Result.error();
         }
     }
 
-    @GetMapping("/table/create")
-    private void tableCreat() {
+    @GetMapping("/create/table")
+    private JSONObject tableCreat() {
         try {
-            taosService.createTables2();
+            int tables = taosService.createTables();
+            if (tables > 0) Result.seccess("点表创建成功！");
+            return Result.error();
         } catch (Exception e) {
             e.printStackTrace();
+            return Result.error();
         }
     }
 
     @GetMapping("/table/create2")
     private void tableCreat2() {
         try {
-            redisService.creatTables();
+            String excelPath = FilePathConfig.getFilePath() + File.separator + "Taos更新表.xlsx";
+            ExcelReader reader = ExcelUtil.getReader(excelPath);
+            List<TaosEntity> read = reader.read(1, 2, TaosEntity.class);
+            redisService.creatTables(read);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -83,4 +119,50 @@ public class TaosController {
     private void taos2RedisStop() {
         readAndWriteService.stop();
     }
+
+    @GetMapping("/redis/updatekeys")
+    private void updateRedisKeys() {
+        readAndWriteService.getKeys();
+    }
+
+    @GetMapping("/template")
+    private void getTemplate(HttpServletResponse response) {
+        FileUtils.download(FilePathConfig.getFilePath() + File.separator + "Taos更新模板.xlsx", response);
+    }
+
+    @PostMapping("/uploadexcel")
+    private JSONObject uploadExcel(@RequestBody MultipartFile excelFile) {
+        List<TaosEntity> entities = new ArrayList<>();
+        //IOUtils.setByteArrayMaxOverride(500000000);
+
+        try {
+            FileUtils.write2File(excelFile.getInputStream());
+            entities = fileService.getTaosEntitys();
+            //ExcelReader reader = ExcelUtil.getReader(FilePathConfig.getTaosInfoTablePath());
+            //entities = reader.read(1, 2, TaosEntity.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("excel读取失败!");
+            return Result.error(4000,"excel读取失败!");
+        }
+
+        entities = entities.stream().map(te -> {
+            te.setPoint(te.getPoint().replaceFirst("\\.", "_"));
+            return te;
+        }).collect(Collectors.toList());
+        //redisService.creatTables(entities);
+
+        try {
+            taosService.createTablesByExcel(entities);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error(4000,"建表或者修改Tag失败！");
+        }
+        return Result.success();
+    }
+
+    @GetMapping("/2redis/status")
+    private JSONObject taos2RedisStatus() {
+        return Result.successData(readAndWriteService.isActive());
+    }
 }

src/main/java/com/gyee/redis2taos/controller/TaosSelectController.java

@@ -0,0 +1,127 @@
+package com.gyee.redis2taos.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.redis2taos.config.TaosConfig;
+import com.gyee.redis2taos.entity.Point;
+import com.gyee.redis2taos.mapper.PointMapper;
+import com.gyee.redis2taos.result.Result;
+import com.gyee.redis2taos.result.ResultCode;
+import com.gyee.redis2taos.util.TaosDatabaseInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.sql.Statement;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/taoselect")
+public class TaosSelectController {
+
+    @Resource
+    private TaosConfig taosConfig;
+    @Resource
+    private PointMapper pointMapper;
+
+    @GetMapping("/stations")
+    private JSONObject getStations(){
+        /*String sql = null;
+        try {
+            taosConfig.getStatement().executeQuery(sql);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }*/
+        List<String> strings = pointMapper.selectStation(TaosDatabaseInfo.map.get("aistablename"));
+        return Result.successData(strings);
+    }
+
+    @GetMapping("/title")
+    private JSONObject getTitle(){
+        Map<String, String> map = new LinkedHashMap<>();
+        map.put("dbnme", TaosDatabaseInfo.map.get("mydbname"));
+        map.put("aistablename", TaosDatabaseInfo.map.get("aistablename"));
+        map.put("distablename", TaosDatabaseInfo.map.get("distablename"));
+        return Result.successData(map);
+    }
+
+    @GetMapping("/tables")
+    private JSONObject getTables(@RequestParam("stablename") String stablename,
+                                 @RequestParam(value = "station",required = false) String station,
+                                 @RequestParam(value = "point",required = false) String point,
+                                 @RequestParam(value = "description",required = false) String description,
+                                 @RequestParam(value = "uniformcode",required = false) String uniformcode,
+                                 @RequestParam(value = "pageNum",required = false) Integer pageNum,
+                                 @RequestParam(value = "pageSize",required = false) Integer pageSize){
+        if (pageNum == null || pageSize == null) {
+            pageNum = 1;
+            pageSize = 100;
+        }
+        Page<Point> page = new Page<>(pageNum, pageSize);
+
+        QueryWrapper wrapper = new QueryWrapper<>();
+        wrapper.eq(station != null, "station", station)
+                .like(point != null, "tbname", point)
+                .like(description != null, "description", description)
+                .eq(uniformcode != null, "uniformcode", uniformcode);
+
+        List<Point> points = null;
+        try{
+            points = pointMapper.selectTableNamesPage(page,stablename,wrapper);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error(ResultCode.ERROR_DATA);
+        }
+
+        return Result.successData(points);
+    }
+
+    @DeleteMapping("/tables")
+    private JSONObject deleteTables(String tablenames){
+        String[] split = tablenames.split(",");
+        String s = "";
+        try {
+            for (String ss : split) {
+                s = ss;
+                pointMapper.deleteTable(ss);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.info(s+"删除出错！");
+            return Result.error(4000, s + "删除出错！");
+        }
+
+        return Result.success();
+    }
+
+    @GetMapping("/table/info")
+    private JSONObject getTableInfo(@RequestParam("tablename") String tablename,
+                                    @RequestParam(value = "pageNum",required = false) Integer pageNum,
+                                    @RequestParam(value = "pageSize",required = false) Integer pageSize,
+                                    @RequestParam("startTime") Long startTime,
+                                    @RequestParam("endTime") Long endTime){
+        if (pageNum == null || pageSize == null) {
+            pageNum = 1;
+            pageSize = 100;
+        }
+        Page<Point> page = new Page<>(pageNum, pageSize);
+
+        QueryWrapper wrapper = new QueryWrapper<>();
+        wrapper.between("ts", startTime, endTime);
+
+        List<Point> points = null;
+        try{
+            points = pointMapper.selectTableValPage(page, tablename, wrapper);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error(ResultCode.ERROR_DATA);
+        }
+
+        return Result.successData(points);
+    }
+}

src/main/java/com/gyee/redis2taos/entity/Point.java

@@ -0,0 +1,20 @@
+package com.gyee.redis2taos.entity;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class Point {
+    private String point;
+    private Timestamp ts;
+    private Object val;
+
+    private String description;
+    private String station;
+    private String category;
+    private String facility;
+    private String uniformcode;
+    private Float rate;
+    private String remark;
+}

src/main/java/com/gyee/redis2taos/entity/PointAi.java

@@ -0,0 +1,19 @@
+package com.gyee.redis2taos.entity;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class PointAi {
+    private Timestamp ts;
+    private Double val;
+
+    private String description;
+    private String station;
+    private String category;
+    private String facility;
+    private String uniformcode;
+    private Float rate;
+    private String remark;
+}

src/main/java/com/gyee/redis2taos/entity/PointDi.java

@@ -0,0 +1,19 @@
+package com.gyee.redis2taos.entity;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class PointDi {
+    private Timestamp ts;
+    private Boolean val;
+
+    private String description;
+    private String station;
+    private String category;
+    private String facility;
+    private String uniformcode;
+    private Float rate;
+    private String remark;
+}

src/main/java/com/gyee/redis2taos/entity/TaosEntity.java

@@ -0,0 +1,113 @@
+package com.gyee.redis2taos.entity;
+
+public class TaosEntity {
+    private String point;
+    private String description;
+    private String station;
+    private String category;
+    private String facility;
+    private String uniformcode;
+    private Float rate;
+    private String remark;
+    private String datatype;
+
+    public String getPoint() {
+        return point;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getStation() {
+        return station;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public String getFacility() {
+        return facility;
+    }
+
+    public String getUniformcode() {
+        return uniformcode;
+    }
+
+    public Float getRate() {
+        return rate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public String getDatatype() {
+        return datatype;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+
+    public void setDescription(Object description) {
+        if (description == null){
+            this.description = "";
+        }else {
+            this.description = description.toString();
+        }
+    }
+
+    public void setStation(Object station) {
+        if (station == null){
+            this.station = "";
+        }else {
+            this.station = station.toString();
+        }
+    }
+
+    public void setCategory(Object category) {
+        if (category == null){
+            this.category = "";
+        }else {
+            this.category = category.toString();
+        }
+    }
+
+    public void setFacility(Object facility) {
+        if (facility == null){
+            this.facility = "";
+        }else {
+            this.facility = facility.toString();
+        }
+    }
+
+    public void setUniformcode(Object uniformcode) {
+        if (uniformcode == null){
+            this.uniformcode = "";
+        }else {
+            this.uniformcode = uniformcode.toString();
+        }
+    }
+
+    public void setRate(Object rate) {
+        if (rate == null || rate.equals("")){
+            this.rate = 1f;
+        }else {
+            this.rate = Float.valueOf(rate.toString());
+        }
+    }
+
+    public void setRemark(Object remark) {
+        if (remark == null){
+            this.remark = "";
+        }else {
+            this.remark = remark.toString();
+        }
+    }
+
+    public void setDatatype(String datatype) {
+        this.datatype = datatype;
+    }
+}

src/main/java/com/gyee/redis2taos/mapper/PointAiMapper.java

@@ -0,0 +1,30 @@
+package com.gyee.redis2taos.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.redis2taos.entity.PointAi;
+import com.gyee.redis2taos.entity.TaosEntity;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.sql.Timestamp;
+
+public interface PointAiMapper extends BaseMapper<PointAi> {
+
+    @Update("CREATE STABLE IF NOT EXISTS #{dbname}(ts timestamp,val double) TAGS(description nchar(100),station binary(20),category binary(20),equipment binary(20),uniformcode binary(20),rate float,remark binary(30))")
+    int createSuperTable(String dbname);
+
+    @Update("CREATE TABLE IF NOT EXISTS #{tbName} USING #{stbName} TAGS(#{description},#{station},#{category},#{equipment},#{uniformcode},#{rate},#{remark})")
+    int createTable(@Param("tbName") String tbName, @Param("stbName") String stbName, @Param("description") String description, @Param("station") String station, @Param("category") String category, @Param("equipment") String equipment, @Param("uniformcode") String uniformcode, @Param("rate") float rate, @Param("remark") String remark);
+
+    @Update("DROP TABLE IF EXISTS #{tbname}")
+    void dropTable(String tbname);
+
+    @Insert("INSERT INTO #{tbname}(ts, val) values(#{ts}, #{val})")
+    int insertOne(@Param("tbname") String tbname, @Param("ts") Timestamp ts, @Param("val") Double val);
+
+    @Update("ALTER TABLE #{point} SET TAG description=#{description},station=#{station},category=#{category},equipment=#{equipment},uniformcode=#{uniformcode},rate=#{rate},remark=#{remark}")
+        //int alterTags(@Param("tbName") String tbName, @Param("description") String description, @Param("station") String station, @Param("category") String category, @Param("equipment") String equipment, @Param("uniformcode") String uniformcode, @Param("rate") float rate, @Param("remark") String remark);
+    int alterTags(TaosEntity entity);
+
+}

src/main/java/com/gyee/redis2taos/mapper/PointDiMapper.java

@@ -0,0 +1,24 @@
+package com.gyee.redis2taos.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.redis2taos.entity.PointDi;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.sql.Timestamp;
+
+public interface PointDiMapper extends BaseMapper<PointDi> {
+
+    @Update("CREATE STABLE IF NOT EXISTS #{dbname}(ts timestamp, val bool) TAGS(description nchar(100),station binary(20),category binary(20),equipment binary(20),uniformcode binary(20),rate float,remark binary(30))")
+    int createSuperTable(String dbname);
+
+    @Update("CREATE TABLE IF NOT EXISTS #{tbName} USING #{stbName} TAGS(#{description},#{station},#{category},#{equipment},#{uniformcode},#{rate},#{remark})")
+    int createTable(@Param("tbName") String tbName, @Param("stbName") String stbName, @Param("description") String description, @Param("station") String station, @Param("category") String category, @Param("equipment") String equipment, @Param("uniformcode") String uniformcode, @Param("rate") float rate, @Param("remark") String remark);
+
+    @Update("DROP TABLE IF EXISTS #{tbname}")
+    void dropTable(String tbname);
+
+    @Insert("INSERT INTO #{tbname}(ts, val) values(#{ts}, #{val})")
+    int insertOne(@Param("tbname") String tbname, @Param("ts") Timestamp ts, @Param("val") Boolean val);
+}

src/main/java/com/gyee/redis2taos/mapper/PointMapper.java

@@ -0,0 +1,30 @@
+package com.gyee.redis2taos.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.redis2taos.entity.Point;
+import com.gyee.redis2taos.entity.PointAi;
+import com.gyee.redis2taos.entity.TaosEntity;
+import org.apache.ibatis.annotations.*;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+public interface PointMapper extends BaseMapper<Point> {
+
+    @Select("SELECT DISTINCT station FROM #{stbname}")
+    List<String> selectStation(String stbname);
+
+    @Select("SELECT table_name FROM INFORMATION_SCHEMA.INS_TABLES where stable_name=#{stablename} limit #{startindex},#{endindex}")
+    List<String> selectTableName(@Param("stablename") String stablename,@Param("startindex") int startindex,@Param("endindex") int endindex);
+
+    @Select("SELECT tbname as point,description,ts,val,station,category,facility,uniformcode,rate,remark FROM ${stablename} ${ew.customSqlSegment}")
+    List<Point> selectTableNamesPage(IPage<Point> page,@Param("stablename") String stablename,@Param("ew") Wrapper wrapper);
+
+    @Update("DROP TABLE ${tablename}")
+    void deleteTable(String tablename);
+
+    @Select("SELECT * FROM ${tablename} ${ew.customSqlSegment}")
+    List<Point> selectTableValPage(IPage<Point> page,@Param("tablename") String tablename,@Param("ew") Wrapper wrapper);
+}

src/main/java/com/gyee/redis2taos/result/Result.java

@@ -0,0 +1,85 @@
+package com.gyee.redis2taos.result;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Result implements Serializable {
+
+    private Integer code;
+    private String message;
+    private Object data;
+
+    public static JSONObject error() {
+        JSONObject json = new JSONObject();
+        json.put("code", ResultCode.ERROR.getCode());
+        json.put("msg", ResultCode.ERROR.getMessage());
+        return json;
+    }
+
+    public static JSONObject error(ResultCode resultCode) {
+        JSONObject json = new JSONObject();
+        json.put("code", resultCode.getCode());
+        json.put("msg", resultCode.getMessage());
+        return json;
+    }
+
+    public static JSONObject error(ResultCode resultCode, String message) {
+        JSONObject json = new JSONObject();
+        json.put("code", resultCode.getCode());
+        json.put("msg", resultCode.getMessage() + "," + message);
+        return json;
+    }
+
+    public static JSONObject error(int code, String message) {
+        JSONObject json = new JSONObject();
+        json.put("code", code);
+        json.put("msg", message);
+        return json;
+    }
+
+    public static JSONObject success() {
+        JSONObject json = new JSONObject();
+        json.put("code", ResultCode.SUCCESS.getCode());
+        json.put("msg", ResultCode.SUCCESS.getMessage());
+        return json;
+    }
+
+    public static JSONObject seccess(int code, String message) {
+        JSONObject json = new JSONObject();
+        json.put("code", code);
+        json.put("msg", message);
+        return json;
+    }
+
+    public static JSONObject seccess(String message) {
+        JSONObject json = new JSONObject();
+        json.put("code", 200);
+        json.put("msg", message);
+        return json;
+    }
+
+    public static JSONObject success(ResultCode resultCode) {
+        JSONObject json = new JSONObject();
+        json.put("code", resultCode.getCode());
+        json.put("msg", resultCode.getMessage());
+        return json;
+    }
+
+    public static JSONObject successData(ResultCode code, Object data) {
+        JSONObject json = new JSONObject();
+        json.put("code", code.getCode());
+        json.put("msg", code.getMessage());
+        json.put("data", data == null ? new JSONObject() : data);
+        return json;
+    }
+
+    public static JSONObject successData(Object data) {
+        JSONObject json = new JSONObject();
+        json.put("code", 200);
+        json.put("data", data == null ? new JSONObject() : data);
+        return json;
+    }
+}

src/main/java/com/gyee/redis2taos/result/ResultCode.java

@@ -0,0 +1,85 @@
+package com.gyee.redis2taos.result;
+
+/*
+ * #1001～1999 区间表示参数错误
+ * #2001～2999 区间表示用户错误
+ * #3001～3999 区间表示权限异常
+ */
+
+public enum ResultCode {
+    /* 成功 */
+    SUCCESS(200, "成功"),
+
+    /* 默认失败 */
+    ERROR(4000, "失败"),
+    ERROR_FILE_NO(4001, "文件未找到"),
+    ERROR_FILE_TYPE(4002, "文件类型不正确"),
+    ERROR_FILE_DATA(4003, "数据为空"),
+    ERROR_DATA_TYPE(4004, "数据格式不正确"),
+    ERROR_CONNECT(4005, "数据库连接异常"),
+    ERROR_DATA(4006, "数据库操作失败"),
+    ERROR_DATA_REPEAT(4007, "数据已存在"),
+    ERROR_MODEL(4008, "同场站不同机型至少启用一个模型"),
+    ERROR_SQL(4009, "sql语法不正确"),
+    ERROR_UNSUPPORTED_SQL(4010, "不支持的sql语句"),
+
+
+    /* 参数错误：1000～1999 */
+    PARAM_NOT_VALID(1001, "参数无效"),
+    PARAM_IS_BLANK(1002, "参数为空"),
+    PARAM_TYPE_ERROR(1003, "参数类型错误"),
+    PARAM_NOT_COMPLETE(1004, "参数缺失"),
+    ERROR_DATA_DIR(1005, "目录创建失败"),
+    ERROR_DATA_FILE(1006, "文件上传失败"),
+
+    /* 用户错误 */
+    USER_NOT_LOGIN(2001, "用户未登录"),
+    USER_ACCOUNT_ERROR(2002, "账号或密码错误"),
+    USER_FAIL_LOGIN(2003, "登录失败"),
+    USER_OUT_LOGIN(2004, "登出成功"),
+    USER_ERROR_TOKEN(2005, "登录已过期，请重新登录"),
+
+    /* 业务错误 */
+    NO_PERMISSION(3001, "没有权限"),
+    ERROR_ENABLE(3002, "模型为启用状态，不允许删除"),
+    ERROR_TASK(3003, "有正在进行的任务，请稍后在试");
+
+    private Integer code;
+    private String message;
+
+    ResultCode(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /**
+     * 根据code获取message
+     *
+     * @param code
+     * @return
+     */
+    public static String getMessageByCode(Integer code) {
+        for (ResultCode ele : values()) {
+            if (ele.getCode().equals(code)) {
+                return ele.getMessage();
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/gyee/redis2taos/service/FileService.java

@@ -3,9 +3,8 @@ package com.gyee.redis2taos.service;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import com.gyee.redis2taos.config.FilePathConfig;
-import com.gyee.redis2taos.config.TaosConfig;
+import com.gyee.redis2taos.entity.TaosEntity;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -15,42 +14,61 @@ import java.util.List;
 @Service
 public class FileService {
 
-    @Autowired
+/*    @Autowired
     private TaosConfig taosConfig;
 
     private List<StringBuilder> sbList = new ArrayList<>();
-    private StringBuilder sb = new StringBuilder();
-    private String type = null;
-    private List<String> point = new ArrayList<>();
-
     private String s0 = null;
     private int i = 0;
     private String substring = null;
 
-    public List<StringBuilder> getExcelTaos() {
-        if (sbList.size() == 0)
-            ExcelUtil.readBySax(FilePathConfig.getExcelPath() + "Taos及Redis更新表.xlsx", 0, createRowHandler());
-        log.info("Excel数据转换完毕！");
-        return sbList;
-    }
+    private StringBuilder sb = new StringBuilder();
+    private String type = null;*/
+
+    private TaosEntity taosEntity;
+    private List<TaosEntity> taosEntitys=new ArrayList<>();
 
-    public List<String> getExcelRedis() {
-        if (point.size() == 0) getExcelTaos();
-        return point;
+    public List<TaosEntity> getTaosEntitys() throws Exception {
+        if (taosEntitys.size()==0) {
+            ExcelUtil.readBySax(FilePathConfig.getTaosInfoTablePath(), 0, createRowHandler());
+            log.info("Excel加载完毕！");
+            //XSSFWorkbook workbook = new XSSFWorkbook(excelPath);
+            //List<TaosEntity> entities = FileUtils.excel2Entity(workbook);
+            //taosEntitys.addAll(entities);
+            //ExcelReader reader = ExcelUtil.getReader(FilePathConfig.getTaosInfoTablePath());
+            //taosEntitys = reader.read(1, 2, TaosEntity.class);
+        }
+        return taosEntitys;
     }
 
     private RowHandler createRowHandler() {
         return new RowHandler() {
             @Override
             public void handle(int sheetIndex, long rowIndex, List<Object> rowlist) {
-                //entity = new TaosEntity();
-                if (rowIndex == 0) {
+                taosEntity = new TaosEntity();
+                if (rowIndex < 2) {
                     log.info("Excel读取完毕！");
-                    sbList.add(sb);
-                    sb.append("create table");
+                    //sbList.add(sb);
+                    //sb.append("create table");
                     return;
                 }
-                if (rowIndex % 2999 == 0) {
+                try {
+                    taosEntity.setPoint(rowlist.get(0).toString());
+                    taosEntity.setDescription(rowlist.get(1));
+                    taosEntity.setStation(rowlist.get(2));
+                    taosEntity.setCategory(rowlist.get(3));
+                    taosEntity.setFacility(rowlist.get(4));
+                    taosEntity.setUniformcode(rowlist.get(5));
+                    taosEntity.setRate(rowlist.get(6));
+                    taosEntity.setRemark(rowlist.get(7));
+                    taosEntity.setDatatype(rowlist.get(8).toString());
+                    taosEntitys.add(taosEntity);
+                }catch (Exception e){
+                    e.printStackTrace();
+                    System.out.println(taosEntitys);
+                }
+
+                /*if (rowIndex % 2999 == 0) {
                     sb = new StringBuilder();
                     sbList.add(sb);
                     sb.append("create table");
@@ -68,8 +86,7 @@ public class FileService {
                         .append(rowlist.get(2)).append("','").append(rowlist.get(3)).append("','").append(rowlist.get(4)).append("','")
                         .append(rowlist.get(5)).append("','").append(rowlist.get(6)).append("','").append(s0.substring(0, i < 0 ? 0 : i))
                         .append("')");
-                point.add(substring);
-                //entities.add(entity);
+                point.add(substring);*/
             }
         };
     }

src/main/java/com/gyee/redis2taos/service/ReadAndWriteService.java

@@ -16,6 +16,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -34,9 +35,11 @@ public class ReadAndWriteService implements ApplicationRunner {
     private RedisConfig redisConfig;
     @Resource
     private TaosConfig taosConfig;
+    @Resource
+    private TaosService taosService;
 
-    private List<List<String>> boolStrll;
-    private List<List<String>> douStrll;
+    private List<List<String>> boolStrll = new ArrayList<>();
+    private List<List<String>> douStrll = new ArrayList<>();
 
     @Value("${active:false}")
     private boolean active;
@@ -45,16 +48,21 @@ public class ReadAndWriteService implements ApplicationRunner {
     public void run(ApplicationArguments args) {
 
         getKeys();
+        try {
+            taosService.init();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         while (active) {
-            try{
+            try {
                 for (List<String> strings : boolStrll) {
                     taskExecutor.execute(new TaskRedis2Taos(strings, redisConfig, taosConfig, TsDataType.BOOLEAN, taskExecutor));
                 }
                 for (List<String> strings : douStrll) {
                     taskExecutor.execute(new TaskRedis2Taos(strings, redisConfig, taosConfig, TsDataType.DOUBLE, taskExecutor));
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
             }
             try {
@@ -66,36 +74,49 @@ public class ReadAndWriteService implements ApplicationRunner {
         }
     }
 
-    private void getKeys() {
+    public void getKeys() {
         //long l1 = System.currentTimeMillis();
         Set<String> keys = redisService.getKeys();
-        if(keys.size()==0) return;
+        if (keys.size() == 0) return;
         //long l2 = System.currentTimeMillis();
         log.info("读取rediskeys成功！！！," + keys.size() + "个点。");
         //按类型分点
-        Map<TsDataType, List<BasicTsPoint>> di = keys.stream().map(ss -> {
+        Map<TsDataType, List<BasicTsPoint>> point = keys.stream().map(ss -> {
             if (ss.contains("DI") || ss.contains("di")) {
                 return new BasicTsPoint(ss, TsDataType.BOOLEAN);
             } else {
                 return new BasicTsPoint(ss, TsDataType.DOUBLE);
             }
         }).collect(Collectors.groupingBy(TsPoint::getTsDataType));
+
+        List<BasicTsPoint> dipl = point.get(TsDataType.BOOLEAN);
+        List<BasicTsPoint> aipl = point.get(TsDataType.DOUBLE);
+
         //di点
-        List<String> boolCollect = di.get(TsDataType.BOOLEAN).stream().map(k1 -> k1.getId()).collect(Collectors.toList());
+        if (dipl != null) {
+            List<String> boolCollect = dipl.stream().map(k1 -> k1.getId()).collect(Collectors.toList());
+            //按数量分组，di点，分为9216个1组，redis单机可以控制在1s内
+            boolStrll = ListUtil.split(boolCollect, 9216);
+        }
         //ai点
-        List<String> douCollect = di.get(TsDataType.DOUBLE).stream().map(k1 -> k1.getId()).collect(Collectors.toList());
+        if (aipl != null) {
+            List<String> douCollect = aipl.stream().map(k1 -> k1.getId()).collect(Collectors.toList());
+            //按数量分组，ai点
+            douStrll = ListUtil.split(douCollect, 9216);
+        }
 
-        //按数量分组，di点，分为9216个1组，redis单机可以控制在1s内
-        boolStrll = ListUtil.split(boolCollect, 9216);
-        //按数量分组，ai点
-        douStrll = ListUtil.split(douCollect, 9216);
     }
 
-    public void stop(){
+    public void stop() {
         this.active = false;
     }
+
     public void start() throws Exception {
         this.active = true;
         run(new DefaultApplicationArguments());
     }
+
+    public boolean isActive() {
+        return active;
+    }
 }

src/main/java/com/gyee/redis2taos/service/RedisService.java

@@ -1,6 +1,7 @@
 package com.gyee.redis2taos.service;
 
 import com.gyee.redis2taos.config.RedisConfig;
+import com.gyee.redis2taos.entity.TaosEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import redis.clients.jedis.Jedis;
@@ -8,6 +9,7 @@ import redis.clients.jedis.Jedis;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -20,17 +22,20 @@ public class RedisService {
 
     private static final ThreadLocal<SimpleDateFormat> sdf = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
 
-    public void creatTables() {
-        List<String> excelRedis = fileService.getExcelRedis();
+    public void creatTables(List<TaosEntity> entities) {
+        //List<TaosEntity> excelTaos = fileService.getExcelTaos();
+        //List<String> collect = entities.stream().map(te -> te.getPoint().replaceFirst(".", "_")).collect(Collectors.toList());
+        List<String> collect = entities.stream().map(te -> te.getPoint()).collect(Collectors.toList());
         Map<String, String> map = null;
         Date date = new Date();
+        log.info("开始redis建表！");
         try (Jedis jedis = redisConfig.getJedis();) {
-            for (String excelRedi : excelRedis) {
+            for (String excelRedi : collect) {
                 if (!jedis.exists(excelRedi)) {
                     map = new LinkedHashMap<>();
                     map.put("pointid", excelRedi);
                     map.put("value", "0");
-                    map.put("timestamp", String.valueOf(date.getTime()/1000));
+                    map.put("timestamp", String.valueOf(date.getTime() / 1000));
                     map.put("datetime", sdf.get().format(date));
                     map.put("status", "0");
                     jedis.hmset(excelRedi, map);
@@ -39,7 +44,7 @@ public class RedisService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        System.out.println("redis建表完成！");
+        log.info("redis建表完成！");
     }
 
     public Set<String> getKeys() {

src/main/java/com/gyee/redis2taos/service/TaosService.java

@@ -1,10 +1,15 @@
 package com.gyee.redis2taos.service;
 
+import cn.hutool.core.collection.ListUtil;
 import com.gyee.redis2taos.config.TaosConfig;
+import com.gyee.redis2taos.entity.TaosEntity;
+import com.gyee.redis2taos.mapper.PointAiMapper;
 import com.gyee.redis2taos.timeseries.BasicTsPoint;
 import com.gyee.redis2taos.timeseries.TsDataType;
 import com.gyee.redis2taos.timeseries.TsPoint;
+import com.gyee.redis2taos.util.TaosDatabaseInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,35 +31,65 @@ public class TaosService {
     private FileService fileService;
     @Resource
     private RedisService redisService;
+    @Resource
+    private PointAiMapper pointAiMapper;
 
-    public boolean createDataBase(int keepday) throws Exception {
+    public void createDataBase(String dbname, int keepday) throws Exception {
         log.info("创建taos库!");
         Statement st = taosConfig.getCreateCon().createStatement();
-        String createSTableSql = "create database if not exists " + taosConfig.getDbName() + " cachemodel 'last_row' wal_retention_period 1800 keep " + keepday;
-        int i = st.executeUpdate(createSTableSql);
-        //taosConfig.closeCon();
-        if (i > 0) {
-            return true;
-        } else {
-            return false;
+        String testsql = "CREATE DATABASE IF NOT EXISTS mydbinfo";
+        st.executeUpdate(testsql);
+        testsql = "CREATE STABLE IF NOT EXISTS mydbinfo.kvstb (ts timestamp,name binary(30),val binary(30)) TAGS (remark binary(30))";
+        st.executeUpdate(testsql);
+        testsql = "CREATE TABLE IF NOT EXISTS mydbinfo.dbinfos USING mydbinfo.kvstb TAGS('')";
+        st.executeUpdate(testsql);
+        testsql = "SELECT * FROM mydbinfo.dbinfos WHERE name='mydbname'";
+        ResultSet resultSet = st.executeQuery(testsql);
+        if (!resultSet.next()) {
+            testsql = "INSERT INTO mydbinfo.dbinfos VALUES (NOW, 'mydbname', '" + dbname + "');";
+            st.executeUpdate(testsql);
+            String mydbname = TaosDatabaseInfo.map.get("mydbname");
+            if (mydbname == null) TaosDatabaseInfo.map.put("mydbname", dbname);
         }
+        String createSTableSql = "CREATE DATABASE IF NOT EXISTS " + dbname + " cachemodel 'last_row' wal_retention_period 1800 keep " + keepday;
+        st.executeUpdate(createSTableSql);
     }
 
 
-    public boolean createStables() throws Exception {
-        log.info("创建taos超级表!");
+    public boolean createStables(String aiSTablename, String diSTablename) throws Exception {
+
         Statement st = taosConfig.getInstance().createStatement();
-        String sqlai = "create stable if not exists " + taosConfig.getDbName() + "." + taosConfig.getAIStableName() + " (ts timestamp,val double) " +
-                "tags (description nchar(100),station binary(20),category binary(20),facility binary(20),uniformcode binary(20),rate float,remark binary(30));";
-        int a = st.executeUpdate(sqlai);
-        String sqladi = "create stable if not exists " + taosConfig.getDbName() + "." + taosConfig.getDIStableName() + " (ts timestamp,val bool) " +
-                "tags (description nchar(100),station binary(20),category binary(20),facility binary(20),uniformcode binary(20),rate float,remark binary(30));";
-        int d = st.executeUpdate(sqladi);
-        if ((a + d) > 0) {
-            return true;
-        } else {
-            return false;
+        if (StringUtil.isBlank(aiSTablename) || StringUtil.isBlank(diSTablename)) {
+            aiSTablename = taosConfig.getAIStableName();
+            diSTablename = taosConfig.getDIStableName();
+        }
+
+        String mdnm = TaosDatabaseInfo.map.get("mydbname");
+        if (mdnm == null) return false;
+
+        String testsql = "SELECT * FROM mydbinfo.dbinfos WHERE name='aistablename'";
+        ResultSet resultSet = st.executeQuery(testsql);
+        if (!resultSet.next()) {
+            testsql = "INSERT INTO mydbinfo.dbinfos VALUES (NOW, 'aistablename', '" + aiSTablename + "');";
+            st.executeUpdate(testsql);
+            testsql = "INSERT INTO mydbinfo.dbinfos VALUES (NOW, 'distablename', '" + diSTablename + "');";
+            st.executeUpdate(testsql);
+
+            String astn = TaosDatabaseInfo.map.get("aistablename");
+            String dstn = TaosDatabaseInfo.map.get("distablename");
+            if (astn == null) TaosDatabaseInfo.map.put("aistablename", aiSTablename);
+            if (dstn == null) TaosDatabaseInfo.map.put("distablename", diSTablename);
         }
+
+        log.info("创建taos超级表!");
+        String sqlai = "CREATE STABLE IF NOT EXISTS " + mdnm + "." + aiSTablename + " (ts timestamp,val double) " +
+                "TAGS (description nchar(100),station binary(20),category binary(20),facility binary(20),uniformcode binary(20),rate float,remark binary(30));";
+        st.executeUpdate(sqlai);
+        String sqladi = "CREATE STABLE IF NOT EXISTS " + mdnm + "." + diSTablename + " (ts timestamp,val bool) " +
+                "TAGS (description nchar(100),station binary(20),category binary(20),facility binary(20),uniformcode binary(20),rate float,remark binary(30));";
+        st.executeUpdate(sqladi);
+
+        return true;
     }
 
     public List<String> showDataBase() throws Exception {
@@ -70,25 +105,124 @@ public class TaosService {
         return ss;
     }
 
-    public int createTables() throws Exception {
+    public int createTablesByExcel(List<TaosEntity> entities) throws Exception {
         log.info("创建taos表!");
         Statement st = taosConfig.getInstance().createStatement();
-        List<StringBuilder> excelTaos = fileService.getExcelTaos();
-        int i = 0;
+        //List<TaosEntity> entities = fileService.getExcelTaos();
+        List<StringBuilder> excelTaos = taosEntity2CreateStr(entities);
         for (StringBuilder excelTao : excelTaos) {
-            int i1 = st.executeUpdate(excelTao.toString() + ";");
-            i += i1;
+            try {
+                st.executeUpdate(excelTao.toString() + ";");
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.info(excelTao.toString());
+            }
+            log.info(String.valueOf(entities.size()));
         }
         log.info("taos表创建完成！");
+
+        log.info("更新taos的Tag！");
+        int i = 0;
+        StringBuilder sb;
+        String s;
+        for (TaosEntity entity : entities) {
+            sb = new StringBuilder();
+            if (entity.getPoint() == null) continue;
+            sb.append("ALTER TABLE ").append(entity.getPoint()).append(" SET TAG ");
+            s = sb.toString();
+
+            sb = new StringBuilder();
+            sb.append(s).append("description='").append(entity.getDescription()).append("'");
+            st.executeUpdate(sb.toString());
+
+            sb = new StringBuilder();
+            sb.append(s).append("station='").append(entity.getStation()).append("'");
+            st.executeUpdate(sb.toString());
+
+            sb = new StringBuilder();
+            sb.append(s).append("category='").append(entity.getCategory()).append("'");
+            st.executeUpdate(sb.toString());
+
+            sb = new StringBuilder();
+            sb.append(s).append("facility='").append(entity.getFacility()).append("'");
+            st.executeUpdate(sb.toString());
+
+            sb = new StringBuilder();
+            sb.append(s).append("uniformcode='").append(entity.getUniformcode()).append("'");
+            st.executeUpdate(sb.toString());
+
+            sb = new StringBuilder();
+            sb.append(s).append("rate=").append(entity.getRate());
+            st.executeUpdate(sb.toString());
+
+            sb = new StringBuilder();
+            sb.append(s).append("remark='").append(entity.getRemark()).append("'");
+            st.executeUpdate(sb.toString());
+
+            /*sb.append("ALTER TABLE ").append(entity.getPoint()).append(" SET TAG description='").append(entity.getDescription())
+                    .append("',station='").append(entity.getStation()).append("',category='").append(entity.getCategory())
+                    .append("',equipment='").append(entity.getEquipment()).append("',uniformcode='")
+                    .append(entity.getUniformcode()).append("',rate=").append(entity.getRate()).append(",remark='")
+                    .append(entity.getRemark()).append("')");
+            st.executeUpdate(sb.toString());*/
+            //pointAiMapper.alterTags(entity);
+            i++;
+            log.info(String.valueOf(i));
+        }
+        log.info("taos的Tag更新完成！");
         return i;
     }
 
-    public int createTables2() throws Exception {
+    private List<StringBuilder> taosEntity2CreateStr(List<TaosEntity> entities) {
+        List<StringBuilder> sbList = new ArrayList<>();
+        StringBuilder sb = new StringBuilder();
+        Map<String, List<TaosEntity>> collect = entities.stream().collect(Collectors.groupingBy(TaosEntity::getDatatype));
+        List<TaosEntity> teDouble = collect.get("double");
+        if (teDouble == null) teDouble = new ArrayList<>();
+        List<TaosEntity> teBool = collect.get("bool");
+        if (teBool == null) teBool = new ArrayList<>();
+
+        String astn = TaosDatabaseInfo.map.get("aistablename");
+        String dstn = TaosDatabaseInfo.map.get("distablename");
+        if (astn == null) astn = taosConfig.getAIStableName();
+        if (dstn == null) dstn = taosConfig.getDIStableName();
+
+        TaosEntity te;
+        for (int i = 0; i < teDouble.size(); i++) {
+            te = teDouble.get(i);
+            if (i % 2999 == 0) {
+                sb = new StringBuilder();
+                sbList.add(sb);
+                sb.append("CREATE TABLE");
+            }
+            sb.append(" IF NOT EXISTS ").append(te.getPoint()).append(" USING ").append(astn).append(" TAGS('")
+                    .append(te.getDescription()).append("','").append(te.getStation()).append("','")
+                    .append(te.getCategory()).append("','").append(te.getFacility()).append("','")
+                    .append(te.getUniformcode()).append("',").append(te.getRate()).append(",'")
+                    .append(te.getRemark()).append("')");
+        }
+        for (int i = 0; i < teBool.size(); i++) {
+            te = teBool.get(i);
+            if (i % 2999 == 0) {
+                sb = new StringBuilder();
+                sbList.add(sb);
+                sb.append("CREATE TABLE");
+            }
+            sb.append(" IF NOT EXISTS ").append(te.getPoint()).append(" USING ").append(dstn).append(" TAGS('")
+                    .append(te.getDescription()).append("','").append(te.getStation()).append("','")
+                    .append(te.getCategory()).append("','").append(te.getFacility()).append("','")
+                    .append(te.getUniformcode()).append("',").append(te.getRate()).append(",'")
+                    .append(te.getRemark()).append("')");
+        }
+        return sbList;
+    }
+
+    public int createTables() throws Exception {
         log.info("创建taos表!");
         Statement st = taosConfig.getInstance().createStatement();
 
         Set<String> keys = redisService.getKeys();
-        if(keys.size()==0) return 0;
+        if (keys.size() == 0) return 0;
         log.info("读取rediskeys成功！！！" + keys.size() + "个点。");
         //按类型分点
         Map<TsDataType, List<BasicTsPoint>> di = keys.stream().map(ss -> {
@@ -103,27 +237,46 @@ public class TaosService {
         //ai点
         List<String> douCollect = di.get(TsDataType.DOUBLE).stream().map(k1 -> k1.getId()).collect(Collectors.toList());
 
+        //按数量分组，di点
+        List<List<String>> boolStrll = ListUtil.split(boolCollect, 2900);
+        //按数量分组，ai点
+        List<List<String>> douStrll = ListUtil.split(douCollect, 2900);
+
+        String astn = TaosDatabaseInfo.map.get("aistablename");
+        String dastn = TaosDatabaseInfo.map.get("distablename");
+        if (astn == null || dastn == null) return 0;
+
         int k = 0;
-        for (String s : boolCollect) {
-            st.executeUpdate(getDiSql(s));
-            log.info(String.valueOf(++k));
+        for (List<String> s : boolStrll) {
+            st.executeUpdate(getDiSql(s, dastn));
+            k += s.size();
+            log.info(String.valueOf(k));
         }
-        for (String s : douCollect) {
-            st.executeUpdate(getAiSql(s));
-            log.info(String.valueOf(++k));
+        for (List<String> s : douStrll) {
+            st.executeUpdate(getAiSql(s, astn));
+            k += s.size();
+            log.info(String.valueOf(k));
         }
         log.info("taos表创建完成！");
-        return 1;
+        return k;
     }
 
-    private String getAiSql(String s) {
-        return "CREATE TABLE IF NOT EXISTS "+taosConfig.getDbName()+"."+s+" USING "+taosConfig.getDbName()
-                +"."+taosConfig.getAIStableName()+" TAGS('','','','','',1,'');";
+    private String getAiSql(List<String> ls, String astn) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("CREATE TABLE");
+        for (String s : ls) {
+            sb.append(" IF NOT EXISTS ").append(s).append(" USING ").append(astn).append(" TAGS('','','','','',1,'')");
+        }
+        return sb.toString();
     }
 
-    private String getDiSql(String s) {
-        return "CREATE TABLE IF NOT EXISTS "+taosConfig.getDbName()+"."+s+" USING "+taosConfig.getDbName()
-                +"."+taosConfig.getDIStableName()+" TAGS('','','','','',1,'');";
+    private String getDiSql(List<String> ls, String dastn) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("CREATE TABLE");
+        for (String s : ls) {
+            sb.append(" IF NOT EXISTS ").append(s).append(" USING ").append(dastn).append(" TAGS('','','','','',1,'')");
+        }
+        return sb.toString();
     }
 
     public List<String> deleteTables() throws Exception {
@@ -164,4 +317,14 @@ public class TaosService {
         }
         return ss;
     }
+
+    public void init() throws Exception {
+        Statement st = taosConfig.getCreateCon().createStatement();
+        String testsql = "SELECT * FROM mydbinfo.dbinfos";
+        ResultSet resultSet = st.executeQuery(testsql);
+        while (resultSet.next()) {
+            TaosDatabaseInfo.map.put(resultSet.getString(2), resultSet.getString(3));
+            log.info("读取表信息" + resultSet.getString(2) + ":" + resultSet.getString(3));
+        }
+    }
 }

src/main/java/com/gyee/redis2taos/service/TaskInsert2Taos.java

@@ -22,7 +22,7 @@ public class TaskInsert2Taos implements Runnable {
 
     @Override
     public void run() {
-        if("INSERT INTO ;".equals(sql)) return;
+        if ("INSERT INTO ;".equals(sql)) return;
         try {
             conn.createStatement().executeUpdate(sql);
         } catch (SQLException e) {

src/main/java/com/gyee/redis2taos/service/TaskRedis2Taos.java

@@ -4,7 +4,6 @@ import com.gyee.redis2taos.config.RedisConfig;
 import com.gyee.redis2taos.config.TaosConfig;
 import com.gyee.redis2taos.timeseries.TsDataType;
 import com.gyee.redis2taos.util.ChangedSave;
-import com.taosdata.jdbc.TSDBPreparedStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -13,8 +12,6 @@ import redis.clients.jedis.Jedis;
 import redis.clients.jedis.Pipeline;
 
 import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -68,9 +65,9 @@ public class TaskRedis2Taos implements Runnable {
             boolean bl;
             List<String> response;
 
-            int j = 1;
+            //int j = 1;
             if (dataType == TsDataType.BOOLEAN) {
-                for (int i = 0; i < objects.size();i++) {
+                for (int i = 0; i < objects.size(); i++) {
                     response = (List<String>) objects.get(i);
 
                     value = response.get(1);
@@ -99,7 +96,7 @@ public class TaskRedis2Taos implements Runnable {
                             ChangedSave.map.put(pointid, datetime);
                             ts = Long.valueOf(datetime) * 1000;
                             bl = Double.valueOf(value) == 1;
-                            j++;
+                            //j++;
                             sb.append(pointid).append(" VALUES (").append(ts).append(",").append(bl).append(") ");
                         }
                     } else {
@@ -107,7 +104,7 @@ public class TaskRedis2Taos implements Runnable {
                     }
 
                     //分为1000个1组，taos单机可以控制在1s内
-                    if (j % 1000 == 0) {
+                    /*if (j % 1000 == 0) {
                         sb.append(";");
 
                         taskExecutor.execute(new TaskInsert2Taos(conn, sb.toString(), "USING " +
@@ -115,7 +112,7 @@ public class TaskRedis2Taos implements Runnable {
 
                         sb = new StringBuilder();
                         sb.append("INSERT INTO ");
-                    }
+                    }*/
                 }
                 sb.append(";");
                 taskExecutor.execute(new TaskInsert2Taos(conn, sb.toString(), "USING " +
@@ -138,14 +135,14 @@ public class TaskRedis2Taos implements Runnable {
                             ts = Long.valueOf(datetime) * 1000;
                             val = Double.valueOf(value);
 
-                            j++;
+                            //j++;
                             sb.append(pointid).append(" VALUES (").append(ts).append(",").append(val).append(") ");
                         }
                     } else {
                         ChangedSave.map.put(pointid, datetime);
                     }
 
-                    if (j % 1000 == 0) {
+                    /*if (j % 1000 == 0) {
                         sb.append(";");
 
                         taskExecutor.execute(new TaskInsert2Taos(conn, sb.toString(), "USING " +
@@ -153,7 +150,7 @@ public class TaskRedis2Taos implements Runnable {
 
                         sb = new StringBuilder();
                         sb.append("INSERT INTO ");
-                    }
+                    }*/
                 }
                 sb.append(";");
                 taskExecutor.execute(new TaskInsert2Taos(conn, sb.toString(), "USING " +

src/main/java/com/gyee/redis2taos/timeseries/BaseTsQuery.java

@@ -1,47 +0,0 @@
-package com.gyee.redis2taos.timeseries;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class BaseTsQuery implements TsQuery {
-
-    private final TsPoint tsPoint;
-    private final long startTs;
-    private final long endTs;
-    private final int interval;
-    private final int limit;
-    private final Interpolation interpolation;
-
-
-    public BaseTsQuery(TsPoint tsPoint, long startTs, long endTs, int interval, int limit, Interpolation interpolation) {
-        this.tsPoint = tsPoint;
-        this.startTs = startTs;
-        this.endTs = endTs;
-        this.interval = interval;
-        this.limit = limit;
-        this.interpolation = interpolation;
-    }
-
-    public BaseTsQuery(TsPoint tsPoint, long startTs, long endTs) {
-        this(tsPoint, startTs, endTs, 1, 1, Interpolation.RAW);
-    }
-
-    @Override
-    public Date[] getDateArray() {
-        if (interpolation == Interpolation.SNAP && startTs > 0 && endTs > 0 && interval > 0 && endTs > startTs) {
-            int count = Math.round((endTs - startTs) / interval / 1000);
-            int length = count;// <= limit ? count : limit;
-            Date[] result = new Date[length];
-            for (int i = 0; i < length; i++) {
-                long ts = startTs + (long) i * interval * 1000;
-                result[i] = new Date(ts);
-            }
-
-            return result;
-        }
-        return null;
-    }
-
-}

src/main/java/com/gyee/redis2taos/timeseries/BasicTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/BlobTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/BlobWriteTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/BooleanTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/BooleanWriteTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/Coordinate.java

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

src/main/java/com/gyee/redis2taos/timeseries/CoordinateTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/CoordinateWriteTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/DoubleStatData.java

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

src/main/java/com/gyee/redis2taos/timeseries/DoubleTsData.java

@@ -1,33 +0,0 @@
-package com.gyee.redis2taos.timeseries;
-
-/**
- * @author songwb<songwb @ aliyun.com>
- */
-public class DoubleTsData extends BasicTsData {
-
-    private final double actualValue;
-
-    public DoubleTsData(long ts, short status, double actualValue) {
-        super(ts, status);
-        this.actualValue = actualValue;
-    }
-
-
-    public double getDoubleValue() {
-        return actualValue;
-    }
-
-    //    public String getValue() {
-    //        return Double.toString(actualValue);
-    //    }
-
-    @Override
-    public String toString() {
-        return "DoubleTsData{ts='" + this.getTs() +
-                "', status='" + this.getStatus() +
-                "', value='" + this.getDoubleValue() +
-                "'}";
-    }
-
-}
-

src/main/java/com/gyee/redis2taos/timeseries/DoubleWriteTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/GeneralTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/IntegerTsData.java

@@ -1,20 +0,0 @@
-package com.gyee.redis2taos.timeseries;
-
-/**
- * @Auther: ruyuan
- * @Date: 2019-05-04 17:26
- * @Description:
- */
-public class IntegerTsData extends BasicTsData {
-
-    private final Integer actualValue;
-
-    public IntegerTsData(long ts, short status, Integer actualValue) {
-        super(ts, status);
-        this.actualValue = actualValue;
-    }
-
-    public Integer getIntegerValue() {
-        return actualValue;
-    }
-}

src/main/java/com/gyee/redis2taos/timeseries/Interpolation.java

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

src/main/java/com/gyee/redis2taos/timeseries/LongTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/LongWriteTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/StringTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/StringWriteTsData.java

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

src/main/java/com/gyee/redis2taos/timeseries/TsPointData.java

@@ -1,54 +0,0 @@
-package com.gyee.redis2taos.timeseries;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author songwb<songwb @ aliyun.com>
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TsPointData {
-
-    private String tagName;
-    private GeneralTsData tsData;
-
-    public TsDataType findDataType() {
-        if (tsData.getDoubleValue().isPresent()) {
-            return TsDataType.DOUBLE;
-        } else if (tsData.getBooleanValue().isPresent()) {
-            return TsDataType.BOOLEAN;
-        } else if (tsData.getLongValue().isPresent()) {
-            return TsDataType.LONG;
-        } else if (tsData.getStringValue().isPresent()) {
-            return TsDataType.STRING;
-        } else if (tsData.getBlobValue().isPresent()) {
-            return TsDataType.BLOB;
-        } else if (tsData.getCoordinateValue().isPresent()) {
-            return TsDataType.COORDINATE;
-        }
-
-
-        return TsDataType.DOUBLE;
-    }
-
-    /**
-     * 获取 double 类型值
-     *
-     * @return
-     */
-    public double getValue() {
-        if (tsData.getDoubleValue().isPresent()) {
-            return tsData.getDoubleValue().get();
-        } else if (tsData.getBooleanValue().isPresent()) {
-            return tsData.getBooleanValue().get() ? 1.0 : 0.0;
-        } else if (tsData.getLongValue().isPresent()) {
-            return tsData.getLongValue().get();
-        }
-        return 0.0;
-    }
-}
-

src/main/java/com/gyee/redis2taos/timeseries/TsPointDataList.java

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

src/main/java/com/gyee/redis2taos/timeseries/TsQuery.java

@@ -1,21 +0,0 @@
-package com.gyee.redis2taos.timeseries;
-
-import java.util.Date;
-
-public interface TsQuery {
-
-    TsPoint getTsPoint();
-
-    long getStartTs();
-
-    long getEndTs();
-
-    // 单位秒
-    int getInterval();
-
-    int getLimit();
-
-    Interpolation getInterpolation();
-
-    Date[] getDateArray();
-}

src/main/java/com/gyee/redis2taos/util/FileUtils.java

@@ -0,0 +1,166 @@
+package com.gyee.redis2taos.util;
+
+import com.gyee.redis2taos.config.FilePathConfig;
+import com.gyee.redis2taos.entity.TaosEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFSheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+@Slf4j
+public class FileUtils {
+    /**
+     * 下载文件
+     */
+    public static void download(String fileName, HttpServletResponse response) {
+        FileInputStream fis = null;
+        BufferedInputStream bis = null;
+        try {
+            // 获取文件
+            File file = new File(fileName);
+            // 清空缓冲区，状态码和响应头(headers)
+            response.reset();
+            // 设置ContentType，响应内容为二进制数据流，编码为utf-8，此处设定的编码是文件内容的编码
+            response.setContentType("application/vnd.ms-excel;charset=utf-8");
+            fileName = response.encodeURL(new String(file.getName().getBytes(), "iso8859-1"));
+            // 以（Content-Disposition: attachment; filename="filename.jpg"）格式设定默认文件名，设定utf编码，此处的编码是文件名的编码，使能正确显示中文文件名
+            response.setHeader("Content-Disposition", "attachment;fileName=" + fileName);
+
+            // 实现文件下载
+            byte[] buffer = new byte[1024];
+            fis = new FileInputStream(file);
+            bis = new BufferedInputStream(fis);
+            // 获取字节流
+            OutputStream os = response.getOutputStream();
+            int i = bis.read(buffer);
+            while (i != -1) {
+                os.write(buffer, 0, i);
+                i = bis.read(buffer);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (bis != null) {
+                try {
+                    bis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static void write2File(InputStream stream) throws IOException {
+        File file = new File(FilePathConfig.getTaosInfoTablePath());
+        file.delete();
+        long copy = IOUtils.copy(stream, file);
+        log.info("保存excel成功！" + copy);
+    }
+
+    /**
+     * @describe 压缩多个文件
+     */
+    public static String zipFiles(List<File> srcFiles, File zipFile) {
+        // 判断压缩后的文件存在不，不存在则创建
+        //if (!zipFile.exists()) {
+        try {
+            zipFile.createNewFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        // 创建 FileOutputStream 对象
+        FileOutputStream fileOutputStream = null;
+        // 创建 ZipOutputStream
+        ZipOutputStream zipOutputStream = null;
+        // 创建 FileInputStream 对象
+        FileInputStream fileInputStream = null;
+
+        try {
+            // 实例化 FileOutputStream 对象
+            fileOutputStream = new FileOutputStream(zipFile);
+            // 实例化 ZipOutputStream 对象
+            zipOutputStream = new ZipOutputStream(fileOutputStream);
+            // 创建 ZipEntry 对象
+            ZipEntry zipEntry = null;
+            // 遍历源文件数组
+            for (int i = 0; i < srcFiles.size(); i++) {
+                // 将源文件数组中的当前文件读入 FileInputStream 流中
+                fileInputStream = new FileInputStream(srcFiles.get(i));
+                // 实例化 ZipEntry 对象，源文件数组中的当前文件
+                zipEntry = new ZipEntry(srcFiles.get(i).getName());
+                zipOutputStream.putNextEntry(zipEntry);
+                // 该变量记录每次真正读的字节个数
+                int len;
+                // 定义每次读取的字节数组
+                byte[] buffer = new byte[1024];
+                while ((len = fileInputStream.read(buffer)) > 0) {
+                    zipOutputStream.write(buffer, 0, len);
+                }
+            }
+            zipOutputStream.closeEntry();
+            zipOutputStream.close();
+            fileInputStream.close();
+            fileOutputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        //}
+        return zipFile.getAbsolutePath();
+    }
+
+    public static List<TaosEntity> excel2Entity(XSSFWorkbook xssfWorkbook) {
+        log.info("读取excel!");
+        List<TaosEntity> entities = new ArrayList<>();
+        SXSSFWorkbook workbook = new SXSSFWorkbook(xssfWorkbook, 9999);
+        SXSSFSheet sheet = workbook.getSheetAt(0);
+        //获得当前sheet的结束行
+        int lastRowNum = sheet.getLastRowNum();
+        String scv1, scv2, scv3, scv4, scv5, scv6, scv8, scv9;
+        float scv7;
+        TaosEntity te;
+        //循环从第2行开始
+        for (int rowNum = 2; rowNum <= lastRowNum; rowNum++) {
+            //获得当前行
+            Row row = sheet.getRow(rowNum);
+            scv1 = row.getCell(0).getStringCellValue();
+            scv2 = row.getCell(1).getStringCellValue();
+            scv3 = row.getCell(2).getStringCellValue();
+            scv4 = row.getCell(3).getStringCellValue();
+            scv5 = row.getCell(4).getStringCellValue();
+            scv6 = row.getCell(5).getStringCellValue();
+            scv7 = (float) row.getCell(6).getNumericCellValue();
+            scv8 = row.getCell(7).getStringCellValue();
+            scv9 = row.getCell(8).getStringCellValue();
+            te = new TaosEntity();
+            te.setPoint(scv1);
+            te.setDescription(scv2 != null ? scv2 : "");
+            te.setStation(scv3);
+            te.setCategory(scv4 != null ? scv4 : "");
+            te.setFacility(scv5 != null ? scv5 : "");
+            te.setUniformcode(scv6);
+            te.setRate(scv7);
+            te.setRemark(scv8 == null ? "" : scv8);
+            te.setDatatype(scv9);
+            entities.add(te);
+        }
+        log.info("excel读取完毕！");
+        return entities;
+    }
+}

src/main/java/com/gyee/redis2taos/util/TaosDatabaseInfo.java

@@ -0,0 +1,8 @@
+package com.gyee.redis2taos.util;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class TaosDatabaseInfo {
+    public static Map<String, String> map = new ConcurrentHashMap<>();
+}

src/main/resources/application.yml

@@ -2,8 +2,22 @@ server:
   port: 8085
 
 spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
   application:
     name: redis2taos
+  datasource:
+    driver-class-name: com.taosdata.jdbc.TSDBDriver
+    url: jdbc:TAOS://192.168.126.128:6030/nxxny?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+    username: root
+    password: taosdata
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      initial-size: 10
+      min-idle: 5
+      max-active: 15
 
 redis:
   host: 192.168.126.128
@@ -15,10 +29,13 @@ redis:
 #  port: 6379
 #  password: 123456
 
+active: false
+
 #适配器链接taos数据库配置信息
 taoscz:
   server_ip: 192.168.126.128
   server_port: 6030
+  #数据库名
   db_name: nxxny
   user_name: root
   password: taosdata
@@ -29,4 +46,23 @@ taoscz:
   #taos中ai测点的超级表名
   ai_stable_name: pointai
   #taos中di测点的超级表名
-  di_stable_name: pointdi
+  di_stable_name: pointdi
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: false
+
+logging:
+  level:
+    #root: info
+    com.gyee: WARN
+    com.gyee.redis2taos.mapper: debug
+    web: WARN
+    sql: WARN
+  file:
+    name: server.log
+    path: ./log
+  logback:
+    rollingpolicy:
+      #max-file-size: 9MB
+      file-name-pattern: server.%d{yyyy-MM-dd}.%i.gz

src/test/java/com/gyee/redis2taos/MyTest.java

@@ -1,8 +1,13 @@
 package com.gyee.redis2taos;
 
+import com.gyee.redis2taos.util.TaosDatabaseInfo;
+
+import java.util.Objects;
+
 public class MyTest {
     public static void main(String[] args) {
-        double a = 1.0d;
-        System.out.println(a==1);
+        String k = "";
+        String s = k.toString();
+        System.out.println();
     }
 }