diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml index 5a0947d80..8f6408f96 100644 --- a/lms/nladmin-system/pom.xml +++ b/lms/nladmin-system/pom.xml @@ -113,6 +113,11 @@ hutool-all ${hutool.version} + + org.apache.shardingsphere + shardingsphere-jdbc-core-spring-boot-starter + 5.1.1 + org.springframework.boot @@ -201,8 +206,8 @@ com.alibaba - druid-spring-boot-starter - ${druid.version} + druid + 1.1.20 net.dreamlu 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 f679d3b82..846bd1d6d 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 @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Primary; import javax.sql.DataSource; -@Configuration +//@Configuration @Slf4j public class DataBaseConfig { diff --git a/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index 7615078c0..da4028e80 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -30,18 +30,18 @@ public class MybatisPlusConfig { public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 分页插件 - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); +// // 分页插件 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //乐观锁插件 interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); return interceptor; } - @PostConstruct - public void datainnit() { - String url = ((DruidDataSource) dataSource).getUrl(); - System.out.println("项目数据库地址：" + url); - log.debug("项目数据库地址：{}", url); - } +// @PostConstruct +// public void datainnit() { +// String url = ((DruidDataSource) dataSource).getUrl(); +// System.out.println("项目数据库地址：" + url); +// log.debug("项目数据库地址：{}", url); +// } } 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/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 d70395fc6..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 @@ -7,7 +7,7 @@ * * 创 建 者 ：yumeng * 创建时间：2014-07-01 14:25:35 - * 文件版本：v1.0 + * 文件版本：v1.0 * *******************************************************/ package org.nl.modules.wql.core.engine.object; @@ -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; @@ -368,7 +368,7 @@ public class WO implements Serializable, Cloneable { // //this.wp.conn = null; //// this.wp.utx=null; // } -// +// // } else { // try { //// if(this.wp.utx!=null){ @@ -410,7 +410,7 @@ public class WO implements Serializable, Cloneable { // DBConnection.freeConnection(this.wp.conn,this.dbname); // } // } -// +// // if(this.wp._success){ // log.debug(this.code+"执行成功"); // this.wp.rb.setSucess(1); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java index ebbbdbd20..1f19f46cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java @@ -21,6 +21,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -32,6 +34,7 @@ import org.nl.modules.logging.annotation.Log; import org.nl.common.utils.SecurityUtils; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; +import org.nl.system.service.user.dto.SysUserDetail; import org.nl.system.service.user.dto.UserQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -39,6 +42,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; import java.util.Map; import java.util.Set; @@ -58,7 +62,11 @@ public class UserController { @GetMapping public ResponseEntity query(UserQuery query, PageQuery page) { - return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)), HttpStatus.OK); + Page startPage = PageHelper.startPage(page.getPage() + 1, page.getSize()); + List userDetail = userService.getUserDetail(query, page); + TableDataInfo build = TableDataInfo.build(userDetail); + build.setTotalElements(startPage.getTotal()); + return new ResponseEntity(build, HttpStatus.OK); } @Log("新增用户") diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 413442aef..73cc228e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -55,13 +55,8 @@ - - - - - - - + + - + +