From 742079e5c2cd01ae111eed0360e1e4e9bfd3e8af Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 1 Nov 2024 15:54:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/influx/query/InfluxQueryWrapper.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java b/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java
index 970dd10..c862164 100644
--- a/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java
+++ b/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java
@@ -238,6 +238,20 @@ public class InfluxQueryWrapper {
         return this;
     }
 
+    public <T, R> InfluxQueryWrapper count(String columnName,String resultName) {
+        String selectFragment = InfluxDbSqlConstant.COUNT +
+                InfluxDbSqlConstant.LBK +
+                InfluxDbSqlConstant.DQM +
+                columnName +
+                InfluxDbSqlConstant.DQM +
+                InfluxDbSqlConstant.RBK +
+                InfluxDbSqlConstant.AS +
+                resultName +
+                StrPool.C_SPACE;
+        selectColumns.add(selectFragment);
+        return this;
+    }
+
 
     /***
      * 统计平均值

From 8d12f409bbcb7b74e0b249e9b25fb46ef0d132b8 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 22 Nov 2024 14:55:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E8=83=9C=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E8=A6=81=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=98=A0=E5=B0=84=E5=BF=BD=E7=95=A5=E4=B8=8B?=
 =?UTF-8?q?=E5=88=92=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/njcn/influx/core/InfluxExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/njcn/influx/core/InfluxExecutor.java b/src/main/java/com/njcn/influx/core/InfluxExecutor.java
index 95f24f8..1aa522e 100644
--- a/src/main/java/com/njcn/influx/core/InfluxExecutor.java
+++ b/src/main/java/com/njcn/influx/core/InfluxExecutor.java
@@ -70,7 +70,7 @@ public class InfluxExecutor {
                                         //处理tag分组数据
                                         for (String columnName : tags.keySet()) {
                                             for (Field declaredField : fields) {
-                                                if (columnName.replace("_","").equalsIgnoreCase(InfluxQueryWrapper.getColumnName(declaredField))) {
+                                                if (columnName.replace("_","").equalsIgnoreCase(InfluxQueryWrapper.getColumnName(declaredField).replace("_",""))) {
                                                     //获取属性定义的类型
                                                     declaredField.setAccessible(true);
                                                     //判断是否过滤该条记录，当数据返回 null时