Преглед на файлове

测试多数据源@DS
测试写Taos

malijun преди 1 година
родител
ревизия
fbeb9a2da0

+ 5 - 0
electricity/meter/build.gradle

@@ -49,5 +49,10 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-configuration-processor")
     implementation("org.codehaus.groovy:groovy-all:2.4.1")
 
+    implementation("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion2")
+    implementation("com.baomidou:dynamic-datasource-spring-boot-starter:$mybatisPlusVersion")
+
+
+
 }
 

+ 67 - 0
electricity/meter/src/main/java/com/gyee/gaia/meter/entity/TDLineFDL15Min.java

@@ -0,0 +1,67 @@
+package com.gyee.gaia.meter.entity;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 风机日发电量表
+ * </p>
+ */
+@TableName("linefdl15min")
+@Data
+@DS("meter")
+public class TDLineFDL15Min extends Model<TDLineFDL15Min> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 子表名
+     */
+    private String tName;
+
+
+
+    /**
+     * 开始时间
+     */
+    private long  ts;
+
+    /**
+     * 开始值
+     */
+    private double startValue;
+
+
+
+
+    /**
+     * 测点编码
+     */
+    private String windpowerstationId;
+
+    /**
+     * 创建人;创建人
+     */
+    private String projectId;
+
+    /**
+     * 底码字段名称
+     */
+    private String name;
+
+
+
+
+
+
+}

+ 17 - 0
electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/TDLineFDL15MinMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.gaia.meter.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.ProMeterLineFDL15Min;
+import com.gyee.gaia.meter.entity.TDLineFDL15Min;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface TDLineFDL15MinMapper extends BaseMapper<TDLineFDL15Min> {
+
+    @Insert("insert into ${entity}")
+    int insert(String entity);
+
+}

+ 88 - 0
electricity/meter/src/main/java/com/gyee/gaia/meter/service/TDSaveLineFDL15MinTest.java

