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

opt:删除主从配置：WO,WQLCore,WQLObject,DataBaceConfig,ResultBean数据源及数据分装

Browse Source
This commit is contained in:
zhangzq
2025-06-23 10:03:49 +08:00
parent 5e7914c19f
commit 51f816de93
8 changed files with 64 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
//@Configuration
@Configuration
@Slf4j
public class DataBaseConfig {
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文件的根目录
public static String ROOT = "wql";
//数据库默认名
public static String defalutDBName = "shardingSphereDataSource";
public static String defalutDBName = "dataSource";
//wql源文件
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,7 +20,6 @@ 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;
@@ -343,10 +342,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);

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 String dbname = "shardingSphereDataSource"; //指定使用的数据库
private String dbname = "dataSource"; //指定使用的数据库
public WQLObject setDbname(String 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;
private String code = ""; //当前交易编号
private String dbname = "shardingSphereDataSource"; //指定使用的数据库
private String dbname = "dataSource"; //指定使用的数据库
public WO setDbname(String 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 {
List<Entity> list = Db.use((DataSource) SpringContextHolder.getBean("shardingSphereDataSource")).query(sql);
List<Entity> list = Db.use((DataSource) SpringContextHolder.getBean("dataSource")).query(sql);
list.forEach(item -> {
set.add(item.getStr("class_id"));
});