From fb620c15e7d2c342294054b8cb50b9ca6654d5c9 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期二, 04 三月 2025 11:55:23 +0800
Subject: [PATCH] 时序库查询修改

---
 zhitan-system/src/main/java/com/zhitan/realtimedata/config/RtdbConfig.java                |    2 ++
 zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java |    2 +-
 zhitan-system/src/main/java/com/zhitan/realtimedata/domain/WritePoint.java                |    1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/config/RtdbConfig.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/config/RtdbConfig.java
index a91da2b..aae057d 100644
--- a/zhitan-system/src/main/java/com/zhitan/realtimedata/config/RtdbConfig.java
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/config/RtdbConfig.java
@@ -19,4 +19,6 @@
   public String token;
 
   public String bucket;
+
+  public String measurement;
 }
diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java
index fd11822..38f70ea 100644
--- a/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java
@@ -147,7 +147,7 @@
         StringBuilder fluxSql = new StringBuilder();
         fluxSql.append("from(bucket: \"").append(config.getBucket()).append("\")")
                 .append(timeRange).append("|> filter(fn: (r) => r[\"_measurement\"] == \"")
-                .append("meilin\")");
+                .append(config.getMeasurement()).append(")");
         fluxSql.append("|> filter(fn: (r) => r[\"_field\"] == \"value\")");
         if (!tagCodes.isEmpty()) {
             fluxSql.append("|> filter(fn: (r) => r[\"tag\"] =~ /");
diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/WritePoint.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/WritePoint.java
index 7e97092..e839ad1 100644
--- a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/WritePoint.java
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/WritePoint.java
@@ -8,7 +8,6 @@
 /**
  * @author fanxinfu
  */
-@Measurement(name = "meilin")
 public class WritePoint {
 
   @Column(tag = true)

--
Gitblit v1.9.3