feature/20220629_fix 优化

Author: wanghaun

elasticsearch-engine-base/src/main/java/com/elasticsearch/engine/base/common/parse/sql/EsSqlQueryHelper.java

@@ -2,7 +2,6 @@
 
 import com.elasticsearch.engine.base.common.proxy.handler.exannotation.AnnotationQueryCommon;
 import com.elasticsearch.engine.base.common.queryhandler.sql.EsSqlExecuteHandler;
-import com.elasticsearch.engine.base.common.utils.LocalStringUtils;
 import com.elasticsearch.engine.base.common.utils.ThreadLocalUtil;
 import com.elasticsearch.engine.base.config.EsEngineConfig;
 import com.elasticsearch.engine.base.model.constant.CommonConstant;
@@ -141,9 +140,7 @@ private String fillParamSql(Method method, String sql, Object[] args, BackDto ba
         }
         //参数替换
         // 解析sql参数
-        //jooq 需要替换"`"
-        String selectSql = LocalStringUtils.replaceSlightPauseMark(select.toString());
-        String paramSql = SqlParamParseHelper.getMethodArgsSqlJpa(selectSql, method, args, SqlParamParse.JAP_SQL_PARAM);
+        String paramSql = SqlParamParseHelper.getMethodArgsSqlJpa(select.toString(), method, args, SqlParamParse.JAP_SQL_PARAM);
         if (EsEngineConfig.getSqlTraceLog()) {
             log.info("替换参数后sql: {}", paramSql);
         }

elasticsearch-engine-base/src/main/java/com/elasticsearch/engine/base/common/parse/sql/SqlParserHelper.java

@@ -5,7 +5,6 @@
 import com.elasticsearch.engine.base.common.utils.ReflectionUtils;
 import com.elasticsearch.engine.base.config.EsEngineConfig;
 import com.elasticsearch.engine.base.model.annotion.EsQueryIndex;
-import com.elasticsearch.engine.base.model.constant.CommonConstant;
 import com.elasticsearch.engine.base.model.domain.BackDto;
 import com.elasticsearch.engine.base.model.exception.EsEngineQueryException;
 import com.google.common.collect.Lists;
