From fdf5befa8e7eac83b7e61699d6b74a2e4305c5a3 Mon Sep 17 00:00:00 2001 From: fumeiai Date: Tue, 26 May 2020 10:42:01 +0800 Subject: [PATCH] remove role permissions control --- .idea/workspace.xml | 7 +- .../com/lz/modules/app/entity/UserEntity.java | 6 +- .../sys/controller/SysRoleController.java | 160 +++++++++--------- .../lz/modules/app/entity/UserEntity.class | Bin 5032 -> 4121 bytes .../sys/controller/SysRoleController.class | Bin 4564 -> 4248 bytes 5 files changed, 86 insertions(+), 87 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8fa76a63..26785037 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,11 @@ + + - + + diff --git a/src/main/java/com/lz/modules/app/entity/UserEntity.java b/src/main/java/com/lz/modules/app/entity/UserEntity.java index b6a3bec6..c335a1da 100644 --- a/src/main/java/com/lz/modules/app/entity/UserEntity.java +++ b/src/main/java/com/lz/modules/app/entity/UserEntity.java @@ -22,7 +22,7 @@ import java.util.Date; * @author Mark sunlightcs@gmail.com */ @Data -@TableName("sys_user") +@TableName("tb_user") public class UserEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -32,10 +32,6 @@ public class UserEntity implements Serializable { @TableId private Long userId; - private String realName; - - private String userNo; - private String status; /** * 用户名 diff --git a/src/main/java/com/lz/modules/sys/controller/SysRoleController.java b/src/main/java/com/lz/modules/sys/controller/SysRoleController.java index be0a63ee..1e712941 100644 --- a/src/main/java/com/lz/modules/sys/controller/SysRoleController.java +++ b/src/main/java/com/lz/modules/sys/controller/SysRoleController.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2020 fumeiai All rights reserved. - * - * - * + *

+ *

+ *

* 版权所有，侵权必究！ */ @@ -32,98 +32,98 @@ import java.util.Map; @RestController @RequestMapping("/sys/role") public class SysRoleController extends AbstractController { - @Autowired - private SysRoleService sysRoleService; - @Autowired - private SysRoleMenuService sysRoleMenuService; + @Autowired + private SysRoleService sysRoleService; + @Autowired + private SysRoleMenuService sysRoleMenuService; - /** - * 角色列表 - */ - @GetMapping("/list") - @RequiresPermissions("sys:role:list") - public R list(@RequestParam Map params){ - //如果不是超级管理员，则只查询自己创建的角色列表 - if(getUserId() != Constant.SUPER_ADMIN){ - params.put("createUserId", getUserId()); - } + /** + * 角色列表 + */ + @GetMapping("/list") + @RequiresPermissions("sys:role:list") + public R list(@RequestParam Map params) { + //如果不是超级管理员，则只查询自己创建的角色列表 +// if(getUserId() != Constant.SUPER_ADMIN){ +// params.put("createUserId", getUserId()); +// } - PageUtils page = sysRoleService.queryPage(params); + PageUtils page = sysRoleService.queryPage(params); - return R.ok().put("page", page); - } + return R.ok().put("page", page); + } - /** - * 角色列表 - */ - @GetMapping("/select") - @RequiresPermissions("sys:role:select") - public R select(){ - Map map = new HashMap<>(); + /** + * 角色列表 + */ + @GetMapping("/select") + @RequiresPermissions("sys:role:select") + public R select() { + Map map = new HashMap<>(); - //如果不是超级管理员，则只查询自己所拥有的角色列表 - if(getUserId() != Constant.SUPER_ADMIN){ - map.put("create_user_id", getUserId()); - } - List list = (List) sysRoleService.listByMap(map); + //如果不是超级管理员，则只查询自己所拥有的角色列表 +// if(getUserId() != Constant.SUPER_ADMIN){ +// map.put("create_user_id", getUserId()); +// } + List list = (List) sysRoleService.listByMap(map); - return R.ok().put("list", list); - } + return R.ok().put("list", list); + } - /** - * 角色信息 - */ - @GetMapping("/info/{roleId}") - @RequiresPermissions("sys:role:info") - public R info(@PathVariable("roleId") Long roleId){ - SysRoleEntity role = sysRoleService.getById(roleId); + /** + * 角色信息 + */ + @GetMapping("/info/{roleId}") + @RequiresPermissions("sys:role:info") + public R info(@PathVariable("roleId") Long roleId) { + SysRoleEntity role = sysRoleService.getById(roleId); - //查询角色对应的菜单 - List menuIdList = sysRoleMenuService.queryMenuIdList(roleId); - role.setMenuIdList(menuIdList); + //查询角色对应的菜单 + List menuIdList = sysRoleMenuService.queryMenuIdList(roleId); + role.setMenuIdList(menuIdList); - return R.ok().put("role", role); - } + return R.ok().put("role", role); + } - /** - * 保存角色 - */ - @SysLog("保存角色") - @PostMapping("/save") - @RequiresPermissions("sys:role:save") - public R save(@RequestBody SysRoleEntity role){ - ValidatorUtils.validateEntity(role); + /** + * 保存角色 + */ + @SysLog("保存角色") + @PostMapping("/save") + @RequiresPermissions("sys:role:save") + public R save(@RequestBody SysRoleEntity role) { + ValidatorUtils.validateEntity(role); - role.setCreateUserId(getUserId()); - sysRoleService.saveRole(role); + role.setCreateUserId(getUserId()); + sysRoleService.saveRole(role); - return R.ok(); - } + return R.ok(); + } - /** - * 修改角色 - */ - @SysLog("修改角色") - @PostMapping("/update") - @RequiresPermissions("sys:role:update") - public R update(@RequestBody SysRoleEntity role){ - ValidatorUtils.validateEntity(role); + /** + * 修改角色 + */ + @SysLog("修改角色") + @PostMapping("/update") + @RequiresPermissions("sys:role:update") + public R update(@RequestBody SysRoleEntity role) { + ValidatorUtils.validateEntity(role); - role.setCreateUserId(getUserId()); - sysRoleService.update(role); + role.setCreateUserId(getUserId()); + sysRoleService.update(role); - return R.ok(); - } + return R.ok(); + } - /** - * 删除角色 - */ - @SysLog("删除角色") - @PostMapping("/delete") - @RequiresPermissions("sys:role:delete") - public R delete(@RequestBody Long[] roleIds){ - sysRoleService.deleteBatch(roleIds); + /** + * 删除角色 + */ + @SysLog("删除角色") + @PostMapping("/delete") + @RequiresPermissions("sys:role:delete") + public R delete(@RequestBody Long[] roleIds) { + sysRoleService.deleteBatch(roleIds); - return R.ok(); - } + return R.ok(); + } } diff --git a/target/classes/com/lz/modules/app/entity/UserEntity.class b/target/classes/com/lz/modules/app/entity/UserEntity.class index 4bb6a850cb3a80b078162583cc684cd94a9cb407..8ee09521d5f37f8076c362d64f790e86b1435083 100644 GIT binary patch literal 4121 zcmb7H+jHF18UJZ5t+cz^^=65aETlAm3%+LC(i?J;0=a;xZPGY#1EmGoR%3uwbSWKr!(XwGc7Yx!C%Zo|@xwA2*tYPzj4z1zk%b>y_=$y|TKJiTpIdlQmVaU5mnMFtq2Bj;zS~~& zdVN3WURXS(L3>0)^<>cPhi*4qbK3*YV94@M(@-1`u((O!(q;FG+iJVrORc4#duc&K z^W2~t`WbaW-w@VuC8;Zzug}6TW)ICI`0y< zxJh3{K0O=|*vLF*HSGD(lPrm%>vlXEc7k=kO~u-F`~7Ew9%CzS^gK88&NG%Y&_U?8 zTc@}x&X4(BKRlsfY-)N_C)gacJ*Kg}-SU`!c(rwb(VdP|KCE=f3uQry)|i^kq!X7-3|8Z8_m3E)`Bq{d zDrEsI$63qH*);JgXD2hcr_ak~U+ND7x@Bs2JW`PQvKMXzn`hk~OB|9K%z~gK$cZc{ zj!|Hh*l`>sXK9qwGf{GujWP*h7^HYBde02pHXl9mxJTD7dmG`x^yB1dFv^a2OM?-F zTV9XxNT((f!rIYlI#rtq%i_&sT1}BEm)a1k78E+6UW`tr3O%G_j2RsveMC zscyVdAGAXaW}2}% znWR^W)>J0uWD<61au{J{G8>8&2CB_GTC2gJx8a?Mj@FpraQ#VXm5op1Gd4bjyKPKk#>T9OIT75ij#-%pFmMJxG|!FT0?$)Oyuz8ic`E|}cQ0UNu)v$tz_LoU9gYQ##hKYRP{{Aq0c8>QO8TgX@*r`B#z~!#oW!X-mt%W% zDLm5n zF#oa4wW98%->SN#Jim!0EVGak_!m}qPZcnUzvEG^jj?AR;4C#A58(}bm72ldpKy+{ zh&EovDm4>5yomGEEWCoJae-P1zk!D}YGv%;48BIKg1_N@T%=~>AH0+wqgKT~aT^|| zR>RjB?-C|V>n3U@p7;<4Onig?E$u@bQfle{Qj>$WL~`izYK{4JAJdiVzz|kQm9m$w zs*<`5jI>GyYa>;PkM2rDH@<|q#0#eIFkO`B=+*kdG5vT%s>Ah#EmF#=&t8W)zk_{G z$-3?6veDGz9ZQI&wyKU1ZINRU$Z8tNR?R6!Tg7yX%u}dw$Bec}x)^09TXn~ZwyboE zR3z$fJ~5t98N?}%;g4{!&ioAg0UOi`Y~}B<$uf-bJ^BLME5tZ~Eqsfb5w-IYwIV{+ zWQ&@Kmv9h1HA|YS-3j|6F6eBorm>;?>+B;s8_o-|FaaYmNNn`crP!>PF&kR$UX6{- zQRAU~&PEKe{tGfh|yFV_{8qlX!fJ!V$6dA540SRcJ#$m MVLToFx_t!y0rEZep8x;= literal 5032 zcmb_gX>%M`6+JD@O!sV>(MYo0u>mjRL~91eP6BN^5HA7+Nimi!5(7zEQe%xXno(wP zu-OyV5J9w-aY5` zefQn_x=XM8`&YjOa0oxjpp3`T$l!4i9~bcn5uX(CDG{F*@fi_MnD}glaDh0Z!fyFj+f+S+`M}hXYQ5UN%Rv9=*rI{N z@x}^)h1qJ|oA0bGc}*3YMAKMizFcOFvHFXN_G*=^IK|hsQ0#0``FuV!U%|YNr(jfYRp9vw0cbyEe%=!5c z%c*Wk@|+!yWThKPG%x8^80yeyZ={l{;+)rBZLFMfn@oP2g=8R0QW*Y7l;%e-#K5(R zpNww&{v-YPIqSwxJrX}>(fEV#!tmuODesYvTVqh0!nk+og16j0Ja&%t&h$lV%r_ZG zHrlIRle>}AElYXHdF9kLoLk1pkTD9aDex$COZc|-ByU|%h}^^=lTs;h2mRW}Pe zXNFljb$Vv*B-2Vg)%04OTHAox%~!e{rbe$y9?WvE>9j)X4V&d)GwE^|ceWf2&}uhy zNwLKj8lC2{H?3N~ARV9^?pC>}3{ha{FU+%Dn{+-aaJciwAV2RYR7t{mQix8|@Y+TA#o!*LNOM4S{cE#hq= z-j10Z8dx{5J-mQ*299;AwG}DYQn>d~343PcXb#Wgs)!%5=q7guXK<8VIJsLe^9`-* zbD&O?tjkGgi#`i&2~LBv{N(QNJUBPTa`+&Q@m>hy(=BCSSS?i>l?Cllx4zu z(yOz#rs8gj$epukpFE&V_@Je4h{qnjFv~EoA8Fi#n{f;EQNGvuFvcHGmGddiQygzq z>pWyN@|@MkqgEqNTa7$$HS)~W$YbX?LOu(H(&4Pa(cqXIe-Xyd6znjiJOtQ*Ba}G} zz){@AnIXkMxtaV6^!=2^K7`~wv1Hay47tCTyf2o_x{Dzvddd4^$*k8HaOdnYqdF4P@1n zN^X9V!bwd10a-ioG6t_AH)SU_kPi?8PLhxTCuJuElX@AYtH|3)I~4&H9Fw4eW7(#F zEFWarRs>XZ(gYQqjGY!x#s{VCOawIOWCeNe$JMnJ>PAVI@U$sQC?$p;PEr2v$;#!l^zT;Tfle@SOJ=xbvd z_u+mX$%t_P=lDkGL)qAicXO>DIKk)#y6l(Y@9;9ZXi9g{X zY8IZs3vj8W@hpCVC2ARL;At#V%i=e90xQ&V_!}OEM=g(kaC{%N0luK7ah_ViNb!xd zO08(@=WDb|ZP1v&PF$c?A`|qy)3pAD0TZ=XvCYI9|69hZ*rC<*|3M9|rTbW<3HfZ& zMXKJka(O1DIwi-^m!!_IzB`jaj+wP{jJ#X+=TzDAvx-Z+j{Eo0MV5~KUOapxaa0xe zuHxZUmbO)#xC(P>10xT~`hb%VgPrg#mK3};6`Z6pvDOvIvXg)itpLG;7c? zm5Iggv&_I$ax7)Cx+b=SW(_%MWnwq@taM-+b~4J8>6+LhWbKMC#&x}KKT-Yo3m#!H z@mm;wMvGb>%jb`1GkN{khhL&YEx{sv4i~8<`Fk9XQl^Mm#rvt5c#0)@iJFBU^JDok zwKRT@?f3w-j1-UYa}=+0A;ID?3>FOk)Nq{-2g+YMmFVUD~Dfg6OZ)I`2@s^m?riiv9+z^V+mayR|+f r`W~$hi_g8(H?XhwGb{Qzz3$g=A3mh6gb%B4`z+)92!9`K;bZ>+1w@%L diff --git a/target/classes/com/lz/modules/sys/controller/SysRoleController.class b/target/classes/com/lz/modules/sys/controller/SysRoleController.class index b2634ad6fb5a184ea8dd744bf79d36ec1e0ee6cc..7c6ad4358fdf2e3cbedfc55fda699882bdef5d6e 100644 GIT binary patch delta 1505 zcmb7@>u(fQ7>A#k-7>qg$1QE8K(&=xwe4n8Kc!`PeU$ChuMWgYviQoLUh%0j z>&r7|jVEmEt9E$J4ktZc_jtphSU*`maBOj*-CbI7|8$nlXXi89H_>hA;2MuN4X1d^ zBQU(pHp4r->(FwvcA{39o1L7h?5Wj{RBJPa)0{E9$NS-8ZeXm7>pVU%oaIBqM||wi z9HmUvrVm#}rfT)N$0vqQnKyjK=Z14E7(&h)9=5|5eCbdL_vgF9-<_7Qnjdod&wbY) z?(!$HnVGrSrEmRjoNyuE9S)nb!3HS?u6{zs;act1Xzq-xV!6!bX|D=3UayFXW=C^V z=>pDTl+vTo9)JRF&}iZSZsaEI9D3=aDN3FsLy(biUFiqh@O#{oU`Cg6; z_B3B`Fi3%+=)_I3D=9hAuKFqI( z31z|MS4>sAtI8KUD7x$$*t|@$Reo)XJlxW}KCmxXiqji<_pzH1T~QRmDEA0sBh9L7 zhc5b8`Pg!=EQ#{FbeE`2G41)^*KRhX>f36f&WkY$tS;Ge6U^LTkCS zOxrS7CxxwZQ4O|lTzbO45_&74avJnq5p$y>MiZ_cp;qH-_wk@zL>;j|1^CcvM;uU= zqtETX(SlXB_B5N4TO&=U^|&*v<+zlrM}6`CX&*_^KANI^jNw2RMGYL|KF$+~l4FUI z#YDOFm(j&v+$ptUkfJI!G%PaClM*0#+wm(kJZPy#5)q$DVLg4Rh%OUKc6lahj#jOn L)xOry|G9qv+!?e_ delta 1813 zcmbVMYjYD-7=F&CWjCAc7D6u;p;C*ICc%I}1@S^HR!VPbTM$voHjSkvO=>p*L2%bKdh_p67Yb>|DzqtcklE?b2 z=^<-0otk%*zeGUA`T0!MY+&^*xYfX`cumFY24?Ywz*<*S)j6HnjGePGIRPU%ld^KD zVLLU`J;po(Z{jTjH(|Ysw+*6D$YPuhu;+ppDkv|@vb%LYEchXy{v#{#up z>9my@Pjsd&+g9<3flu+7fzR=UfiLlufk)-?HNFu@xR*u3{Zrd+)+|CI9Cu5ob<|ue z)tk+X3k1_N`>k|7B@l?T?c+L~C;uIh-o?;?(aBUYw`;klZMn-01<%i43eE|4D0I$Q z$F~3|{82dwwD7co_GZsZs!Mz-&m0cdjf_ap3fk)ERfsEIN`$K{0G4RuY7_$yMT{qb zI5wf$OLkEOCqU#axEH$_EcN-02ql*GpI{ukikjX^re@Sx zO10Lfy0VgL12qH7Yv@27?jxc-RI;m#Zo5xcBk~T9Zk%-Ej4je_pe^1>w#B-HUlH!(X*Gvdr=UN+sepPpxrPNg zfwIXBz;y61M>ohvIP7tW77La}7eP1nv8hQ=J?JHeCe)&jtOBJW7Crs+_@nD4rsX^a z%6L5Jjm!|(Bk&N*@3h%R5X+!X?JzqjEYlnd{EWtHxFJ@YT$4|AjRMk=Pfrz?3WwwO&ur$_{id$I>-#c&&Pj5Yb;;^+l>|2 zGPVB~+o3XSkCkD2d?~iW81ZH6@?|r9nbvwx9A76A(LIGu(>mU~i;9^g#Y`N5MY{eZ lk1%D4VxwiKl4YpIDp4s&F;~G8%&(W93I*eI94)Cm@h@e24EO*5