From 7d675af65cc4af624e04e3da04d1a6ef80a17351 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Thu, 27 Nov 2025 17:57:49 +0800 Subject: [PATCH] =?UTF-8?q?merge:=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/pom.xml | 12 ++++++------ .../src/main/java/org/nl/config/DataBaseConfig.java | 2 +- .../src/main/java/org/nl/modules/wql/WQLCore.java | 2 +- .../org/nl/modules/wql/core/bean/ResultBean.java | 9 +++++---- .../java/org/nl/modules/wql/core/bean/WQLObject.java | 2 +- .../org/nl/modules/wql/core/engine/object/WO.java | 2 +- .../service/impl/ClassstandardServiceImpl.java | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml index 4b28ce324..641e748d4 100644 --- a/lms/nladmin-system/pom.xml +++ b/lms/nladmin-system/pom.xml @@ -113,12 +113,12 @@ hutool-all ${hutool.version} - - - - - - + + org.apache.shardingsphere + shardingsphere-jdbc-core-spring-boot-starter + 5.1.1 + + org.springframework.boot spring-boot-starter-data-jpa 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 88e916df8..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 @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Primary; import javax.sql.DataSource; -@Configuration +//@Configuration @Slf4j public class DataBaseConfig { public static CountSqlParser countSqlParser = new CountSqlParser(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java index 22e50fccb..9e888d301 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java @@ -28,7 +28,7 @@ public class WQLCore { //解析wql文件的根目录 public static String ROOT = "wql"; //数据库默认名 - public static String defalutDBName = "dataSource"; + public static String defalutDBName = "shardingSphereDataSource"; //wql源文件 public static HashMap> wqlMap = new HashMap>(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java index a03195232..d5d12947e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java @@ -20,6 +20,7 @@ import org.apache.commons.beanutils.BasicDynaBean; import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.DynaProperty; import org.apache.commons.beanutils.RowSetDynaClass; +import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet; import org.nl.modules.wql.util.WqlUtil; import java.beans.IntrospectionException; @@ -342,10 +343,10 @@ public class ResultBean implements Serializable, Cloneable { } try { //支持别名的设置 -// if (sqlResultSet instanceof ShardingSphereResultSet){ -// ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet; -// sqlResultSet = resultSet.getResultSets().get(0); -// } + if (sqlResultSet instanceof ShardingSphereResultSet){ + ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet; + sqlResultSet = resultSet.getResultSets().get(0); + } WQLRowSetDynaClass rs = new WQLRowSetDynaClass(sqlResultSet, true, -1); rslist.add(rs); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java index 32a23d9f4..6ed6b045d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java @@ -26,7 +26,7 @@ public class WQLObject implements Serializable, Cloneable { private static final long serialVersionUID = 3512111887957792224L; - private String dbname = "dataSource"; //指定使用的数据库 + private String dbname = "shardingSphereDataSource"; //指定使用的数据库 public WQLObject setDbname(String dbname) { this.dbname = dbname; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java index 90bce7448..9e47f4255 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java @@ -47,7 +47,7 @@ public class WO implements Serializable, Cloneable { public WP wp; private String code = ""; //当前交易编号 - private String dbname = "dataSource"; //指定使用的数据库 + private String dbname = "shardingSphereDataSource"; //指定使用的数据库 public WO setDbname(String dbname) { this.dbname = dbname; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 6b26e4329..714700e2f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -480,7 +480,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { //添加子节点 try { - List list = Db.use((DataSource) SpringContextHolder.getBean("dataSource")).query(sql); + List list = Db.use((DataSource) SpringContextHolder.getBean("shardingSphereDataSource")).query(sql); list.forEach(item -> { set.add(item.getStr("class_id")); });