diff --git a/pom.xml b/pom.xml index 15aeadded..a9b377258 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 1.8.1 2.12.4 3.0.5 - 2.18 + 2.22 3.0.0.6 2.8.9 2.3.0 @@ -388,7 +388,7 @@ org.influxdb influxdb-java - 2.22 + ${influxdb-java.version} diff --git a/pqs-harmonic/harmonic-boot/src/test/java/com/njcn/OssTest.java b/pqs-harmonic/harmonic-boot/src/test/java/com/njcn/OssTest.java index 5c66c1518..e0cc77ac4 100644 --- a/pqs-harmonic/harmonic-boot/src/test/java/com/njcn/OssTest.java +++ b/pqs-harmonic/harmonic-boot/src/test/java/com/njcn/OssTest.java @@ -1,5 +1,7 @@ package com.njcn; +import com.njcn.influx.imapper.DataFlickerMapper; +import com.njcn.influx.pojo.po.DataFlicker; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import lombok.SneakyThrows; @@ -8,6 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired; import java.io.File; import java.io.FileInputStream; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; /** @@ -15,18 +20,41 @@ import java.util.UUID; * @version 1.0.0 * @date 2021年12月14日 12:55 */ -public class OssTest extends BaseJunitTest{ +public class OssTest extends BaseJunitTest { @Autowired private FileStorageUtil fileStorageUtil; + @Autowired + private DataFlickerMapper dataFlickerMapper; + @SneakyThrows @Test - public void test(){ + public void test() { File file = new File("C:\\Users\\DELL\\Desktop\\6FEC92B75A104D1295715A661A2CC196.docx"); String s = fileStorageUtil.uploadStream(new FileInputStream(file), OssPath.ALGORITHM, UUID.randomUUID() + ".docx"); System.out.println("hello"); } + @SneakyThrows + @Test + public void testInflux() { + List dataFlickers = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + DataFlicker dataFlicker = new DataFlicker(); + dataFlicker.setTime(Instant.now()); + dataFlicker.setFluc(12.5); + dataFlicker.setLineId("123456"); + dataFlicker.setPhaseType("C"); + dataFlicker.setPlt(12.5); + dataFlicker.setPst(12.5); + dataFlicker.setQualityFlag("0"); + Thread.sleep(1000); + dataFlickers.add(dataFlicker); + } + dataFlickerMapper.insertBatch(dataFlickers); + } + + } diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java index cf5cc8c1d..513e7fec2 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java @@ -5,6 +5,7 @@ import com.njcn.common.utils.serializer.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; +import org.influxdb.annotation.TimeColumn; import java.time.Instant; @@ -18,6 +19,7 @@ import java.time.Instant; @Measurement(name = "data_flicker") public class DataFlicker { + @TimeColumn @Column(name = "time") @JsonSerialize(using = InstantDateSerializer.class) private Instant time; diff --git a/pqs.ipr b/pqs.ipr index de9c5deec..d8c31c6c4 100644 --- a/pqs.ipr +++ b/pqs.ipr @@ -291,6 +291,7 @@ + @@ -322,20 +323,16 @@ - - - - - + - +