From 2cb30d55a717bd225e6e1edbc8b5dc4aeff1baa6 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sat, 23 Mar 2024 22:53:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E6=8C=89=E6=96=AD=E4=BC=A0=E5=85=A5?= =?UTF-8?q?id=E4=B8=8D=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/atguigu/constant/MessageConstant.java | 2 ++ .../manger/controller/SysUserController.java | 31 ++++++++++++++++++ .../spzx/manger/mapper/SysUserMapper.java | 11 +++++++ .../spzx/manger/service/SysUserService.java | 13 ++++++++ .../service/impl/SysRoleServiceImpl.java | 9 +++++ .../service/impl/SysUserServiceImpl.java | 24 ++++++++++++++ .../main/resources/mapper/SysUserMapper.xml | 21 ++++++++++++ .../spzx/manger/mapper/SysUserMapper.class | Bin 356 -> 603 bytes .../spzx/manger/service/SysUserService.class | Bin 349 -> 733 bytes .../service/impl/SysUserServiceImpl.class | Bin 4271 -> 5453 bytes .../target/classes/mapper/SysUserMapper.xml | 25 ++++++++++++++ 11 files changed, 136 insertions(+) create mode 100644 spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java diff --git a/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java b/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java index 123526d..f5bbbac 100644 --- a/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java +++ b/spzx-common/common-util/src/main/java/com/atguigu/constant/MessageConstant.java @@ -17,4 +17,6 @@ public class MessageConstant { public static final String PASSWORD_EDIT_FAILED = "密码修改失败"; public static final String ALREADY_EXISTS = "已存在"; public static final String REQUEST_NOT_EMPTY = "请求不为空"; + public static final String UPDATE_ID_IS_NOT_EMPTY = "修改id不能为空"; + public static final String DELETE_ID_IS_NOT_EMPTY = "修改id不能为空"; } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java new file mode 100644 index 0000000..a1adc46 --- /dev/null +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java @@ -0,0 +1,31 @@ +package com.atguigu.spzx.manger.controller; + +import com.atguigu.spzx.manger.service.SysUserService; +import com.atguigu.spzx.model.dto.system.SysUserDto; +import com.atguigu.spzx.model.entity.system.SysUser; +import com.atguigu.spzx.model.vo.result.Result; +import com.github.pagehelper.PageInfo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "用户管理接口") +@RestController +@RequestMapping(value = "/admin/system/sysUser") +public class SysUserController { + @Autowired + private SysUserService sysUserService; + + @Operation(summary = "查询用户", description = "查询用户信息") + @GetMapping(value = "/findByPage/{pageNum}/{pageSize}") + public Result> findByPage(SysUserDto sysUserDto, + @PathVariable(value = "pageNum") Integer pageNum, + @PathVariable(value = "pageSize") Integer pageSize) { + PageInfo userPageInfo = sysUserService.findByPage(sysUserDto, pageNum, pageSize); + return Result.success(userPageInfo); + } +} \ No newline at end of file diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysUserMapper.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysUserMapper.java index 878bd40..7993817 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysUserMapper.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysUserMapper.java @@ -1,8 +1,11 @@ package com.atguigu.spzx.manger.mapper; +import com.atguigu.spzx.model.dto.system.SysUserDto; import com.atguigu.spzx.model.entity.system.SysUser; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface SysUserMapper { /** @@ -12,4 +15,12 @@ public interface SysUserMapper { * @return 用户信息 */ SysUser selectByUsername(String username); + + /** + * 查询用户 + * + * @param sysUserDto 用户请求参数实体类 + * @return List + */ + List findByPage(SysUserDto sysUserDto); } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysUserService.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysUserService.java index 1df55dc..56686a7 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysUserService.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysUserService.java @@ -1,7 +1,10 @@ package com.atguigu.spzx.manger.service; import com.atguigu.spzx.model.dto.system.LoginDto; +import com.atguigu.spzx.model.dto.system.SysUserDto; +import com.atguigu.spzx.model.entity.system.SysUser; import com.atguigu.spzx.model.vo.system.LoginVo; +import com.github.pagehelper.PageInfo; public interface SysUserService { /** @@ -18,4 +21,14 @@ public interface SysUserService { * @param token token值 */ void logout(String token); + + /** + * 查询用户 + * + * @param sysUserDto 用户请求体 + * @param pageNum 当前页 + * @param pageSize 一页大小 + * @return 用户分页结果 + */ + PageInfo findByPage(SysUserDto sysUserDto, Integer pageNum, Integer pageSize); } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java index c76aa2e..dd9bed4 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java @@ -1,9 +1,11 @@ package com.atguigu.spzx.manger.service.impl; +import com.atguigu.constant.MessageConstant; import com.atguigu.spzx.manger.mapper.SysRoleMapper; import com.atguigu.spzx.manger.service.SysRoleService; import com.atguigu.spzx.model.dto.system.SysRoleDto; import com.atguigu.spzx.model.entity.system.SysRole; +import com.atguigu.utils.StringEmptyUtil; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -16,6 +18,8 @@ import java.util.List; public class SysRoleServiceImpl implements SysRoleService { @Autowired private SysRoleMapper sysRoleMapper; + @Autowired + private StringEmptyUtil emptyUtil; /** * 查询角色信息返回分页 @@ -51,6 +55,9 @@ public class SysRoleServiceImpl implements SysRoleService { */ @Override public void updateSysRole(SysRole sysRole) { + emptyUtil.isEmpty(sysRole.getId(), MessageConstant.UPDATE_ID_IS_NOT_EMPTY); + + // 修改内容 sysRoleMapper.updateSysRole(sysRole); } @@ -61,6 +68,8 @@ public class SysRoleServiceImpl implements SysRoleService { */ @Override public void deleteById(Long roleId) { + emptyUtil.isEmpty(roleId, MessageConstant.DELETE_ID_IS_NOT_EMPTY); + // 删除内容 sysRoleMapper.deleteById(roleId); } } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java index 2ff7b62..b7c0683 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.java @@ -6,13 +6,18 @@ import com.atguigu.lib.MD5; import com.atguigu.spzx.manger.mapper.SysUserMapper; import com.atguigu.spzx.manger.service.SysUserService; import com.atguigu.spzx.model.dto.system.LoginDto; +import com.atguigu.spzx.model.dto.system.SysUserDto; import com.atguigu.spzx.model.entity.system.SysUser; import com.atguigu.spzx.model.vo.system.LoginVo; import com.atguigu.utils.StringEmptyUtil; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Objects; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -79,4 +84,23 @@ public class SysUserServiceImpl implements SysUserService { public void logout(String token) { redisTemplate.delete(token); } + + /** + * 查询用户 + * + * @param sysUserDto 用户请求体 + * @param pageNum 当前页 + * @param pageSize 一页大小 + * @return 用户分页结果 + */ + @Override + public PageInfo findByPage(SysUserDto sysUserDto, Integer pageNum, Integer pageSize) { + Page startedPage = PageHelper.startPage(pageNum, pageSize); + + // 查询用户 + List sysUserList = sysUserMapper.findByPage(sysUserDto); + startedPage.close(); + + return new PageInfo<>(sysUserList); + } } diff --git a/spzx-manager/src/main/resources/mapper/SysUserMapper.xml b/spzx-manager/src/main/resources/mapper/SysUserMapper.xml index ee789fe..1fb2f70 100644 --- a/spzx-manager/src/main/resources/mapper/SysUserMapper.xml +++ b/spzx-manager/src/main/resources/mapper/SysUserMapper.xml @@ -5,6 +5,7 @@ id,username userName ,password,name,phone,avatar,description,status,create_time,update_time,is_deleted + + + + diff --git a/spzx-manager/target/classes/com/atguigu/spzx/manger/mapper/SysUserMapper.class b/spzx-manager/target/classes/com/atguigu/spzx/manger/mapper/SysUserMapper.class index bd10120f9eb570ae2599a6a3dd26eaec57bfd272..49c1ec36055a6bf271b86e77ce22e13e430eba8b 100644 GIT binary patch delta 227 zcmaFDbeo0i)W2Q(7#J9A8H6Ts9pp>P%u8{q3`k5*Wn^&Bm{=p>l2VedUtC#SlA5a@ zTv;4ioLb~kl5ef)la*MOs9#!=nWOKMSzKbx$iM|u1(jxG;0(@8&r2*REdrWT05V6N zICE?!*61+XKiSld}o{HMprJXx1fO_zm{fro*Yfr)_~7)ZR#417R}ABY8jSP+Pr7=#!Y J8HB+s5dcP(XLSGo delta 39 ucmcc1dY6go)W2Q(7#J9A8Tcl0eV-i1q|L}Qxr<4Si-D1W2Pn?OzzYBaJPCCG diff --git a/spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.class b/spzx-manager/target/classes/com/atguigu/spzx/manger/service/impl/SysUserServiceImpl.class index 545b7723315cf63cf271d55d0c688fa77b7903a2..6ae489149027036c65412964fbad925ac5472204 100644 GIT binary patch delta 1628 zcmb`GU2Kz87{`C7?c36KT{gfJI?MtlChZ1x3W-YRY$hgaT$C^lO5)XOZyK2xADi6dC*^)za_OT70sq{>1ZNnTWPDHn3u`f$y9dSQnmwICsg>0cB)|O6)6uV5|RE! zd)m`htceHM9bl3vg*lSR4fjq|x5mTeWlamq=bBne0~5s!MXRvJ&c`DCj^uGWla2Og zigwIoni(H22dLmxv^C<=YK)<5zG(T_t7varm&lFeO=j62z~F#l;nMJxq>-e_K@RzN zHNatxl#lsWdX6e?C_iQ_p1#K1;c{)OslUHYeHEwP@7PtA8XK0jw78f!RjgT3UTXxe zbV=dU&AEGgtH{3!gLGNv2Qm+dD@{(ntl_Hd*EZ~yG)os(iM98N);eQ`opvaK{rRC( zHkm49QiEA*{lu8HUI&V<|3L1p6M4_z7Hi0k^$1(M4qwA}J6GZtcGjL)H!1V>l?s zWfqm0(yJY_s3~XLTk_W=(8dWu5U5u0Ht)!y;w0}1$MNY?%`K{=t2eVq{v86_i78TB zMQl)@BXqHn8|B^KM4vi%5z%7QSKCyKF*Th zPwo;GFe1osX-%=?O#b3SiQFRKA|FZQ5g8XaEs-H&PV=!uUZLB> zCwz)e$olw9*5(P-b!?Z&&zbU`mafw0LS`u8&<8$CQXg32UKw37njJF)J1cD5c-b@4 z$!rjaq@y@kt*j|F9RkH1^mYe&k}pKBhTbKkSH|%23OhJM!fZ2OP#w`0LrPz)3e}QvF25H8UevQ!1sH32#3RqJR<{V!-%?$GuUpxB3d?S%t z_AcRDz7wPnEtJmly?FM6fa_yalNaWa=lM}``WVe_K}4_+6y~noPh#iK&JEJXTIKM; z`~{0Dyz(SI&og-3)5I?uSG{Z@&Pcg|D-c&)@8%box%jnqhcC+fH~CBfe1bB+fFzEacV4Q(R3$*Q$t^|#HpbcgB77n#Z^UcwqjRMknE`NT)2X<>m@mT1$kC_A)sN{nk+`$rddbo(YoqzsQ~6CT2Y~1ie$d;ME{1nR6xM2=BBufH49I2MAQDw{v1vqxc z3mOW4X_#$jhPUtugWkgKQ9+5nucHilMeg&xh5g)l_U8Cf25FIbk+Zdw_f84nX8%4R zlwY*N;w)L#7p#mFv80+N|F6H0V^wU-+?b)Q&Xl|}`ThKee^fZv=SXk{mkR<<4bWut diff --git a/spzx-manager/target/classes/mapper/SysUserMapper.xml b/spzx-manager/target/classes/mapper/SysUserMapper.xml index ee789fe..779897f 100644 --- a/spzx-manager/target/classes/mapper/SysUserMapper.xml +++ b/spzx-manager/target/classes/mapper/SysUserMapper.xml @@ -5,6 +5,22 @@ id,username userName ,password,name,phone,avatar,description,status,create_time,update_time,is_deleted + + + + + and username like CONCAT('%',#{keyword},'%') + + + and create_time >= #{createTimeBegin} + + + and create_time <= #{createTimeEnd} + + and is_deleted = 0 + + + + + +