@@ -0,0 +1,88 @@
+package com.gyee.gaia.meter.service;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.adapter.Adapter;
+import com.gyee.gaia.meter.entity.*;
+import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
+import com.gyee.gaia.meter.service.impl.PowerStationServiceImpl;
+import com.gyee.gaia.meter.service.impl.ProMeterLineFDL15MinServiceImpl;
+import com.gyee.gaia.meter.service.impl.TDLineFDL15MinServiceImpl;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 04: 27
+ **/
+@SpringBootTest
+class TDSaveLineFDL15MinTest {
+    @Resource
+    TDLineFDL15MinServiceImpl tdLineFDL15MinService;
+
+
+    @Resource
+    Adapter adapter;
+    @Resource
+    PowerStationServiceImpl powerStationService;
+    @Resource
+    MeterPointServiceImpl meterPointService;
+    @Resource
+    ProMeterLineFDL15MinServiceImpl proMeterLineFDL15MinService;
+
+
+    @Value("${start.time}")
+    private String startTimeString;
+    @Value("${end.time}")
+    private String endTimeString;
+
+
+
+    @Test
+    void TDSaveSaveLineFDL15Min() {
+
+
+        TDLineFDL15Min tdLineFDL15Min = new TDLineFDL15Min();
+//        tdLineFDL15Min.setTName("MHSDJL.NX_GD_MHSF_DD_P1_L1_001_ZXYG045");
+        tdLineFDL15Min.setTs(new Date().getTime());
+        tdLineFDL15Min.setStartValue(100);
+        tdLineFDL15Min.setWindpowerstationId("NX_GDDL_MHS_FDC_STA");
+        tdLineFDL15Min.setProjectId("NX_GDDL_MHSF02_EG");
+
+
+        tdLineFDL15MinService.saveBatch();
+
+
+
+
+
+
+    }
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+
+

+ 17 - 0
electricity/meter/src/main/java/com/gyee/gaia/meter/service/iService/ITDLineFDL15MinService.java

@@ -0,0 +1,17 @@
+package com.gyee.gaia.meter.service.iService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.ProMeterLineFDL15Min;
+import com.gyee.gaia.meter.entity.TDLineFDL15Min;
+
+/**
+ * <p>
+ * 公司日发电量表 服务类
+ * </p>
+ *
+ * @author gfhd
+ * @since 2023-04-28
+ */
+public interface ITDLineFDL15MinService extends IService<TDLineFDL15Min> {
+
+}

+ 33 - 0
electricity/meter/src/main/java/com/gyee/gaia/meter/service/impl/TDLineFDL15MinServiceImpl.java

@@ -0,0 +1,33 @@
+package com.gyee.gaia.meter.service.impl;
+
+
+import cn.hutool.core.collection.ListUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.gaia.meter.entity.ProMeterLineFDL15Min;
+import com.gyee.gaia.meter.entity.TDLineFDL15Min;
+import com.gyee.gaia.meter.mapper.ProMeterLineFDL15MinMapper;
+import com.gyee.gaia.meter.mapper.TDLineFDL15MinMapper;
+import com.gyee.gaia.meter.service.iService.IProMeterLineFDL15MinService;
+import com.gyee.gaia.meter.service.iService.ITDLineFDL15MinService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@DS("meter")
+public class TDLineFDL15MinServiceImpl extends ServiceImpl<TDLineFDL15MinMapper, TDLineFDL15Min> implements ITDLineFDL15MinService {
+
+    @Resource
+    TDLineFDL15MinMapper tdLineFDL15MinMapper;
+
+    public int saveBatch() {
+
+        int count = 0;
+
+            count += tdLineFDL15MinMapper.insert(" MHSDJL_NX_GD_MHSF_DD_P1_L1_001_ZXYG045  VALUES (NOW, 10000);");
+
+        return count;
+    }
+}

+ 106 - 0
electricity/meter/src/main/resources/application.yml

@@ -0,0 +1,106 @@
+#server:
+#  port: 8022
+#
+#start:
+#  time: 2023-06-02
+#
+#end:
+#  time: 2023-06-08
+#test:
+#  abcd: asdf
+#adapter:
+#  url: http://192.168.1.67:8011/ts
+#
+#
+#meter:
+#  stations: MHS_FDC,NSS_FDC
+#
+#spring:
+#  cache:
+#    type: SIMPLE
+#  datasource:
+#    dynamic:
+#      primary: master #设置默认的数据源或者数据源组,默认值即为master
+#      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+#      datasource:
+#        master:
+#          url: jdbc:postgresql://192.168.10.18:5432/nx_dev
+#          username: gdprod
+#          password: gyee123
+#          driver-class-name: org.postgresql.Driver
+#          type: com.alibaba.druid.pool.DruidDataSource
+#        meter:
+#          url: jdbc:TAOS-RS://192.168.1.67:6041/meter?charset=UTF-8&locale=en_US.UTF-8&timezone=UTC-8
+#          username: root
+#          password: taosdata
+#          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+#    # datasource:
+#    #   driver-class-name: org.postgresql.Driver
+#    #   url: jdbc:postgresql://192.168.10.18:5432/nx_dev
+#    #   username: gdprod
+#    #   password: gyee123
+#    #   # url: jdbc:postgresql://192.168.1.67:5432/gyee
+#    #   # username: gyee
+#    #   # password: Gyee@2023!@#
+#    #   type: com.alibaba.druid.pool.DruidDataSource
+#    druid:
+#      max-active: 20
+#      initial-size: 1
+#      min-idle: 3
+#      max-wait: 60000
+#      time-between-eviction-runs-millis: 60000
+#      min-evictable-idle-time-millis: 300000
+#      test-while-idle: true
+#      test-on-borrow: false
+#      test-on-return: false
+#  jackson:
+#    date-format: yyyy-MM-dd HH:mm:ss
+#    time-zone: GMT+8
+#    default-property-inclusion: always
+#
+#
+#mybatis-plus:
+#  typeAliasesPackage: com.gyee.gaia.meter.entity
+#  mapper-locations: classpath:mappers-postgresql/*.xml
+#  global-config:
+#    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+#    id-type: 3
+#    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+#    field-strategy: 2
+#    #驼峰下划线转换
+#    db-column-underline: true
+#    #mp2.3+ 全局表前缀 mp_
+#    #table-prefix: mp_
+#    #刷新mapper 调试神器
+#    #refresh-mapper: true
+#    #数据库大写下划线转换
+#    #capital-mode: true
+#    # Sequence序列接口实现类配置
+#    key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
+#    #逻辑删除配置(下面3个配置)
+#    logic-delete-value: 1
+#    logic-not-delete-value: 0
+#    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+#    #自定义填充策略接口实现
+#    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
+#  configuration:
+#    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名),自动匹配无需as(没开启这个,SQL需要写as: select user_id as userId)
+#    map-underscore-to-camel-case: true
+#    cache-enabled: false
+#    #配置JdbcTypeForNull, oracle数据库必须配置
+#    jdbc-type-for-null: 'null'
+#    callSettersOnNulls: true
+#
+#xxl:
+#  job:
+#    admin:
+#      addresses: http://192.168.10.18:8080/xxl-job-admin
+#    accessToken:
+#    executor:
+#      appname: meter
+#      address:
+#      ip:
+#      port: 9999
+#      logpath: c:/xxl-job/meter/logs
+#      logretentiondays: 30
+#

+ 3 - 3
electricity/meter/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: meter
   profiles:
     # 环境配置
-    active: prod
+    active: dev
   cloud:
     nacos:
       discovery:
@@ -16,9 +16,9 @@ spring:
         # 配置文件格式
         file-extension: yml
         #开发环境配置命名空间
-#        namespace: fe339fbd-7113-405f-8d2a-70659c5d53e4
+        namespace: fe339fbd-7113-405f-8d2a-70659c5d53e4
         #生产环境配置命名空间
-        namespace: d148acca-95e7-4e07-a566-9a69012bcf01
+#        namespace: d148acca-95e7-4e07-a566-9a69012bcf01
         group: meter
         refresh-enabled: true
         # 共享配置

+ 5 - 0
electricity/meter/src/main/resources/mappers-postgresql/TDLineFDL15MinMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.gaia.meter.mapper.TDLineFDL15MinMapper">
+
+</mapper>