@@ -172,7 +171,7 @@ private static Map<String, String> getJoinTableName(PlainSelect plain) {
         fromItems.forEach(fromItem -> {
             String fromItemName = "";
             if (fromItem instanceof Table) {
-                fromItemName = LocalStringUtils.replaceSlightPauseMark(((Table) fromItem).getName());
+                fromItemName = ((Table) fromItem).getName();
             }
             tableNames.put(fromItemName, fromItem.getAlias() == null ? fromItemName : fromItem.getAlias().getName());
         });
@@ -375,8 +374,8 @@ public static void setCaseExpression(CaseExpression caseExpression, Map<String,
         }
         List<WhenClause> list = caseExpression.getWhenClauses();
         list.forEach(data -> {
-            if (data instanceof WhenClause) {
-                setWhereItem(((WhenClause) data).getWhenExpression(), tableAlias);
+            if (data != null) {
+                setWhereItem(data.getWhenExpression(), tableAlias);
             }
         });
     }
@@ -389,12 +388,11 @@ public static void setCaseExpression(CaseExpression caseExpression, Map<String,
     private static void reNameColumnName(Column column, Map<String, String> tableAlias) {
         //替换mysql和es的别名映射
         if (!tableAlias.isEmpty()) {
-            //替换掉'`'主要针对jooq
-            String columnName = LocalStringUtils.replaceSlightPauseMark(column.toString());
-            //判断是否包含两个'.' 替换掉jooq的 `user`.(jooq生成的字段格式为 `user`.`person`.`person_no`)
+            String columnName = column.toString();
+            //判断是否包含两个'.' 替换掉jooq的库名(jooq生成的字段格式为 `user`.`person`.`person_no`)
             int n = columnName.length() - LocalStringUtils.replaceSpot(columnName).length();
-            if (n > NumberUtils.INTEGER_ONE && columnName.contains(CommonConstant.JOOQ_SQL_COLUMN_PREFIX)) {
-                columnName = columnName.replaceAll(CommonConstant.JOOQ_SQL_COLUMN_PREFIX, "");
+            if (n > NumberUtils.INTEGER_ONE) {
+                columnName = columnName.substring(columnName.indexOf(".") + 1);
             }
             if (tableAlias.containsKey(columnName)) {
                 column.setColumnName(tableAlias.get(columnName));

elasticsearch-engine-base/src/main/java/com/elasticsearch/engine/base/config/EsEngineConfigProperties.java

@@ -18,7 +18,7 @@ public class EsEngineConfigProperties {
     /**
      * elasticSearch version
      */
-    private Integer elasticVersion = 7;
+    private Integer elasticVersion = 6;
 
     /**
      * 对没有添加注解的字段 默然按照trem/trems查询

elasticsearch-engine-base/src/main/java/com/elasticsearch/engine/base/model/constant/CommonConstant.java

@@ -76,8 +76,18 @@ public class CommonConstant {
     public static final String DEFAULT_TIME_ZONE = "+08:00";
 
     /**
-     * jooq COLUMN 前缀
+     * jooq BETWEEN 格式
      */
-    public static final String JOOQ_SQL_COLUMN_PREFIX = "user.";
+    public static final String JOOQ_SQL_BETWEEN = "between {ts";
+
+    /**
+     * jooq BETWEEN 前缀
+     */
+    public static final String JOOQ_SQL_BETWEEN_PREFIX = "\\{ts";
+
+    /**
+     * jooq BETWEEN 后缀
+     */
+    public static final String JOOQ_SQL_BETWEEN_SUFFIX = "\\}";
 
 }

elasticsearch-engine-jooq/src/main/java/com/elasticsearch/engine/jooq/listener/JooqEsQueryExecuteListener.java

@@ -1,5 +1,6 @@
 package com.elasticsearch.engine.jooq.listener;
 
+import com.elasticsearch.engine.base.common.utils.LocalStringUtils;
 import com.elasticsearch.engine.base.common.utils.ThreadLocalUtil;
 import com.elasticsearch.engine.base.model.constant.CommonConstant;
 import com.elasticsearch.engine.base.model.exception.EsEngineJpaExecuteException;
@@ -59,7 +60,7 @@ public void renderEnd(ExecuteContext ctx) {
 //            ctx.sql("SELECT `user`.`person`.`id`, `user`.`person`.`person_no`, `user`.`person`.`person_name`, `user`.`person`.`phone`, `user`.`person`.`salary`, `user`.`person`.`company`, `user`.`person`.`status`, `user`.`person`.`sex`, `user`.`person`.`address`, `user`.`person`.`create_time`, `user`.`person`.`create_user` FROM `user`.`person` WHERE `user`.`person`.`status` = ? AND person_no IN ('US2022060100001', 'US2022060100023')");
             ctx.sql(backSql);
         } else {
-            ThreadLocalUtil.set(CommonConstant.JPA_NATIVE_SQL, ctx.sql());
+            ThreadLocalUtil.set(CommonConstant.JPA_NATIVE_SQL, sqlTransform(Objects.requireNonNull(ctx.sql())));
         }
     }
 
@@ -98,15 +99,15 @@ public void bindEnd(ExecuteContext ctx) {
         if (Objects.isNull(isEsQuery)) {
             return;
         }
-        String sql = ctx.query().toString();
+        String sql = Objects.requireNonNull(ctx.query()).toString();
         //非select语句直接返回
         if (!sql.trim().startsWith(CommonConstant.SELECT_SQL_PREFIX_LOWER) && !sql.trim().startsWith(CommonConstant.SELECT_SQL_PREFIX_UPPER)) {
             return;
         }
         String backSql = ThreadLocalUtil.get(CommonConstant.BACK_QUERY_SQL);
 
         if (StringUtils.isEmpty(backSql)) {
-            throw new EsEngineJpaExecuteException(sql);
+            throw new EsEngineJpaExecuteException(sqlTransform(sql));
         }
     }
 
@@ -131,4 +132,14 @@ public void bindEnd(ExecuteContext ctx) {
 //        } 
 //    }
 
+    private String sqlTransform(String sql) {
+        //jooq 需要替换"`"
+        sql = LocalStringUtils.replaceSlightPauseMark(sql);
+        //处理jooq生成的between
+        if (sql.contains(CommonConstant.JOOQ_SQL_BETWEEN)) {
+            return sql.replaceAll(CommonConstant.JOOQ_SQL_BETWEEN_PREFIX, "").replaceAll(CommonConstant.JOOQ_SQL_BETWEEN_SUFFIX, "");
+        }
+        return sql;
+    }
+
 }