root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge:代码合并

Browse Source
This commit is contained in:
zhouz
2025-11-27 17:57:49 +08:00
parent 4717d5421d
commit 7d675af65c
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/pom.xml
View File

@@ -113,12 +113,12 @@
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
<version>${hutool.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.apache.shardingsphere</groupId>--> <groupId>org.apache.shardingsphere</groupId>
<!-- <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>--> <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
<!-- <version>5.1.1</version>--> <version>5.1.1</version>
<!-- </dependency>--> </dependency>
<!--Spring boot 核心 --> <!-- Spring boot 核心 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>

2
lms/nladmin-system/src/main/java/org/nl/config/DataBaseConfig.java
View File

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Primary;
import javax.sql.DataSource; import javax.sql.DataSource;
@Configuration //@Configuration
@Slf4j @Slf4j
public class DataBaseConfig { public class DataBaseConfig {
public static CountSqlParser countSqlParser = new CountSqlParser(); public static CountSqlParser countSqlParser = new CountSqlParser();

2
lms/nladmin-system/src/main/java/org/nl/modules/wql/WQLCore.java
View File

@@ -28,7 +28,7 @@ public class WQLCore {
//解析wql文件的根目录 //解析wql文件的根目录
public static String ROOT = "wql"; public static String ROOT = "wql";
//数据库默认名 //数据库默认名
public static String defalutDBName = "dataSource"; public static String defalutDBName = "shardingSphereDataSource";
//wql源文件 //wql源文件
public static HashMap<String, ArrayList<String>> wqlMap = new HashMap<String, ArrayList<String>>(); public static HashMap<String, ArrayList<String>> wqlMap = new HashMap<String, ArrayList<String>>();

9
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
View File

@@ -20,6 +20,7 @@ import org.apache.commons.beanutils.BasicDynaBean;
import org.apache.commons.beanutils.BasicDynaClass; import org.apache.commons.beanutils.BasicDynaClass;
import org.apache.commons.beanutils.DynaProperty; import org.apache.commons.beanutils.DynaProperty;
import org.apache.commons.beanutils.RowSetDynaClass; import org.apache.commons.beanutils.RowSetDynaClass;
import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
import org.nl.modules.wql.util.WqlUtil; import org.nl.modules.wql.util.WqlUtil;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;
@@ -342,10 +343,10 @@ public class ResultBean implements Serializable, Cloneable {
} }
try { try {
//支持别名的设置 //支持别名的设置
// if (sqlResultSet instanceof ShardingSphereResultSet){ if (sqlResultSet instanceof ShardingSphereResultSet){
// ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet; ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet;
// sqlResultSet = resultSet.getResultSets().get(0); sqlResultSet = resultSet.getResultSets().get(0);
// } }
WQLRowSetDynaClass rs = new WQLRowSetDynaClass(sqlResultSet, true, -1); WQLRowSetDynaClass rs = new WQLRowSetDynaClass(sqlResultSet, true, -1);
rslist.add(rs); rslist.add(rs);

2
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/WQLObject.java
View File

@@ -26,7 +26,7 @@ public class WQLObject implements Serializable, Cloneable {
private static final long serialVersionUID = 3512111887957792224L; private static final long serialVersionUID = 3512111887957792224L;
private String dbname = "dataSource"; //指定使用的数据库 private String dbname = "shardingSphereDataSource"; //指定使用的数据库
public WQLObject setDbname(String dbname) { public WQLObject setDbname(String dbname) {
this.dbname = dbname; this.dbname = dbname;

2
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/object/WO.java
View File

@@ -47,7 +47,7 @@ public class WO implements Serializable, Cloneable {
public WP wp; public WP wp;
private String code = ""; //当前交易编号 private String code = ""; //当前交易编号
private String dbname = "dataSource"; //指定使用的数据库 private String dbname = "shardingSphereDataSource"; //指定使用的数据库
public WO setDbname(String dbname) { public WO setDbname(String dbname) {
this.dbname = dbname; this.dbname = dbname;

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
View File

@@ -480,7 +480,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
//添加子节点 //添加子节点
try { try {
List<Entity> list = Db.use((DataSource) SpringContextHolder.getBean("dataSource")).query(sql); List<Entity> list = Db.use((DataSource) SpringContextHolder.getBean("shardingSphereDataSource")).query(sql);
list.forEach(item -> { list.forEach(item -> {
set.add(item.getStr("class_id")); set.add(item.getStr("class_id"));
}); });