diff --git a/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java index 846bd1d6d..3671c0ada 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java @@ -1,6 +1,7 @@ package org.nl.config; import com.alibaba.druid.pool.DruidDataSource; +import com.github.pagehelper.parser.CountSqlParser; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -12,7 +13,7 @@ import javax.sql.DataSource; //@Configuration @Slf4j public class DataBaseConfig { - + public static CountSqlParser countSqlParser = new CountSqlParser(); @Primary @Bean(name = "dataSource") @ConfigurationProperties(prefix = "spring.datasource.druid") diff --git a/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java b/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java index 90be04997..d2a73ba07 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java @@ -1,11 +1,20 @@ package org.nl.config; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import com.yomahub.tlog.id.TLogIdGenerator; +import java.util.UUID; + public class TlogIdGenerator extends TLogIdGenerator { @Override public String generateTraceId() { - return IdUtil.getSnowflake(1, 1).nextIdStr(); + String idStr; + try { + idStr = IdUtil.getSnowflake(1, 1).nextIdStr(); + }catch (Exception ex){ + idStr = String.valueOf(System.currentTimeMillis()); + } + return idStr; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java index 0c53c4bb9..495a2f639 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java @@ -2,6 +2,7 @@ package org.nl.modules.wql.core.engine.syntax; import com.github.pagehelper.parser.CountSqlParser; import lombok.extern.slf4j.Slf4j; +import org.nl.config.DataBaseConfig; import org.nl.modules.wql.WQLCore; import org.nl.modules.wql.core.DataType; import org.nl.modules.wql.core.bean.ErrorBean; @@ -411,8 +412,7 @@ public class wqlSELECT extends IWQL { //对sql进行特殊处理,找出和第一个select配对的from,并把中间全部换为1 // String page_sql = change_1(wo.wp.sSQL); String page_sql = wo.wp.sSQL; - CountSqlParser countSqlParser = new CountSqlParser(); - String countSql = countSqlParser.getSmartCountSql(page_sql, "0"); + String countSql = DataBaseConfig.countSqlParser.getSmartCountSql(page_sql, "0"); wo.wp.sSQL = countSql; } }