From b29104cfe20fa81940f2e4d4f211ff8f4406a0d3 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 27 Apr 2023 19:12:35 +0800 Subject: [PATCH] =?UTF-8?q?influxORM=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/influx/base/InfluxProxyMapperFactory.java | 3 +++ src/main/java/com/njcn/influx/base/ProxyMapper.java | 3 +++ src/main/java/com/njcn/influx/base/ProxyMapperRegister.java | 3 +++ src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java | 5 +++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/njcn/influx/base/InfluxProxyMapperFactory.java b/src/main/java/com/njcn/influx/base/InfluxProxyMapperFactory.java index 7440267..33bf312 100644 --- a/src/main/java/com/njcn/influx/base/InfluxProxyMapperFactory.java +++ b/src/main/java/com/njcn/influx/base/InfluxProxyMapperFactory.java @@ -8,6 +8,9 @@ import org.springframework.beans.factory.FactoryBean; import javax.annotation.Resource; import java.lang.reflect.Proxy; +/** + * @author hongawen + */ public class InfluxProxyMapperFactory implements FactoryBean { @Resource diff --git a/src/main/java/com/njcn/influx/base/ProxyMapper.java b/src/main/java/com/njcn/influx/base/ProxyMapper.java index 0bfc5b6..204d5b0 100644 --- a/src/main/java/com/njcn/influx/base/ProxyMapper.java +++ b/src/main/java/com/njcn/influx/base/ProxyMapper.java @@ -16,6 +16,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.List; +/** + * @author hongawen + */ public class ProxyMapper implements InvocationHandler { private ParameterHandler parameterHandler; diff --git a/src/main/java/com/njcn/influx/base/ProxyMapperRegister.java b/src/main/java/com/njcn/influx/base/ProxyMapperRegister.java index 2374eaa..5a8c755 100644 --- a/src/main/java/com/njcn/influx/base/ProxyMapperRegister.java +++ b/src/main/java/com/njcn/influx/base/ProxyMapperRegister.java @@ -17,6 +17,9 @@ import javax.annotation.PostConstruct; import java.io.IOException; import java.util.HashSet; +/** + * @author hongawen + */ public class ProxyMapperRegister { private String mapperLocation; diff --git a/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java b/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java index 4c4a2c3..3ea9990 100644 --- a/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java +++ b/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java @@ -9,6 +9,7 @@ import com.njcn.influx.support.ICFunction; import com.njcn.influx.utils.LambdaUtil; import lombok.Data; import org.influxdb.annotation.Column; +import org.influxdb.annotation.Measurement; import java.lang.reflect.Field; import java.util.*; @@ -652,14 +653,14 @@ public class InfluxQueryWrapper { sqlSelect.append(InfluxDbSqlConstant.ALL) .append(InfluxDbSqlConstant.FROM) .append(InfluxDbSqlConstant.DQM) - .append(measurement.getSimpleName().toLowerCase()) + .append(((Measurement) measurement.getAnnotation(Measurement.class)).name()) .append(InfluxDbSqlConstant.DQM); } else { //将集合处理成查询属性 sqlSelect.append(String.join(StrPool.COMMA, selectColumns)) .append(InfluxDbSqlConstant.FROM) .append(InfluxDbSqlConstant.DQM) - .append(measurement.getSimpleName().toLowerCase()) + .append( ((Measurement) measurement.getAnnotation(Measurement.class)).name()) .append(InfluxDbSqlConstant.DQM); }