From 941465f3d4b5eec466cde362584ba13299772b97 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 22 Jun 2022 09:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/{test.java => DataTest.java}           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
 rename pqs-common/common-influxdb/src/test/java/{test.java => DataTest.java} (97%)

diff --git a/pqs-common/common-influxdb/src/test/java/test.java b/pqs-common/common-influxdb/src/test/java/DataTest.java
similarity index 97%
rename from pqs-common/common-influxdb/src/test/java/test.java
rename to pqs-common/common-influxdb/src/test/java/DataTest.java
index 290179aab..1fc6137ed 100644
--- a/pqs-common/common-influxdb/src/test/java/test.java
+++ b/pqs-common/common-influxdb/src/test/java/DataTest.java
@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
  * @createTime 2021/11/16 11:07
  */
 
-public class test {
+public class DataTest {
 
     //查询
     public static QueryResult select(InfluxDbUtils influxDBUtil) {
@@ -58,7 +58,7 @@ public class test {
         }
     }
 
-        public static void main(String[] args) {
+    public static void main(String[] args) {
         InfluxDbUtils influxDBUtil = new InfluxDbUtils("root", "123456789", "http://192.168.1.16:8086", "pqsbase", "");
         insert(influxDBUtil);
         //select(influxDBUtil);
@@ -81,9 +81,8 @@ public class test {
 
         long time = Long.parseLong("1646180719000");
         Map<String, String> tags = new HashMap<>();
-<<<<<<< .mine        tags.put("LineID", "fd4ffb0dd33eafaaf403b07a3fc1afe5");
-=======        tags.put("line_id", "89604adcaf7df6284fdaa352ccaba56b");
->>>>>>> .theirs        Map<String, Object> fields = new HashMap<>();
+        tags.put("LineID", "fd4ffb0dd33eafaaf403b07a3fc1afe5");
+        Map<String, Object> fields = new HashMap<>();
         fields.put("VU_Dev1",5.706);
         fields.put("VU_Dev2",5.706);
         fields.put("VU_Dev3",5.706);