bug修复

gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

state/cause/src/main/java/com/gyee/gaia/cause/job/CauseJobHandler.java

@@ -21,7 +21,7 @@ import static com.xxl.job.core.biz.model.ReturnT.SUCCESS_CODE;
 
 
 @Component
-public class CauseJobHandler {
+public class CauseJobHandler{
 
     @Resource
     private IStateCauseService stateCauseService;
@@ -40,7 +40,7 @@ public class CauseJobHandler {
     public synchronized void run() {
         //获取最新更新时间
         QueryWrapper<StateCause> scWrapper = new QueryWrapper<>();
-        scWrapper.select("last_row(*)").groupBy("equipment_id");
+        scWrapper.select("last_row(end_time) end_time").groupBy("equipment_id");
         List<StateCause> list = stateCauseService.list(scWrapper);
         Date max;
         if(list.isEmpty()){

state/cause/src/main/java/com/gyee/gaia/cause/mapper/StateCauseMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.gaia.cause.entity.StateCause;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * <p>

timeseries/dao-taoscz/src/main/java/com/gyee/gaia/dao/taoscz/TaosHistoryDao.java

@@ -5,9 +5,9 @@ import com.gyee.gaia.common.exception.WisdomException;
 import com.gyee.gaia.dao.timeseries.IHistoryDao;
 import com.gyee.gaia.dao.timeseries.TaosczDao;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Blob;
@@ -25,10 +25,10 @@ public class TaosHistoryDao implements IHistoryDao {
 
     private long year_time = 8640000000L;
 
-    @Autowired
-    TaosConfig taosConfig;
-    @Autowired
-    ThreadPoolTaskConfig taskConfig;
+    @Resource
+    private TaosConfig taosConfig;
+    @Resource
+    private ThreadPoolTaskConfig taskConfig;
 
     @Override
     public List<TsData> getTsDataHistory(TsQuery tsQuery) throws Exception {
@@ -56,9 +56,10 @@ public class TaosHistoryDao implements IHistoryDao {
 
         Statement st = taosConfig.getInstance().createStatement();
         String point = tsQuery.getTsPoint().getId();
+        point = point.replaceFirst("\\.", "-");
         StringBuilder sb = new StringBuilder();
         sb.append("select avg(val),max(val),min(val) from ");
-        sb.append(taosConfig.getTableName(tsQuery.getTsPoint().getId()));
+        sb.append(taosConfig.getTableName(point));
         sb.append(" where ts between ").append(tsQuery.getStartTs());
         sb.append(" and ").append(tsQuery.getEndTs());
         //sb.append(" interval(").append(tsQuery.getInterval()).append("s)");
@@ -81,7 +82,7 @@ public class TaosHistoryDao implements IHistoryDao {
         sb.append("insert into ");
         for (TsPointData obj : dataList) {
             long time = obj.getTsData().getTs();
-            String point = obj.getTagName();
+            String point = obj.getTagName().replaceFirst("\\.", "-");
             double value = obj.getTsData().getDoubleValue().get();
             // sb.append(TaosCovertUtil.coverStationPrefix(point)).append(".");
             sb.append(point).append(" values (");
@@ -101,6 +102,7 @@ public class TaosHistoryDao implements IHistoryDao {
         Map<TsDataType, List<TsPoint>> pointGroup = tsPoints.stream().collect(Collectors.groupingBy(TsPoint::getTsDataType));
         for (Map.Entry<TsDataType, List<TsPoint>> entry : pointGroup.entrySet()) {
             String[] tagNames = entry.getValue().stream().map(TsPoint::getId).toArray(String[]::new);
+            tagNames = Arrays.stream(tagNames).map(tp -> tp.replaceFirst("\\.", "__")).toArray(String[]::new);
             if (entry.getKey() == TsDataType.DOUBLE)
                 for (String tag : tagNames) {
                     TaskCallable task = new TaskCallable(taosConfig, ts, tag, TsDataType.DOUBLE);
@@ -118,7 +120,10 @@ public class TaosHistoryDao implements IHistoryDao {
         //返回结果
         for (int i = 0; i < results.size(); i++) {
             Map<String, TsData> map = results.get(i).get();
-            result.putAll(map);
+            for (Map.Entry<String, TsData> entry : map.entrySet()) {
+                result.put(entry.getKey().replaceFirst("__", "."), entry.getValue());
+            }
+            //result.putAll(map);
         }
         //        for (Map.Entry<TsDataType, List<TsPoint>> entry : pointGroup.entrySet()) {
         //            String[] tagNames = tsPoints.stream().map(TsPoint::getId).toArray(String[]::new);
@@ -217,7 +222,7 @@ public class TaosHistoryDao implements IHistoryDao {
      * @throws WisdomException
      */
     private String getHistory(TsQuery tsQuery) throws WisdomException {
-        String point = tsQuery.getTsPoint().getId();
+        String point = tsQuery.getTsPoint().getId().replaceFirst("\\.", "-");
         StringBuilder sb = new StringBuilder();
         if (tsQuery.getInterpolation() == Interpolation.RAW) {
             sb.append("select * from ");

timeseries/data-adapter/src/main/java/com/gyee/gaia/dataadapter/controller/timeseries/TsDataController.java

@@ -5,30 +5,23 @@ import com.gyee.gaia.common.data.timeseries.TsData;
 import com.gyee.gaia.common.data.timeseries.TsPointData;
 import com.gyee.gaia.common.data.timeseries.TsPointDataList;
 import com.gyee.gaia.dataadapter.domain.timeseries.TsDataService;
-import com.gyee.gaia.dataadapter.domain.timeseries.TsPointService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /*
  *
  * @author songwb
  */
-
-
 @RestController
 @RequestMapping("/ts")
 @CrossOrigin
 public class TsDataController {
 
-    @Autowired
+    @Resource
     protected TsDataService tsDataService;
 
-    @Autowired
-    protected TsPointService tsPointService;
-
-
     //thingId：具体设施Id
     //thingType：场站(station)，风机(windturbine)，升压站(electrical)
     //uniformCode：统一编码

timeseries/data-adapter/src/main/java/com/gyee/gaia/dataadapter/domain/timeseries/TsDataService.java

@@ -5,9 +5,9 @@ import com.gyee.gaia.common.exception.WisdomException;
 import com.gyee.gaia.dao.timeseries.IHistoryDao;
 import com.gyee.gaia.dao.timeseries.ILatestDao;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,13 +18,11 @@ import java.util.Map;
 public class TsDataService {
 
 
-    @Autowired
+    @Resource
     private ILatestDao latestDao;
-
-    @Autowired
+    @Resource
     private IHistoryDao historyDao;
-
-    @Autowired
+    @Resource
     private TsPointService tsPointService;
 
 

资源文件/sql/nacos-mysql.sql

@@ -0,0 +1,221 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info   */
+/******************************************/
+CREATE TABLE `config_info` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id` varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id` varchar(128) DEFAULT NULL,
+    `content` longtext NOT NULL COMMENT 'content',
+    `md5` varchar(32) DEFAULT NULL COMMENT 'md5',
+    `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `src_user` text COMMENT 'source user',
+    `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
+    `app_name` varchar(128) DEFAULT NULL,
+    `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
+    `c_desc` varchar(256) DEFAULT NULL,
+    `c_use` varchar(64) DEFAULT NULL,
+    `effect` varchar(64) DEFAULT NULL,
+    `type` varchar(64) DEFAULT NULL,
+    `c_schema` text,
+    `encrypted_data_key` text NOT NULL COMMENT '秘钥',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info_aggr   */
+/******************************************/
+CREATE TABLE `config_info_aggr` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id` varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id` varchar(128) NOT NULL COMMENT 'group_id',
+    `datum_id` varchar(255) NOT NULL COMMENT 'datum_id',
+    `content` longtext NOT NULL COMMENT '内容',
+    `gmt_modified` datetime NOT NULL COMMENT '修改时间',
+    `app_name` varchar(128) DEFAULT NULL,
+    `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段';
+
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info_beta   */
+/******************************************/
+CREATE TABLE `config_info_beta` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id` varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id` varchar(128) NOT NULL COMMENT 'group_id',
+    `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
+    `content` longtext NOT NULL COMMENT 'content',
+    `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps',
+    `md5` varchar(32) DEFAULT NULL COMMENT 'md5',
+    `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `src_user` text COMMENT 'source user',
+    `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
+    `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
+    `encrypted_data_key` text NOT NULL COMMENT '秘钥',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info_tag   */
+/******************************************/
+CREATE TABLE `config_info_tag` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id` varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id` varchar(128) NOT NULL COMMENT 'group_id',
+    `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
+    `tag_id` varchar(128) NOT NULL COMMENT 'tag_id',
+    `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
+    `content` longtext NOT NULL COMMENT 'content',
+    `md5` varchar(32) DEFAULT NULL COMMENT 'md5',
+    `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `src_user` text COMMENT 'source user',
+    `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_tags_relation   */
+/******************************************/
+CREATE TABLE `config_tags_relation` (
+    `id` bigint(20) NOT NULL COMMENT 'id',
+    `tag_name` varchar(128) NOT NULL COMMENT 'tag_name',
+    `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type',
+    `data_id` varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id` varchar(128) NOT NULL COMMENT 'group_id',
+    `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
+    `nid` bigint(20) NOT NULL AUTO_INCREMENT,
+    PRIMARY KEY (`nid`),
+    UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`),
+    KEY `idx_tenant_id` (`tenant_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = group_capacity   */
+/******************************************/
+CREATE TABLE `group_capacity` (
+    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群',
+    `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
+    `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量',
+    `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
+    `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值',
+    `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
+    `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
+    `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_group_id` (`group_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = his_config_info   */
+/******************************************/
+CREATE TABLE `his_config_info` (
+    `id` bigint(20) unsigned NOT NULL,
+    `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    `data_id` varchar(255) NOT NULL,
+    `group_id` varchar(128) NOT NULL,
+    `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
+    `content` longtext NOT NULL,
+    `md5` varchar(32) DEFAULT NULL,
+    `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `src_user` text,
+    `src_ip` varchar(50) DEFAULT NULL,
+    `op_type` char(10) DEFAULT NULL,
+    `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
+    `encrypted_data_key` text NOT NULL COMMENT '秘钥',
+    PRIMARY KEY (`nid`),
+    KEY `idx_gmt_create` (`gmt_create`),
+    KEY `idx_gmt_modified` (`gmt_modified`),
+    KEY `idx_did` (`data_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造';
+
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = tenant_capacity   */
+/******************************************/
+CREATE TABLE `tenant_capacity` (
+    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID',
+    `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
+    `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量',
+    `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
+    `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数',
+    `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
+    `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
+    `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_tenant_id` (`tenant_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表';
+
+
+CREATE TABLE `tenant_info` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `kp` varchar(128) NOT NULL COMMENT 'kp',
+    `tenant_id` varchar(128) default '' COMMENT 'tenant_id',
+    `tenant_name` varchar(128) default '' COMMENT 'tenant_name',
+    `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc',
+    `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source',
+    `gmt_create` bigint(20) NOT NULL COMMENT '创建时间',
+    `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`),
+    KEY `idx_tenant_id` (`tenant_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info';
+
+CREATE TABLE `users` (
+    `username` varchar(50) NOT NULL PRIMARY KEY,
+    `password` varchar(500) NOT NULL,
+    `enabled` boolean NOT NULL
+    );
+
+CREATE TABLE `roles` (
+    `username` varchar(50) NOT NULL,
+    `role` varchar(50) NOT NULL,
+    UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE
+    );
+
+CREATE TABLE `permissions` (
+    `role` varchar(50) NOT NULL,
+    `resource` varchar(255) NOT NULL,
+    `action` varchar(8) NOT NULL,
+    UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE
+    );
+
+INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE);
+
+INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN');

资源文件/sql/taossql.sql

@@ -1,16 +1,22 @@
-CREATE DATABASE IF NOT EXISTS fjjsfw UPDATE 2 cacheLast 1
+/*CREATE DATABASE IF NOT EXISTS fjjsfw UPDATE 2 cacheLast 1
 
-DROP DATABASE fjjsfw;
+DROP DATABASE fjjsfw;*/
 CREATE DATABASE IF NOT EXISTS jsfw UPDATE 2 cacheLast 1
+CREATE DATABASE IF NOT EXISTS jsfw CACHEMODEL 'both'
+
 CREATE STABLE IF NOT EXISTS jsfw.realtime_average_target
-(time TIMESTAMP, wind_speed FLOAT, power FLOAT, generator_speed FLOAT, impeller_speed FLOAT, wind_direction FLOAT, theory_generation FLOAT)
+(time TIMESTAMP, wind_speed FLOAT, power FLOAT, generator_speed FLOAT, impeller_speed FLOAT, wind_direction FLOAT, theory_generation FLOAT, blade_angle FLOAT, engine_direction FLOAT, wind_deviation FLOAT)
 TAGS (station_id BINARY(30),equipment_id BINARY(30),uniform_code BINARY(20), description NCHAR(50))
+/*
 CREATE TABLE realtime_average_target.USING realtime_average_target TAGS
 (,
 );
-ALTER STABLE jsfw.realtime_average_target ADD COLUMN theory_generation FLOAT;
-
+ALTER STABLE jsfw.realtime_average_target ADD COLUMN theory_generation FLOAT;*/
+ALTER STABLE jsfw.realtime_average_target ADD COLUMN blade_angle FLOAT;
+ALTER STABLE jsfw.realtime_average_target ADD COLUMN engine_direction FLOAT;
+ALTER STABLE jsfw.realtime_average_target ADD COLUMN wind_deviation FLOAT;
 
+/*
 CREATE TABLE IF NOT EXISTS fjjsfw.realtime_average_target
 (
     time            TIMESTAMP,
@@ -20,8 +26,19 @@ CREATE TABLE IF NOT EXISTS fjjsfw.realtime_average_target
     generator_speed FLOAT,
     impeller_speed  FLOAT,
     wind_direction  FLOAT
-);
+);*/
 
 CREATE STABLE IF NOT EXISTS jsfw.state_cause
 (start_time TIMESTAMP, end_time TIMESTAMP, event NCHAR(30), advance_state NCHAR(30), after_state NCHAR(30), user_flag NCHAR(30), time INT UNSIGNED)
 TAGS (station_id BINARY(30),equipment_id BINARY(30))
+
+
+CREATE STABLE IF NOT EXISTS jsfw.state_cause
+(start_time TIMESTAMP, end_time TIMESTAMP, event TINYINT, advance_state TINYINT, after_state TINYINT, user_flag TINYINT, time INT UNSIGNED)
+TAGS (station_id BINARY(50),equipment_id BINARY(50),state_type NCHAR(50))
+
+@2.6版本taos-定边
+
+CREATE DATABASE IF NOT EXISTS jsfw_db UPDATE 2;
+create stable if not exists pointci (ts timestamp,val double)
+tags (description nchar(100),station binary(20),category binary(20),facility binary(20),uniformcode binary(20));