Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

冲突

Browse Source
This commit is contained in:
xuyang
2022-06-22 09:55:31 +08:00
parent f9141aaba3
commit 941465f3d4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-common/common-influxdb/src/test/java/test.java → pqs-common/common-influxdb/src/test/java/DataTest.java
View File

@@ -19,7 +19,7 @@ import java.util.stream.Collectors;
* @createTime 2021/11/16 11:07 * @createTime 2021/11/16 11:07
*/ */
public class test { public class DataTest {
//查询 //查询
public static QueryResult select(InfluxDbUtils influxDBUtil) { public static QueryResult select(InfluxDbUtils influxDBUtil) {
@@ -81,9 +81,8 @@ public class test {
long time = Long.parseLong("1646180719000"); long time = Long.parseLong("1646180719000");
Map<String, String> tags = new HashMap<>(); Map<String, String> tags = new HashMap<>();
<<<<<<< .mine tags.put("LineID", "fd4ffb0dd33eafaaf403b07a3fc1afe5"); tags.put("LineID", "fd4ffb0dd33eafaaf403b07a3fc1afe5");
======= tags.put("line_id", "89604adcaf7df6284fdaa352ccaba56b"); Map<String, Object> fields = new HashMap<>();
>>>>>>> .theirs Map<String, Object> fields = new HashMap<>();
fields.put("VU_Dev1",5.706); fields.put("VU_Dev1",5.706);
fields.put("VU_Dev2",5.706); fields.put("VU_Dev2",5.706);
fields.put("VU_Dev3",5.706); fields.put("VU_Dev3",5.706);