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

Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228

Browse Source
This commit is contained in:
liyongde
2022-12-30 08:57:54 +08:00
parent 829b5f2c57 b9f28c2012
commit 88837d5972
5 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.12</version>
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--Spring boot Web容器-->
<dependency>
<groupId>org.springframework.boot</groupId>

36
lms/nladmin-system/src/main/java/org/nl/ssosql-1228.sql
View File

@@ -53,22 +53,22 @@ CREATE TABLE `sys_user` (
`extuser_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT '外部用户标识',
PRIMARY KEY (`user_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin COMMENT='用户表';
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (1, 'admin', '管理员', '男', '18888888888', '201507802@qq.com', 'avatar-20200806032259161.png', '/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png', 'c4457adc568049cc0074615f095033ae', b'1', 1, NULL, 'admin', '2022-12-05 11:54:33', '2018-08-23 09:11:56', '2020-09-05 10:43:31',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (2, 'default', '默认用户', '男', '18888888888', NULL, NULL, NULL, '', b'0', 1, NULL, 'admin', NULL, '2018-08-23 09:11:56', '2020-09-05 10:43:31',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (16, '88540521', '汪东升', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-01 09:46:10', '2022-12-02 09:48:57',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (17, '88540154', '彭明清', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-01 09:47:23', '2022-12-22 14:07:34',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (18, '88540060', '高小盼', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:45:00', '2022-12-02 09:45:00',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (19, '88540369', '王天山', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:45:53', '2022-12-02 09:48:38',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (20, '88540168', '梁万荣', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:48:21', '2022-12-02 09:48:21',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (21, '88540566', '张龙龙', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:50:51', '2022-12-02 09:50:51',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (22, '88541303', '林立洲', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 10:09:24', '2022-12-02 10:09:24',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (23, '88540302', '曾发玲', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 10:09:55', '2022-12-02 10:09:55',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (24, '88541643', '甄亮霞', '女', NULL, NULL, NULL, NULL, '28e09b3a21d6d5e2cc00ae725c61c233', b'0', 1, 'System', 'System', '2022-12-20 20:53:49', '2022-12-04 15:41:14', '2022-12-04 15:41:14',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (25, '88541932', '朱小宁', '男', NULL, NULL, NULL, NULL, 'aafb322898a8c49aea83041d71868c34', b'0', 1, 'System', 'System', '2022-12-17 17:17:12', '2022-12-04 15:42:09', '2022-12-04 15:42:09',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (26, '88541972', '颜周鲁', '男', NULL, NULL, NULL, NULL, 'c62ab3a7db00bb0a41270ae4933062bb', b'0', 1, 'System', 'System', '2022-12-05 15:14:51', '2022-12-04 15:42:43', '2022-12-04 15:42:43',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (27, '88540245', '田晓英', '女', '18919831471', NULL, NULL, NULL, 'cfdddd828134b157e82760390c159cbe', b'0', 1, 'System', 'System', '2022-12-18 17:31:25', '2022-12-04 15:43:01', '2022-12-18 17:32:33',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (28, '88541240', '祁复秀', '男', '17352283290', NULL, NULL, NULL, '060ed1f34df1e604b7eaa86491a26716', b'0', 1, 'System', 'System', '2022-12-20 20:02:45', '2022-12-04 15:43:43', '2022-12-04 17:29:33',1,NULL);
INSERT INTO `lz_lms_sso`.`sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (29, '88541242', '刘武能', '男', NULL, NULL, NULL, NULL, '999dacac48f973c6845ed228298250c7', b'0', 1, 'System', 'System', '2022-12-17 18:14:52', '2022-12-14 13:58:16', '2022-12-14 13:58:16',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (1, 'admin', '管理员', '男', '18888888888', '201507802@qq.com', 'avatar-20200806032259161.png', '/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png', 'c4457adc568049cc0074615f095033ae', b'1', 1, NULL, 'admin', '2022-12-05 11:54:33', '2018-08-23 09:11:56', '2020-09-05 10:43:31',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (2, 'default', '默认用户', '男', '18888888888', NULL, NULL, NULL, '', b'0', 1, NULL, 'admin', NULL, '2018-08-23 09:11:56', '2020-09-05 10:43:31',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (16, '88540521', '汪东升', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-01 09:46:10', '2022-12-02 09:48:57',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (17, '88540154', '彭明清', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-01 09:47:23', '2022-12-22 14:07:34',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (18, '88540060', '高小盼', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:45:00', '2022-12-02 09:45:00',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (19, '88540369', '王天山', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:45:53', '2022-12-02 09:48:38',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (20, '88540168', '梁万荣', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:48:21', '2022-12-02 09:48:21',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (21, '88540566', '张龙龙', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 09:50:51', '2022-12-02 09:50:51',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (22, '88541303', '林立洲', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 10:09:24', '2022-12-02 10:09:24',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (23, '88540302', '曾发玲', '男', NULL, NULL, NULL, NULL, 'f52020dca765fd3943ed40a615dc2c5c', b'0', 1, 'System', 'System', NULL, '2022-12-02 10:09:55', '2022-12-02 10:09:55',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (24, '88541643', '甄亮霞', '女', NULL, NULL, NULL, NULL, '28e09b3a21d6d5e2cc00ae725c61c233', b'0', 1, 'System', 'System', '2022-12-20 20:53:49', '2022-12-04 15:41:14', '2022-12-04 15:41:14',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (25, '88541932', '朱小宁', '男', NULL, NULL, NULL, NULL, 'aafb322898a8c49aea83041d71868c34', b'0', 1, 'System', 'System', '2022-12-17 17:17:12', '2022-12-04 15:42:09', '2022-12-04 15:42:09',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (26, '88541972', '颜周鲁', '男', NULL, NULL, NULL, NULL, 'c62ab3a7db00bb0a41270ae4933062bb', b'0', 1, 'System', 'System', '2022-12-05 15:14:51', '2022-12-04 15:42:43', '2022-12-04 15:42:43',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (27, '88540245', '田晓英', '女', '18919831471', NULL, NULL, NULL, 'cfdddd828134b157e82760390c159cbe', b'0', 1, 'System', 'System', '2022-12-18 17:31:25', '2022-12-04 15:43:01', '2022-12-18 17:32:33',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (28, '88541240', '祁复秀', '男', '17352283290', NULL, NULL, NULL, '060ed1f34df1e604b7eaa86491a26716', b'0', 1, 'System', 'System', '2022-12-20 20:02:45', '2022-12-04 15:43:43', '2022-12-04 17:29:33',1,NULL);
INSERT INTO `sys_user`(`user_id`, `username`, `person_name`, `gender`, `phone`, `email`, `avatar_name`, `avatar_path`, `password`, `is_admin`, `is_used`, `create_name`, `update_name`, `pwd_reset_time`, `create_time`, `update_time`,`create_id`,`update_id`) VALUES (29, '88541242', '刘武能', '男', NULL, NULL, NULL, NULL, '999dacac48f973c6845ed228298250c7', b'0', 1, 'System', 'System', '2022-12-17 18:14:52', '2022-12-14 13:58:16', '2022-12-14 13:58:16',1,NULL);
-- 部门 表结构修改
alter table `sys_dept` ADD COLUMN `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '部门编号';
@@ -94,7 +94,7 @@ alter table `sys_menu` CHANGE `name` `component_name` varchar(255) CHARACTER SET
ALTER TABLE `sys_menu` DROP INDEX uniq_name;
ALTER TABLE `sys_menu` DROP INDEX uniq_title;
-- 初始化数据
INSERT INTO `sys_menu`(`menu_id`, `pid`, `sub_count`, `type`, `system_type`, `category`, `title`, `component_name`, `component`, `menu_sort`, `icon`, `path`, `iframe`, `cache`, `hidden`, `permission`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1324783485328', NULL, 7, '1', '1', '', 'SSO系统', '', '', 1, 'system', 'system', 0, 0, 0, '', NULL, '', '2022-12-20 09:54:42', NULL, '', '2022-12-20 09:54:54');
INSERT INTO `sys_menu`(`menu_id`, `pid`, `sub_count`, `type`, `system_type`, `category`, `title`, `component_name`, `component`, `menu_sort`, `icon`, `path`, `iframe`, `cache`, `hidden`, `permission`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1324783485328', NULL, 7, '1', '1', '', 'LMS系统', '', '', 1, 'system', 'system', 0, 0, 0, '', NULL, '', '2022-12-20 09:54:42', NULL, '', '2022-12-20 09:54:54');
update sys_menu set pid = '1324783485328' where pid is null and menu_id <> '1324783485328';
update sys_menu set system_type =1;
-- sys_dict
@@ -325,7 +325,7 @@ INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) val
INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('203','task_priority','任务优先级','10402','1','12');
INSERT INTO `sys_dict` (`dict_id`,`code`,`name`,`label`,`value`,`dict_sort`) values ('204','task_priority','任务优先级','10403','1','13');
-- 插入系统数据
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('205', 'system_type', '所属系统', 'SSO系统', '1', NULL, NULL, '1324783485328', NULL, NULL, NULL, NULL, NULL, '1', '管理员', '2022-12-19 09:21:26');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('205', 'system_type', '所属系统', 'LMS系统', '1', NULL, NULL, '1324783485328', NULL, NULL, NULL, NULL, NULL, '1', '管理员', '2022-12-19 09:21:26');
DROP TABLE IF EXISTS `sys_role`;

2
lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
View File

@@ -58,7 +58,7 @@ public class UserController {
@ApiOperation("查询用户")
@GetMapping
public ResponseEntity<Object> query(UserQuery query, PageQuery page){
return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK);
return new ResponseEntity(userService.getUserDetail(query, page),HttpStatus.OK);
}
@Log("新增用户")

3
lms/nladmin-system/src/main/java/org/nl/system/service/user/ISysUserService.java
View File

@@ -1,6 +1,7 @@
package org.nl.system.service.user;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.system.service.user.dao.SysUser;
import org.nl.system.service.user.dto.SysUserDetail;
@@ -23,7 +24,7 @@ public interface ISysUserService extends IService<SysUser> {
Map<String, String> updateAvatar(MultipartFile avatar);
List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery);
TableDataInfo<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery);
void create(Map userDetail);

10
lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
View File

@@ -5,10 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import lombok.SneakyThrows;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.Converter;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
@@ -69,9 +72,12 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
}
@Override
public List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery) {
public TableDataInfo<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
List<SysUserDetail> userDetail = sysUserMapper.getUserDetail(query, pageQuery);
return userDetail;
TableDataInfo<SysUserDetail> build = TableDataInfo.build(userDetail);
build.setTotalElements(page.getTotal());
return build;
}
@Override