Merge remote-tracking branch 'origin/master'

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时

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;
+    }
+
 
     /***
      * 统计平均值