增加TdEngine

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/pom.xml

@@ -41,6 +41,11 @@
           <version>1.9.0-SNAPSHOT</version>
           <scope>compile</scope>
       </dependency>
+      <dependency>
+          <groupId>com.taosdata.jdbc</groupId>
+          <artifactId>taos-jdbcdriver</artifactId>
+          <version>3.2.4</version>
+      </dependency>
   </dependencies>
   
   <build>

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/TdEngineConfig.java

+package com.yeejoin.amos.boot.module.jxiop.biz.config;
+
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+/**
+ * 从数据源配置
+ * 若需要配置更多数据源 , 直接在yml中添加数据源配置再增加相应的新的数据源配置类即可
+ */
+@Configuration
+@MapperScan(basePackages = "com.yeejoin.amos.boot.module.jxiop.biz.tdmapper", sqlSessionFactoryRef = "taosSqlSessionFactory")
+public class TdEngineConfig {
+    private Logger logger = LoggerFactory.getLogger(TdEngineConfig.class);
+    // 精确到 cluster 目录，以便跟其他数据源隔离
+    private static final String MAPPER_LOCATION = "classpath*:mapper/tdengine/*.xml";
+
+
+    @Value("${spring.db3.datasource.url}")
+    private String dbUrl;
+
+    @Value("${spring.db3.datasource.username}")
+    private String username;
+
+    @Value("${spring.db3.datasource.password}")
+    private String password;
+
+    @Value("${spring.db3.datasource.driver-class-name}")
+    private String driverClassName;
+
+
+    @Bean(name = "taosDataSource")   //声明其为Bean实例
+    public DataSource clusterDataSource() {
+        DruidDataSource datasource = new DruidDataSource();
+
+        datasource.setUrl(this.dbUrl);
+        datasource.setUsername(username);
+        datasource.setPassword(password);
+        datasource.setDriverClassName(driverClassName);
+        return datasource;
+    }
+
+    @Bean(name = "taosTransactionManager")
+    public DataSourceTransactionManager clusterTransactionManager() {
+        return new DataSourceTransactionManager(clusterDataSource());
+    }
+
+    @Bean(name = "taosSqlSessionFactory")
+    public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("taosDataSource") DataSource culsterDataSource)
+            throws Exception {
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
+        sessionFactory.setDataSource(culsterDataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(TdEngineConfig.MAPPER_LOCATION));
+        sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.boot.module.jxiop.biz.entity");
+        //mybatis 数据库字段与实体类属性驼峰映射配置
+        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
+        return sessionFactory.getObject();
+    }
+}
+

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IndicatorData.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IndicatorData {
+
+    private String  id;
+
+    private String  address;
+
+    private String  dataType;
+
+    private String  equipmentSpecificName;
+
+    private String  gatewayId;
+
+    private String  isAlarm;
+
+    private Date createdTime;
+
+    private String  unit;
+
+    private String  value;
+
+    private Float valueF ;
+
+    private String  valueLabel;
+
+    private String  equipmentIndexName;
+
+    private String  equipmentNumber;
+
+    private String  displayName;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java

@@ -306,6 +306,7 @@ public class LargeScreenImpl {
         ybfbn = new BigDecimal(ybfbn).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
         mapdta.put("NJHWC", ybfbn);
         try {
+            System.out.println(JSON.toJSONString(mapdta));
             emqKeeper.getMqttClient().publish("qyyxzb/"+s, JSON.toJSONString(mapdta).getBytes(),0,false);
         } catch (MqttException e) {
             e.printStackTrace();
@@ -417,13 +418,13 @@ public class LargeScreenImpl {
          List<String> value=new ArrayList<>();
          value.add(RSD);
          Map<String,List<String>> map=new HashMap<>();
-         map.put("equipmentIndexName",value);
+         map.put("equipmentIndexName.keyword",value);
          List<String> value1=new ArrayList<>();
          value1.add(monthy);
-         map.put("moon",value1);
+         map.put("moon.keyword",value1);
 
 
-         List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day", ESDailyPowerGeneration.class);
+         List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day.keyword", ESDailyPowerGeneration.class);
 
          Map<String,Double>  mapdta=new HashMap<>();
          DecimalFormat format2 = new DecimalFormat("#.0000");
@@ -466,13 +467,13 @@ public class LargeScreenImpl {
         List<String> value=new ArrayList<>();
         value.add(RSD);
         Map<String,List<String>> map=new HashMap<>();
-        map.put("equipmentIndexName",value);
-        map.put("gatewayId", gatewayId);
+        map.put("equipmentIndexName.keyword",value);
+        map.put("gatewayId.keyword", gatewayId);
         List<String> value1=new ArrayList<>();
         value1.add(monthy);
-        map.put("moon",value1);
+        map.put("moon.keyword",value1);
 
-        List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day",ESDailyPowerGeneration.class);
+        List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day.keyword",ESDailyPowerGeneration.class);
 
         Map<String,Double>  mapdta=new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("#.0000");

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev.properties

@@ -12,6 +12,13 @@ spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
 spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 
+
+spring.db3.datasource.url=jdbc:TAOS-RS://139.9.170.47:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db3.datasource.username=root
+spring.db3.datasource.password=taosdata
+spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+
+
 ## eureka properties:
 eureka.instance.hostname=172.16.10.220
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/