From 8f6775ebe69430857885d6088540fb2a529847bd Mon Sep 17 00:00:00 2001 From: zhaoyz <11@11.com> Date: Thu, 11 Apr 2024 17:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/SysUserController.java | 14 +++- .../com/rax/admin/service/SysUserService.java | 7 ++ .../service/impl/SysUserServiceImpl.java | 64 +++++++++++++----- .../src/main/resources/application.yml | 2 +- .../src/main/resources/file/user.xlsx | Bin 8923 -> 11850 bytes .../main/resources/mapper/SysUserMapper.xml | 4 ++ 6 files changed, 71 insertions(+), 20 deletions(-) diff --git a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java index e7ee372..46cb3fe 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java @@ -129,7 +129,8 @@ public class SysUserController { @PutMapping @PreAuthorize("@pms.hasPermission('sys_user_edit')") public R updateUser(@Valid @RequestBody UserDTO userDto) { - return R.ok(userService.updateUser(userDto)); + Boolean b = userService.updateUser(userDto); + return R.ok(b); } /** @@ -138,8 +139,8 @@ public class SysUserController { * @param userDTO 查询参数列表 * @return 用户集合 */ - @GetMapping("/page") - public R getUserPage(@ParameterObject Page page, @ParameterObject UserDTO userDTO) { + @PostMapping("/page") + public R getUserPage(Page page, UserDTO userDTO) { return R.ok(userService.getUsersWithRolePage(page, userDTO)); } @@ -189,6 +190,7 @@ public class SysUserController { return userService.lockUser(username); } + @SysLog("个人修改密码") @PutMapping("/password") public R password(@RequestBody UserDTO userDto) { String username = SecurityUtils.getUser().getUsername(); @@ -201,4 +203,10 @@ public class SysUserController { return userService.checkPassword(password); } + @SysLog("管理员修改密码") + @PostMapping("/modifyPw") + public R modifyPw(UserDTO userDto) { + return userService.modifyPw(userDto); + } + } diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java index 0f249b3..81580d2 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java @@ -112,4 +112,11 @@ public interface SysUserService extends IService { */ R checkPassword(String password); + /** + * 管理员修改密码 + * @param userDto + * @return + */ + R modifyPw(UserDTO userDto); + } diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java index 5cc40cd..d4d6f3e 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.validation.BindingResult; import java.time.LocalDateTime; import java.util.*; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -69,6 +70,8 @@ public class SysUserServiceImpl extends ServiceImpl impl private final RedisTemplate redisTemplate; + private final static String PASSWD_PATTERN = "^(?=.*\\d)(?=.*[a-zA-Z])(?=.*[^\\da-zA-Z\\s]).{9,15}$"; + /** * 保存用户信息 * @@ -202,6 +205,9 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setNickname(userDto.getNickname()); sysUser.setName(userDto.getName()); sysUser.setEmail(userDto.getEmail()); + if (StringUtils.hasText(userDto.getLockFlag())) { + sysUser.setLockFlag(userDto.getLockFlag()); + } return R.ok(this.updateById(sysUser)); } @@ -218,23 +224,27 @@ public class SysUserServiceImpl extends ServiceImpl impl } this.updateById(sysUser); - // 更新用户角色表 - sysUserRoleMapper.delete(Wrappers.lambdaQuery().eq(SysUserRole::getUserId, userDto.getUserId())); - userDto.getRole().stream().map(roleId -> { - SysUserRole userRole = new SysUserRole(); - userRole.setUserId(sysUser.getUserId()); - userRole.setRoleId(roleId); - return userRole; - }).forEach(SysUserRole::insert); + if (userDto.getRole() != null) { + // 更新用户角色表 + sysUserRoleMapper.delete(Wrappers.lambdaQuery().eq(SysUserRole::getUserId, userDto.getUserId())); + userDto.getRole().stream().map(roleId -> { + SysUserRole userRole = new SysUserRole(); + userRole.setUserId(sysUser.getUserId()); + userRole.setRoleId(roleId); + return userRole; + }).forEach(SysUserRole::insert); + } - // 更新用户岗位表 - sysUserPostMapper.delete(Wrappers.lambdaQuery().eq(SysUserPost::getUserId, userDto.getUserId())); - userDto.getPost().stream().map(postId -> { - SysUserPost userPost = new SysUserPost(); - userPost.setUserId(sysUser.getUserId()); - userPost.setPostId(postId); - return userPost; - }).forEach(SysUserPost::insert); + if (userDto.getPost() != null) { + // 更新用户岗位表 + sysUserPostMapper.delete(Wrappers.lambdaQuery().eq(SysUserPost::getUserId, userDto.getUserId())); + userDto.getPost().stream().map(postId -> { + SysUserPost userPost = new SysUserPost(); + userPost.setUserId(sysUser.getUserId()); + userPost.setPostId(postId); + return userPost; + }).forEach(SysUserPost::insert); + } return Boolean.TRUE; } @@ -457,4 +467,26 @@ public class SysUserServiceImpl extends ServiceImpl impl } } + @Override + public R modifyPw(UserDTO userDto) { + UserVO userVO = baseMapper.getUserVoByUsername(userDto.getUsername()); + if (Objects.isNull(userVO)) { + return R.failed("用户不存在"); + } + if (!StringUtils.hasText(userDto.getPassword())) { + return R.failed("密码不能为空"); + } + + boolean matches = Pattern.matches(PASSWD_PATTERN, userDto.getPassword()); + if (!matches) { + return R.failed("密码至少包含字母、数字、特殊字符,不少于9位,最多15位"); + } + + String password = ENCODER.encode(userDto.getPassword()); + this.update(Wrappers.lambdaUpdate() + .set(SysUser::getPassword, password) + .eq(SysUser::getUserId, userVO.getUserId())); + + return R.ok(); + } } diff --git a/upms/upms-biz/src/main/resources/application.yml b/upms/upms-biz/src/main/resources/application.yml index b15e3ca..bcf3619 100644 --- a/upms/upms-biz/src/main/resources/application.yml +++ b/upms/upms-biz/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8888 + port: 9999 servlet: context-path: /admin diff --git a/upms/upms-biz/src/main/resources/file/user.xlsx b/upms/upms-biz/src/main/resources/file/user.xlsx index bb557ba597388091dc88d146ce3385f819b936df..ed5a6066f4fb7c0c6abb8626217758fb4da2ba12 100644 GIT binary patch literal 11850 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 K9t<)4`t(1bwm266 literal 8923 zcmaJ{1yqz<*QQ&#yF)@6=|);Wy1QXu=`X%ZwWiK#jFeMSg#3Y-D$q3ijgS z$I;>K$?0`w#CB1gKB`98Y<90z3;LHsW4!q1d5-e++^WzOC1S9b(C&ON`vjQw?QP5u z1zF-CkYm#cqt3N=-8I~w*g_v7>l@xfa;WMV4&ucq+^DcA}HHQX8v`t zfIEcAM=`qaS_CAKC^2)-?A%hLX95xdF1m6#c!Zdo@KFsr`-)7mv`Em#Z6TN1M*RmB2FR(Z_$P7RmcG@G|? zB;ax@&1I5xe6j*2moqgG5qchnR`AG<4jqMM$he8ELOtDS_tJMRA7%Ye;O5$0r>V)W zS?E~~smZm@*+hdx5FEj|W*I}3O2r&qQ3t6k73OHX6vbO{&sNJ$gwN$UOAQ8JY~id4 zR{f0msgPneAStLMI`egc?Ypv9+oFyXC`HZ>I zV;_7q_5^mfQ#;O$Uo%MeiUm$b@s;!nF-)qeXqR`e#kZDI7L7jfry(x@tp z_CR{{6OY2;6iH2NwZz)&7I0#aES^bJO+)DV@ibe zo3S^-wQf$b(PnC0vTCBT25lo@lig@C`6q4I5UJ$iW-8j6I?p;r4xp$x0!rSt%U9Hx z;(qWX%hZPM_fBByxT4PtO^k@FMUlH9MNQcX?2tOl5ALg_CX_W-ZeftHGc;?jP-z^H3A95nEdpMvz{7iYDXrHFwz9F?e?gp5N@chSv^?%^33%a6 z-UM>++Si}+9B;Br6dj5!&?`Nv>#@J4!NKt96M z!eG2+lFFIqEUA9vllCm%haLsX6w66;XEe;`msMB>99xI(pIb>k%Lz5S?$rXqQdWjl_$?o@QEZI{mW6z~7vvJa2O`z`BiX=Z2k=+P)ok~%VXzY)m^e$|V= z&3+pH+=qKw3IHM=^k%$mKh5vW38uSL?3D1eLaVf{m=dy)#Kn5nX&7#w$r<1W}j{q@HT*0?3Jpe~R}fEtV{dDh)M6wJm3)caX0YXb*QJ~seQjl`Nw z24Ib>xFO7(kg zESX%!p6XLdewQ_DoM9N}t0X<}09W557p`Y7I z?aMZ|ry+z0^kh$q+)0QOZICE7^W;9eMO$`<5s106x1$w+m8q!(w$IgWwlrKnsE#Na zNo>IBblB(KAvLy>XWQ@adT_GPl}{6$ZtCwCK)=`RKGnG~Z_&COhrouZ9LtW{`B=5I z2Rm+(x0c z+z50RJcN=+B(;nn@9+T(tWt}fL~lA4I9{Skbv&0OI(q9uiF_(_B02}*d9P`AOAf^h zhTMk_2G{48UpT<0QAI^@Id6n6H%<=M#$O0;ftWg=lcfq*O2IAXS933$TXKBPzV&L@ zH?bbJ+?{*{wD|78wF_ypdtRK53+D*?Tnujc-5zv8F0EPGw!ffmYj2Er*~HHj@M))Y zX5cWrCF2XdRA;pa+qrA~e*X;AVm8&c_B|7R_p|5H;mGcGKU!D$qA%nzy9anyJE2I~ zq|ON3;Fd!(`@;_`Q>FHMF9tdnM7L+S-0%w2t*<_!)FjpGx|-OIHYq4SRStf|BzPLF zz~)-EFGQiP8z8*`7q+n6_1q6W;?13Vb)CC7i?KvcXjz`Z zE7CUghGE>m#@uY$0<(bkbR7FV8(afrmn1_wFh=F<8J%?H60Ty_Pcg3t#y9( zKvnPb#M&389~I=31DMR<>@t6A7HiS4yz~1olJ(-5MKG5EZ-m4O zAEtg6%sk;~<#=8DxE8Rp{d!8Pw3x`8g%qlH!~K(TY)6df=C-+wN7B;;o7x1>AqxWi z91n$&ym``$YrG{hoLcY6nqOe~CNQL5!t5Y}eu%fahypG($wz8OME zIoOF|hdq7iQG)k%ve!E+V-Z`v6sqJvCI7v@S>asdZr4Wfvh#aw@~_K7Neq$WP6cG_Lc7fGiluBEdguU;`&etYeFz3B=qODm$) z{ibz~M2MDPB36k`M}o@z0!KOra2`c3*A?=e0%HquIxneIRE&C)lt!joqyO2s$g6US zOdUI9n3dNw({NfI(>;aFz{pYjcj?8ul-;{hCj7msAd@umoa@s854}|zyioy zT%!hJ+SFJ-^{2o%h%8Ed!9jhXUX5LCc2mw-DCRmi9oP_h zwQ{_FT_l5FvZPzD7oqc&Dto+bIfPGmrd*vFMFDq9mc;6&Bjf@Znn)PpaJ#K>o*;!1 z58=t|4g8<2ysKvkX25+<6ZsMX;>oW^hLf|0t(nt9H!`Vf2bi0}xfL?J3s9=`p*NTF z9@VktjWWZ+A3=ppgoLi8$ffC{6-gkJG;hvewrH?uVCSIBiwKsbJyC)qc(;!F7xwlZ_?j7notSImr z{ToJGBl|iX3Vw!O2MWVzm+A;)K|x0j=rihW;lY>oTBWMi8=wvMf<0!y1kcrq(#|>6 zGusptS80l+>s(~`Pl;kuHdlJA8>vSNZ{n^GCIKKJ8i2lXg*Uh_rH^?-tye>MLHZ)G z2M~|Pba$g8TTJ}*3z3m2hw;Zm`xmQcfeh0X1w{G7gyIz8Qht(e?YrUit-ZO7ylrua zvVAe7HuqS@x9tI^-p^303q_Mh6ZXnivij`$VQ-5OPGZ5A0jutMS3RNiJPzb#AcY}< zH#e6TDUT0Q)V92F#h7tp3eYMnd;Mk61of%XduKPM0vE5U~)J4t%1<&sV8F@pc;1(&8CiV%Pd?NGeh=rduKg zsWRVHM(bbCMj*zqQO~mb)@YXQMQt6NI{s{cMf)_8kKeI7#Op|SK|!(lXllG1A9T&` zlF%q$?tr&oK0VVfqB^!axu?+OS0BS{>PZ-#HqE*0)UgJAET_cb^^{b(OBK$Gcrv-l zzbY}#L`?1iDzt<*=aClPeOmFvx!J%{K^^0hsChd@7$Y@4qBigv=TeqIElRv3=+^Vo z?E4ahL8YvVbAy=E449@mka3Wf#PU(k z;IqN;D-n=)j04x1Yvvx#nyk-;^_sRd);wc$;hcAsdDT!s>9XvIwqcjX%hESH^_vU^ zJX)LSN;b#6+1Z(R_D2JFDw*WEffbU%(*orMB4wV7g{)4n#?1CWBYnBJo)8b_%iU)> zoCh0Bx+35!QM{>k>;{wq_2tzR;<-iOo<733+%hq7-t-7rZf_Twcncb!A=YKtD-{{g zpCEA(No|DjWU61g-~j!DTf!B@6#dB#P?X@c#0vv=mRiWH$^%taj%wh_=gy4pAm^J= zkPWm%Cy{pTT4MzJ8{EEut6C+A)itqn8Ae>?_c=X_2@CW}q2NlXPb&HVe&;nqDq_=DmkevQ^rcNgQq&jyGVxDuAC=f=Kf{Q ztJKw^gNV|^$&yJ)(#HvkB&=92w$sf4h0$bZGtQ=*Z%2qv>lY9zb)cE8^A|9-nddtT z0KF69Lbd>{3a8~$JG9ikJ#uG0%i?BevOS0n=LtDdTsybij*=1egSDqqhRdXP4iigt z&{*K3R`un4es{_kVS_lPaI|KO^S29#hafD@Vf|L=8n$4TNqcMxOgj%ap$-sX>>D75K-q32Dt5~_F@!}Q&@BaDbP$Cxr=Hs`%* zJ0+FH249f`DW7z1pcp&?+cr|xuP;{vc1ap z5cRo(JU*<9@BwCXPp9WdZE(2nmg|kz>)|xYrj-1q%yGWqo9Xcc^L{DRB}g+h_Vl99 ztp8Y1>RYdDFhUGDB|~Mvs@eOIYh4jDO;klQ$|<7fCC`^{WKUpL3mVrqXSuA_H_k4n zw4v*-)Y87J*HdEG&aJa}uppM`cBqzR0sP;*L$@>p%uhg~jm<)=q|RH<(N*N({_u=J zb}`a1L483n)*6~Dy)`dPVcpj-=1k@E>UlVX5 zzw~&907y`vZ@ZCY<44i%sJT+FO9YvyO7I*}2UC*wazKq_v`JjpVKG>CV2><)NjdkL zvJ#GGk4jUD+ADbE2UIj2d5@hfdL0*Q6VAzmTPdgSk?G~O-cZy{!dm+#Fp%7KKON`2 z8YthEe(eJ&`*v-A{fus{8*Nzl#{IH%7^nU{g_6J5Jh@tvq^T=5vlX^9kR2(Imm9Vs zi>6k(%bb|!bI+QuL43kKKMcLWoMQ-i*}Vml=U#cw)30ZAY3<(KSYEI1Nk6luGC{nKpDNQv)Rm{O-ZXI}0e{a<@jL9cSUX$F zy1waoL2*a?lkful?N1vl$NBt2iji0uS zYFXqO-Z@^-sX!b$insJCrYfWy7SpEC!q3<7N4yno@r#_BY*>{*5!;3yzI0O>zF~0F z@pZ3B;j4EfwmtFT)MJ9EInu)7eF29%uL{*ob7%#Hm6@IJfx5XloEvm^0vYocfOlG0 zR#G`*uc0rZI9x$JPZcsXlZN-@Z=Lx-ca4Y5jY%&-#?_Q5oD5XTPxvnqBL=Y9tiEP> z1A(_YWXbq&3C~Ng2Y2#^hh7S$&wIc~`W+oErHdtSs1?UVBpCL>*CQmvkG-B91i}FB zBAkK+2>6Ji7%CEli?5@#n1C+`<2%`ho!4#vRrd903>3HLw+mY@!Qz7gciSD(f*`1H z*bSh8w~*k~<@L(fsJO+~w_A%BK^93%+0~E|QZh-&OsjbN>;qnpqW!L zW<;HmGRb2J4KrRaLL=q>6_Vw+L$yF;2m?-U+6k+yM&ek00|?8k;gC1hF7h#P6lNiD z%XIltH_#*R0}6XhMl4ZRJgT@0MVdH|975dBS;EkR4a=3sUS>OBB8GP^fe0`yeC5AmaKJSIO zhd+En=(!o1>{nmmZij%@*ILSsl&!v#=EZ-yxt~*P$N7{$=81S+Dbe7!p?#@IOYryo z%)v-?s}@*-Am4ZU-x90`Zj|(vc3^Htz#&;A?#bQY)9hHmyH_rQK#t2QKK%7>BOxE5 zzA+t_j9I3ovl}q8uag7j`Et5c``SQYmL4=zpY6W8tz}!#O>+zh zLNN6Jg^XN}$BY!@AwCRuTtT&gHOwn3A^_mz?Q{x8X z`v`g|M@beNdX_{Ezf3N8%a= zi=o4q)(4NyF)~dD(s~3zk%>qgty<$uIdM9%jk}IYJvtrtnmw7I2&~SaRg8@={RWXN z7do8pMNtTD`zbaPKI+Nzq^n8s7!nFwnzN7!gY*D<{4=ILTZsFZKm+*FJe6 zir4?>PDB|);P;lsxXQ#e%Xl013JkmcHqO#UzoI&!`<68kqenI&{T=%TFP~6mjU+|- zm8|h<9p%g5{*S4pu3NqMW2?qhOsQ6DM;wD_|3BphcMqun(9HHR`Rn!EwdwBux21am z82N7-mIur7#9`S^R`jk16>1Zt;D&?o)%h9acLh@)|8)7g5n8N7tvyh)s4~+;1AJV@ z#b(x$w`n8M0=Yh0VQf>Ni*ld{pvM)YeBkY_xezE_);tOAq3X~M)A;Sk_$oMPQy_Vk zg*rjcTV;ejjGrONYIH|cN#qSbmt+yIunAQVceA~ceczE(*BeqL1%WS%Ps6<$;T)fb zG+h7yCA&k*f*JYZ!yJt3stK=MY~yjFgS_)+TF_4=;ox|Ofi6P*U^m&YvT}3gCz84$ z>8~Q^H*{MZnKHU{70DuLatAL&#>cnX+Y&}~YWk)5f@$)0@2J_kJJ(Y^gt!c(fk(`x zZvQ`)|DiAc4bF{&Jp8?T7#r^4B)q@gmw{hq5A6G2d-*SPtvgszy1+rrL8Cs7V=-(} zul2ifr^~${Oc?zvjp5~Vvg+RSyw%EePSZts6Wju(>z`Zr44y!vwKic@GUcU5VY%d< zfCHg|(Vpdo+a1(KK|YC=u4Dv*YsqG`QspLUpcxzyO>>P%^*_;08v+=jpy75@*-ld> z3$@XvNbF)fleUKWZchDyE5$z+MP{$)l)@b2*YBE5)IOmufvDKr1x;#%ai*Rq1doP z&uBp%?{qj`IT%G78LpTWQ?Ei#{AlGoNzDm7_>se42qhX2oh8G!chPcp-Hal|XcI{z zF|jyVW^k$rspwg-P-ae+ly;PZlOFu4-5s7w2fBLn;L@5^3%)h5gk-8rhC#p~wi=SL z@(7Z6P~NA8a+Gz*9UaJG-U{$)=4WY^TUN=?e!@*G(5A{H|1?MA#A}T@P*h#O9=EnE zGXgz2l``QK$oZSUiajEZ+9ub`wm*+)(7hPpy6M(hyC0Jmp)JaW%hrq}$6bE}B=!+e z3@vF<&f+O3p|*vo>A3CKg!@4{g@nTX`MmliOh3-d zeR3cmA;|CFX-WPyProMkciris-a+?U`tP8Bsm+hwAM2sN-7)Wl zyx;DBtE2zxrXQrgU*qAXEn)s61U}sEzo+C+lxB(kQJ@|#^l>G7i1Q02NaBCE{a0Ok zJkR6C==VIAct7X)uQuuN43BBR-!mxQvw{ze*59Py{{rjJdnbbb>H3!h_2&+GEJFQ` zDE3dc-;&hhB|mOveow%EuWQ{e`Jb@;uSGv-x4*_ih9iDu_zxxb&y_#cavywuW$n{{ a`TkaRmE>T59#)L|e@wvN+kr?Q{QeJv`&ESi diff --git a/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml index 8e420cc..2cda1a4 100644 --- a/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -117,6 +117,10 @@ LEFT JOIN sys_dept d ON d.dept_id = u.dept_id u.del_flag = '0' + + + AND u.name LIKE #{nameLike} + AND u.username LIKE #{usernameLike}