From 87b93462f83f8e8bb69e9ab530a01435c08c7189 Mon Sep 17 00:00:00 2001 From: jinxuesong Date: Thu, 25 Apr 2019 14:31:04 +0800 Subject: [PATCH] role-user --- WebContent/images/academy.png | Bin 0 -> 1849 bytes WebContent/images/role.png | Bin 0 -> 1839 bytes WebContent/images/speciality.png | Bin 0 -> 1261 bytes WebContent/images/user.png | Bin 0 -> 1803 bytes WebContent/jsp/QueryCurriculums.jsp | 18 -- WebContent/jsp/QueryUserRole.jsp | 283 +++++++++++++----- .../edu/hrbcu/curriculum/pojo/Academy.class | Bin 1234 -> 1765 bytes .../cn/edu/hrbcu/curriculum/pojo/TbUser.class | Bin 3503 -> 3685 bytes .../curriculum/service/TbUserService.class | Bin 921 -> 1080 bytes .../service/TbUserServiceImpl.class | Bin 4438 -> 4786 bytes .../controller/TbRoleController.java | 19 +- .../controller/TbUserRoleController.java | 41 ++- src/cn/edu/hrbcu/curriculum/pojo/Academy.java | 21 ++ .../edu/hrbcu/curriculum/pojo/Speciality.java | 22 ++ src/cn/edu/hrbcu/curriculum/pojo/TbUser.java | 11 + .../curriculum/service/TbUserRoleService.java | 2 + .../service/TbUserRoleServiceImpl.java | 52 +++- .../curriculum/service/TbUserService.java | 3 + .../curriculum/service/TbUserServiceImpl.java | 10 + 19 files changed, 384 insertions(+), 98 deletions(-) create mode 100644 WebContent/images/academy.png create mode 100644 WebContent/images/role.png create mode 100644 WebContent/images/speciality.png create mode 100644 WebContent/images/user.png diff --git a/WebContent/images/academy.png b/WebContent/images/academy.png new file mode 100644 index 0000000000000000000000000000000000000000..59af8296bee2fd3093c123bd5e60ee7d5d40cdc4 GIT binary patch literal 1849 zcmah}2~<-@6dgho*(%m5xK&#qf?1YdYSW!f4tF0)uMQtm%Ry>@hlcWpPF7IUC-1p|*H*?;fNlJj<26K~z zCIA3)x|e4VoGr9tmLc?ZjHCrjqUh z5Jv#uVJHC9d;lz?3R?qL0f2cN;2TV1E;T4{!t7sxNh4y?DVTK9Klo%aMu5Y_*<+${ zn7#HGjy0xcE%x>%?C4hP=$1Ep2zI~^n?f{{t;I&+FsQY`!4-zx9>%x)%x*Hwpug^8 zTIy=F$HstXgOS){vxu{bDaIwvCM6W(0*Y}me&%i)13unD;^T67>-r-*=!rpVVpiJ< zECCuBoslW6tg5MyRmCSJCB=(HB5_^ask-{cuC6YrG^ePjSR#q9uC9@tY3gWi&&-k@ zFDQ_ROPn$C@d0-B~aBraIx<~zcf3$xVS{Gsy!ob|6NrGGqp9fvihdZ z&dw}pHdH0-OOQ7+1y>h`JcUz(`I5UD&3>?S zRHHfYKVHw&$+Q)8CVwk=?1!=YdK()XTyABLCsUlAoe`X=O;fKCJcvP<&j!y|*LgF& zVPGVrGiXNl42&`JoQxl^Byf2V-P1kTYS_TSVEk7YVhph}W*W^hHZe6be`_|dnDh4B zcjnEvv|6xm(c&fVE(Ocpd*9kdnw^uImv4((Zf6fxtaNZZb{t;o;*t}1gg^u&vQueU zdBw>}SyeT~*~JyOQ9r1utvhx4OnrmAan(8jC7*RFqg@tZ;PV@sp>|p1=6zy!y(e#Xr^rLC1pJ!(I*eBdbY}oc3 zcFtBv3lWAhg(#I3gTe`r2t+qW0@0D+7EB;fNkl4zw36UTB@pJyl_h@@@C4!92+6+- z!p8SmL%}-j4zYp=p@#F`gsjMRqhxw14zg+H%31I9?c)>M3Bw@ld{yN)3RbSU{9%+7QUGoW{}Bqf)(4 zE}J6+WRl&pm(L(&{+pC7+;AZWGOlcQg%=1cn8sjmd8kklg#z7~ktjZUjeN7;YdbN5 zAqx;GPR?#FL>D5-aOfHtQszvnvymGQ83Y$M4{tit3@(OETig^x2NB#zl!_n-N5Df7 zkw_FH5C{=IDvIR_buk`g#!9#>0Uystg$OI0@5tq`|4Op>h_*s3LL|6phclVvhKHw( SiROvnZh%hn^E~YldgwP^u`Ut- literal 0 HcmV?d00001 diff --git a/WebContent/images/role.png b/WebContent/images/role.png new file mode 100644 index 0000000000000000000000000000000000000000..f415d0d01797c78d95d896a6af4b7b1ebb9bb74b GIT binary patch literal 1839 zcmZ{l2~-nT6owzxilQ9lxPV$W)Iy745)hDxP&6z7gNP_vQ4^CPq!NN;VhTZ_77NrO zw6+it6L1NdNF)fdYE-a-pcteP5jcS0hTFmAs3@;*g0-|gz30t)|GoEn_s-0jB`r9} z&(dOs1pvU3>CXs3>m>3R`w5!uDHGSAWi;QL+AUAg=upo#QJ{aH{f+p!L#MrA$$VJ!CCr%z6-x$^7eN>` z40Na1YWdU8NoHM5p}f_F_x|cr#-CNiv4(KvFfcr`94yKYYf)XcK_6V42IR?##at{VBwnZYH=h9XoYp+hY zRv4p74A|s4<-SIQ;t2@}Xs)TLQK?j~24QBF;^!1uL!tE2QU39?;2*^yX{mcNGSbV+ z%94|ll}cq*Rh3$;&dJHCuB!aKu{q^TPe)thtt*sgZ_HmKG^y7##Mfx*zMQEQr;Zy+93PD)B@ zYHI53?KQM^?yu_T?dj_3?$POrQB4G7Wo5}^vbwr@|^?Ku>E zzL}I}n_nS)&W6;$?ly_<8Aa-GIY{=eASJSyIYSWMW0{+rN!zZ!A;JD5E~Iaf^N#dL zYbUSDw$G&ZAi3Z!lBuLHH8;g!8uDk?KYIAV`o+i}=j!MC!5FgvkUC$OjG|^+1N|6% z>+$h=so7D9<@ot;{zSG zWhSK;9yRaLm}&tm{S3QtOW2m$#O`9zEBM_J#XG z7s|5v&JIiM+%V;L`FTah%a4|vtUg?)Sj*gB z&|WPWyw-8zhN?;KzL)bVx8nJej>Kor40r6FTQ3SPk#p*s@rJOI;id6c+a&#NQSBuM zI1NVOZRw--Qdv{y&cTVFc@XmMIs^Ces$37r+s0esdsuiiF&$iy;e#6*Q`^w}T1fb; zCwLqJr*mU*v;Ze6&7DG}QK;^rR2rR1r8`j_s7sJY{s~w7V}nq{6GX)Q|Av=_4)S}k zg6tp`MG#U>EDkV1(-fT K4DE9E?mq!}aw+Qo literal 0 HcmV?d00001 diff --git a/WebContent/images/speciality.png b/WebContent/images/speciality.png new file mode 100644 index 0000000000000000000000000000000000000000..876e85b943894a34d38eb111166919c3bd9bddf4 GIT binary patch literal 1261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e4&pI^k&{7JHr`=!0|Nt7s;7%%h{b8&3wyg#LInqw z50M&)Vnc&ZfjzY%@drEvLyou{ci;&tU!H%zdf%%#TFvv8ny*^a^(!#+Q*qh7pI>MD zAO3n^`oGC{;vCceAAS3of4|9PyQA8> z)RtAWKCfT%{oK2Edl%?#y!rN}uAuqu8*zWWy>*|sK8a<`^z;zb$snh!ps0@0heublUOiVEdm=NjxO%~qBO$`ex5oH+EL~W-bZgH{ z!!sKf^5jN@AG=U|mThfnRIKOHSTl{>1#2fwQ{H_z`pK3Jr`7#ld&#?@w(4%8cSyFw3GSq`n!EC&-AoIR`YM%zq?T; zzVP!K#eZK;AC7aG=iO1bOaAZV7kAtXm}NFxm# z1ExXM64!{5l*E!$tK_0oAjM#0U}&jpV5noS#-wo>-L1pkG>Cq@R+DYaAPZYQ&MufvO45Oex6#DY?)qco(Qd5=n_~ zW^QUpWkD(f*wy+4dFl3>!u-(8@eKj0VlXr{F|#x?wKTG1-*k2=P>B$dIl-A#z%Vv3 zF|>4g5b96|lubaA4Gr>SNXyJgwbIwu&&bbB)h{nEFUrp^(a%dQFU~9h^Yu~_iz_pe z^YirbQcLucQ}T2(bJG!m$$9!96N>ds4S>kVz|u?)=-5}~H|GHDV(@hJb6Mw<&;$U+ CviG?F literal 0 HcmV?d00001 diff --git a/WebContent/images/user.png b/WebContent/images/user.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd2339cb3d8425108b2568c1196c7e684a45099 GIT binary patch literal 1803 zcmZ`)2~bm46nz2}RJ0OB#Eq&Wh&KErijYsOMAiUFX%av&Dk1rh4W zkSeaDP{r7Q3#$x>5p0!4K@_c87i??Cj$(1En%+kf(9qD};9wq) zClClGO`0@k&Yan^XS=(*vsf%2A0IzIKQ5OW78b_i^TWf#K`?##bZ2L07Z(?|`SY1f z=F+80g+jrKsHoMe#R&-sAfVA`4h{~Ej*cE5FTCA*p|`WOx_oovp$bU3Or7lPNK^7~ zt(f=bUeB95-EVpu|GZoesaaEK6DN${BM-S(sUA9W;Q0mPi%az{x{nXF?;mR4w_w2n z4I%C;jyt(N;(lq|;I~Cj8@CU&?i^~{{lri(czkneYHCPGNI^k?z3XCQLE^2gvIphz z$49aUkLCPfEO=zdH&*Ir&YZb#-@dZ4vVnntoSdAj4I6SdW*fF-nK#M$zFN~&qT0PV z&tkE(wYBy2^|`sZMMp<)>JIH~PF!Qq6*iqd-QL~~ z*^Z75yC)@3-MG=;-+%GqMQD+imseh1o{^E! z+S=OC&|owg0dzx++1%OLxqbWg($Z2G_29vS;8|5wRZ>#&O?9=wV5q67*|cesPN%D= zsMxh@7YIO{m6fGXDBwheg@rqOe2z|=R=LckWz=$JunxDsnYH*PrL(;3FP=q3 z!k!FMc<6yy9~x#I;}D_^TlazW)a(C9UKNc-$hP#wJAOOKjrT%B7R8X! zjxrt<8ye)_pEfql8_1aC;FW3^i$<+cmv3gjhM=v6%L}l*H)@R4GzXKm<_XkTbNxA@ zsXfvdWEJQdHzjgO>IA;WXvR+u?hM>>nmCy@#i7vdOI>Ji2>1K0@6IpuwV7O28X@|u zQY5@;F0hl6zy0!XH*QeH$ZZ@LOPHRE>WwGrPSqCLUF-Mp#@WpcO^um3FZZmu^=WJN z+flik_SyS=vsbM5mx(lCN#d;Kv4WJbehJYTfpL+keC3*Kj^y)oWBkaK=>bH<(APV! zH@zx4R~1)O-goNRmhR&}cdu=@cI9TzjZX72$=!qJcX+IA%y{&w^l(qr4>1+&#AlU_ zPaj|nwaJ(6&I{c^k6%%na^<0C;#I?K}Xk-!%flE^e*bs}sWYZZ;I)g1@uyEEAoawcY;f*sGZZlps z|EEBql96%g|6dTv;n+ffAJsvviqoV?QV4`;)hSq#N-9ahNQESxfJI6ZF|{0$m`o+b zxKxxk9Ho0<7^##I>pkQeMbhb$>D2%BRLV{y*D7Lh++QWtDhQG6J)$xgFKlmeX%eXG)^OY-f5ypnMO`YW@K6a2omQJ5+11_H0j9%8lDm)@ zi{!uO!xMoDF+CSAVS6#zUS8P7Bk+|#v=Kf+GJ`;#ix`W%mtQZwbqunxBeD?!E{Y?Q z2pm2ga+QL>($dmWR4NUoB+}HRW|(^r5_LK$RVh7`ga(t!lyp)N|8G#L#3% - ${course.id } - ${course.name} - - ---- - ${course.score} - 0 - ${course.theoretical} - ${course.experiement} - 0 - 1 - 17 - - - ${course.unit} - - */ }); } diff --git a/WebContent/jsp/QueryUserRole.jsp b/WebContent/jsp/QueryUserRole.jsp index 60639ec..f1e521a 100644 --- a/WebContent/jsp/QueryUserRole.jsp +++ b/WebContent/jsp/QueryUserRole.jsp @@ -12,10 +12,77 @@ + + + @@ -46,85 +226,44 @@
- -
    -
  1. - 课程管理 -
    2. -
  2. 课程管理
    3. -
-
-
-
- - -
-
-
- -
- - -
+ +
-

已分配角色

+

用户名称

- +
+
    +
    +
    +
    +
    + + +
    +
    +
    +

    已分配角色

    +
    +
    - - - - - - - - - - - - - - - -
    ID角色名称
    ${role.id }${role.name }
    +
      -
      +

      待分配角色

      -
      - - +
      - - - - - - - - - - - - - - - -
      ID角色名称
      ${role.id }${role.name }
      +
        diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/Academy.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/Academy.class index 1f8bfb5d5a9bb3b4382a77de736c1ef605aeba21..7a763faf6925fbc79dc665ab9cdab0df17930bff 100644 GIT binary patch literal 1765 zcma)*?N8HC6vm(1y%a_fw!wH)0YTY|P!tpdL}7@|OfZ@5gWtMRM{#RO*OKTzF+;3egas-(JWnQ=pU3?Lt_y1 zBdRE0l$1@QzR3_ZlqPMb0y`Dk(!D*^JfgjHV6SA@T3xfKuupHjR4mP~!wI{l+0Yb& zE9vjqalX&9B_zD2?LNk2roAiglMPoD-Cd8I&%}2Y`2H9xGkNm zkXSpZ?N5njj5F*>7-}2A*BBBN)3H=-U+2>=`R~mV9~#V3L4>|B#3Arb(Bui+NH@}5 z+(`4`M$)A?iD4wECgrZB>BeLUGW0t}E03t2Q5?*F!+1XW9h2vn`Ru0Npx-NW9O$?x zNlO&x=t=SlFprz`M6-njUreUR#bWs{$bO=XPnPJX)tWlBzO}M^lqjbq|g)OF?M=^1m?&yOeT=!OF;P0a**Ag jO)PeUtn>tV(rIGIkz%(aYXq`>2?&2{ILJQrPQcTDZe}51 literal 1234 zcma))%Wl&^6o&tCE~ddH_momfX%k8=P;)6OP$g7^6qJ@lAp40kN*ofqa%?1cA+{h< zkXW!q;-P>u9;bDpEQpjj*164h{yD$@{P+pr5KnYy3^mI!#UL<8Uf&8#EATwq3MRqS zJafmc`P||IG5w$;$&efK_uQOtXK23ekA>yyNHdf|ukD&$;n{p*f8_m%V9@LVRdg;( zI<7N(%8+#Ul){Brr0aXOidpV}V#Qdj?f7CSJSxo1!u~zs&1~0s+kU~oUNNj6yUxt# zj^E>xK%{6e`C|;}XSQSeM+}L2qeu51Q|}BCs2C`q$dK*WjyMgbec`=P$c2t;@kx)< z7&JoUO!^~x#<1V{ADIXORiW+EPkCY+#rzB+8=hnLueijWb8Kh*Gn`xr=;G+-U^WFGRVeC zkUQ9qiboMhzS;T(oqdAd`i8sbs7j^;q#TNA3ppBHN}`zZ7fkt3bB22q+l1C8jsH@q yMpmaSnp=kZI9P#fE+g-(M1F`zQSpLy=CXEG(ykWcOkZ%O< diff --git a/build/classes/cn/edu/hrbcu/curriculum/pojo/TbUser.class b/build/classes/cn/edu/hrbcu/curriculum/pojo/TbUser.class index 044f0fee7b1f7719666e81357bbbc099022e1cd1..d1eb2ff0b5155e66b7783d55bfe70801adc38b8b 100644 GIT binary patch literal 3685 zcma);U2hvj6o$__iJdr`HqIB6&y>=V56D6b1(Fh=4xvt+G}MWqEdnY-BnlE2+#>O#fcMObpwUF#Yz1QA z&w|-R@1h4o52I#;ILzPF4BM#gJs)qIi9;; z*w9GZ!fJWXZ3U(ql+Ai*kD%uKrvdJo<2u2*MnemWWn{^Fhjx~R=mnjgqvtg`TXbA| zCu~$~e=jQMRME4rfQe;L-gt00ICfeZT`Uf8g4o$e)eZ`Po?2K;lu(?@7-_VmQ-((2 z){5Mw7i2GH)sdvwJ;IruT=5}twpVo;qb&T9E#W_#Od7i{ma`D!)eODSqp@gKr#EQ@ zC4xK}sAwrLt&?rD8CPH&G`q20c-1wX#(C9otlA#OH+Zp%SxW5nu1~4iP~$DtG~H$zCTqJ=rcekD;4OUg%r)rnno%quXtTZz(zt{~`R3;EYn-3h31o zi&$95N>~U-SV%xvoTsojH(_x)!lM4dqKd+z48mfA!UA4c;K4pc=kTx5(_-uydKS;P z3Gg|O5d&6(9a;K=&i^W0F5ojQ2GjH+p7qFqF484@)958yz~?-kyTQNF;x8CTQ8)OK zGI*I@j)T|XokC1{Y56fNc9+hI(IwPsS!9@tyyE2TZlMEsX~Ud{}7sj&EWoN zTaDgUBCpEGSCz=uPDNgokynAd)(4qoHvsZGO5}AJd0mP8-l@pzGV*mG=ldXYhYW!H zK3!J`BQGOwDv>{+%{aJ6p?O)MTTtlD1ZTRVhBRN|$f41P%G%wKL3WfNTc_6UhFrVb zs9h<+lvF6+CIi&&rV_a*BbSxPJEtNSW#qd+zSjqtFTMegZz+*?W#j`T^6gWRcV*-X zkgYz*d`Ay}Tv94@PewjcBA3+)-IEnsgF;UdoJoc9JA@VbF@1v1dE8sc%lwWE;wnMz z(Wh~6PpjOKL41I;`hf6Dj6ptAf*i;o_mv=Ds6h^7kcR;Ist*XiMH$3Yf>dOXuazK& zYLJQy@(n<~?E}KEaR#xK@7W_6d{C|2Kf;nKlK6OA2JNmfJ{^5{tp?Y1_uBD literal 3503 zcma);TXWk)6vvO8#7Z3H;@qI^a4BuUN!qA|01Zt;X+m4KPLtv!q|icTSvX1^$;c8A zh6kA80X_+@FhgO62VR-sLjnJ@l4E&UkKLK-Si9%)+q3^&+j1=}@PPM(1qL zbgGeg5LE2Qw4)$!?Wi6dnGOHYH+L$#O()Q4P@~C1>kG@QTVBoFsvJ6Ys8d#>88Pbm zX4wf`tL}bnRqBpL8MlgvQahyNd$nsCjnw^`>v`4@e5O*<%dp+;kMs~L)csuf}~ z0gOVoZf;-%iN?8p)ZqEhWy+i#I43Vgv*Fmh%pAzMqly#k#C@D9 z`8EnzD1*KxgM;CL+tlbnsgJG0l7?zdSVT{z3iGMni47Scjphx~X&7$J*loHXdoinl zB&GJ=&2;2Sc8{}}28~b-{>YZ{pG_xC+~@al^aj1D({hKn;#q^95_xw-R!kv&=ez%wVI#kev&;qrGFxZw)i>2LxZMi2K&JoIwM-TXb12z z^GMAdZyy;>^NB&ToF6+>__8^Yl$x)I*Ygg{2!um%COjR8Z#_YVIdr0Aq`=%$--jCgvHJXi~b9X z4hxGu35$gaizNsPJlNCpJe@+#(_-uloxyLMaXeqbhzYB~4lVpnFaIK3Ucoaf2D5Yy zzm3>|&eH|FY4j?+hG%E+uT=P13O=t4UZBM!cnvGhaH)mGXH;mH&WX_idNeOG%*9?w zc}C;DG4(~dqySlxK`tsmF4L7H_#gqvFD(8=y7m+4i@(w9&uEF628i1cGhN2nxRPSZ zpD^Xc9%}S9d{0rPsFU_DLNl;BZkCqS=&BNVMMhp$B46u?ydooC1@cN4WR_bW$g4`^ z>oW4H68YVp$k%1$8$f=q3o@UKK9Fx9!T%L{Q%2rUB5%<9NpOckZ^{b21BDh-oY@mK zWchkV4vlUpdv{v~DJemUJ$rXs?%g(e_aMcTRw&;hee~|G68WBtyrV?k?1_9&M&1YV z!!F2t;q`%hUx~aWBR^6iKj?|PB_lrpvegBd@8&*`KTs;PEF)Ky$h&HVmSu$=K%s7m zGp$hmcCbSC=tDf^%Y0u3sVhM~qK}i{j-#?KgERp0c^44=crnN$CCFnLBvgWYss?#1 zgM0;$<1Qfl^<-waY!erFvSK S@?#ee{`-MJ4)9gWkozBLQ1c7` diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class index 3a76580ce50737a0dde4479504251a88faa6209b..b953d890dbe5da396695ad977ec47ca065448829 100644 GIT binary patch delta 143 zcmbQqzJr77)W2Q(7#J8#800o`9cK!XE>6u!O)hcF$q6k^Epn<1E=WzzOw7qFsq{=? zWKh!Z$x19s)Xz!GOV{_w&r7$~gb0+DWajAmWEPiLGctIhDw_D)Zt^9j6h_X;=FH*J aj0~JW+n5+6Sr{3l7^H!0Mg|$Mh%5keJ}5^3 delta 41 wcmdnNF_WF^)W2Q(7#J8#7^F9H9cP-Hz?{m+G5HvCI5z_WBZDMRhKWH601qe$)&Kwi diff --git a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class index c0b2249101e8f1c0bda9018dca9a3efd891880e5..7ac13bc3651d92165a34f08f645272c04b202e39 100644 GIT binary patch delta 370 zcmZ8b%SyvQ6g?A*Xh@;9P!PdI(bCr1EPQN&R)r#kn1v6-<}dufqaK( zAEvfdKfn)g}g;3O@M*q;QED;tS&xny2VRdALUeM!GaMuu1Ot kItk0z!UU~8NfbO_nsAb21HvKgB(WuAF`~&eZt#fNPo30OcmMzZ delta 76 zcmdm_dQFMz)W2Q(7#J8#7`ATYvgesB%R7;gbMty$KNekPhV?)RCWZ|RoIsk5fstV& ZklqBuLO@YH1~rDwK$$j%wG3MrBmn_55J~_5 diff --git a/src/cn/edu/hrbcu/curriculum/controller/TbRoleController.java b/src/cn/edu/hrbcu/curriculum/controller/TbRoleController.java index 643857f..953d83e 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/TbRoleController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/TbRoleController.java @@ -11,12 +11,15 @@ import org.springframework.web.servlet.ModelAndView; import com.github.pagehelper.PageInfo; import cn.edu.hrbcu.curriculum.pojo.TbRole; import cn.edu.hrbcu.curriculum.service.TbRoleService; +import cn.edu.hrbcu.curriculum.service.TbUserRoleService; @Controller @RequestMapping("/TbRoleController") public class TbRoleController { @Autowired TbRoleService tbRoleService; + @Autowired + TbUserRoleService tbUserRoleService; @RequestMapping("/QueryTbRole.action") public ModelAndView QueryTbRole(@RequestParam(value = "currentPage",required=false, defaultValue="1") Integer currentPage){ @@ -35,8 +38,8 @@ public class TbRoleController { @RequestMapping("/QueryAllTbRole.action") @ResponseBody public Object QueryAllTbRole(){ - List list = tbRoleService.selectAllRole(); - return list; + List roles = tbRoleService.selectAllRole(); + return roles; } @@ -46,8 +49,8 @@ public class TbRoleController { TbRole tbRole_ = new TbRole(); tbRole_.setId(id); - TbRole course = tbRoleService.selectTbRoleById(tbRole_); - return course; + TbRole role = tbRoleService.selectTbRoleById(tbRole_); + return role; } @RequestMapping("/AddTbRole.action") @@ -89,5 +92,11 @@ public class TbRoleController { return modelAndView; } - + @RequestMapping("/QueryRolesUser.action") + @ResponseBody + public Object QueryRolesUser(Long userid,Boolean isAssgned){ + List roles = null; + roles = tbUserRoleService.selectRoleByUser(userid, isAssgned); + return roles; + } } diff --git a/src/cn/edu/hrbcu/curriculum/controller/TbUserRoleController.java b/src/cn/edu/hrbcu/curriculum/controller/TbUserRoleController.java index 8f9ee2d..a4a46f2 100644 --- a/src/cn/edu/hrbcu/curriculum/controller/TbUserRoleController.java +++ b/src/cn/edu/hrbcu/curriculum/controller/TbUserRoleController.java @@ -13,14 +13,22 @@ import com.github.pagehelper.PageInfo; import cn.edu.hrbcu.curriculum.pojo.Academy; import cn.edu.hrbcu.curriculum.pojo.Course; +import cn.edu.hrbcu.curriculum.pojo.Speciality; import cn.edu.hrbcu.curriculum.pojo.TbRole; import cn.edu.hrbcu.curriculum.pojo.TbUser; +import cn.edu.hrbcu.curriculum.service.AcademyService; +import cn.edu.hrbcu.curriculum.service.SpecialityService; import cn.edu.hrbcu.curriculum.service.TbUserService; @Controller @RequestMapping("/TbUserRoleController") public class TbUserRoleController { - + @Autowired + AcademyService academyService; + @Autowired + SpecialityService specialityService; + @Autowired + TbUserService tbUserService; @RequestMapping("/QueryTbUserRole.action") public ModelAndView QueryTbUserRole(){ @@ -48,6 +56,37 @@ public class TbUserRoleController { return modelAndView; } + @RequestMapping("/AsynQueryUserInfo.action") + @ResponseBody + public Object AsynQueryUserInfo(Integer id,String n,Integer lv){ + System.out.println("id = " + id + ";" + "name = " + n + ";" + "level = " + lv); + List academies = null; + List specialities = null; + List users = null; + if(id == null){ + academies = academyService.selectAllAcademy(); + for (Academy academy : academies) { + academy.setIsParent(true); + academy.setIcon("../images/academy.png"); + } + }else{ + if(lv == 0){ + specialities = specialityService.selectAllSpecialityByAcademyid((long)(id.intValue())); + for (Speciality speciality : specialities) { + speciality.setIsParent(true); + speciality.setIcon("../images/speciality.png"); + } + return specialities; + }else if(lv == 1){ + users = tbUserService.selectAllUserBySpecialityId((long)(id.intValue())); + for (TbUser tbUser : users) { + tbUser.setIcon("../images/user.png"); + } + return users; + } + } + return academies; + } } diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Academy.java b/src/cn/edu/hrbcu/curriculum/pojo/Academy.java index d2b9513..3e02b7a 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/Academy.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/Academy.java @@ -8,6 +8,10 @@ public class Academy implements Serializable { private String name; private Integer code; + + private Boolean isParent = true; + + private String icon; private static final long serialVersionUID = 1L; @@ -34,4 +38,21 @@ public class Academy implements Serializable { public void setCode(Integer code) { this.code = code; } + + public Boolean getIsParent() { + return isParent; + } + + public void setIsParent(Boolean isParent) { + this.isParent = isParent; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java index 0c91dc3..9ea4d76 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/Speciality.java @@ -12,6 +12,10 @@ public class Speciality implements Serializable { private Integer code; private Long academyid; + + private Boolean isParent; + + private String icon; private static final long serialVersionUID = 1L; @@ -54,4 +58,22 @@ public class Speciality implements Serializable { public void setAcademyid(Long academyid) { this.academyid = academyid; } + + public Boolean getIsParent() { + return isParent; + } + + public void setIsParent(Boolean isParent) { + this.isParent = isParent; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/pojo/TbUser.java b/src/cn/edu/hrbcu/curriculum/pojo/TbUser.java index 300b6db..aa675b8 100644 --- a/src/cn/edu/hrbcu/curriculum/pojo/TbUser.java +++ b/src/cn/edu/hrbcu/curriculum/pojo/TbUser.java @@ -30,6 +30,8 @@ public class TbUser implements Serializable { private Long specialityid; + private String icon; + private static final long serialVersionUID = 1L; public Long getId() { @@ -135,4 +137,13 @@ public class TbUser implements Serializable { public void setSpecialityid(Long specialityid) { this.specialityid = specialityid; } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + } \ No newline at end of file diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserRoleService.java b/src/cn/edu/hrbcu/curriculum/service/TbUserRoleService.java index 8265bd6..99f7f38 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserRoleService.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserRoleService.java @@ -2,6 +2,7 @@ package cn.edu.hrbcu.curriculum.service; import java.util.List; +import cn.edu.hrbcu.curriculum.pojo.TbRole; import cn.edu.hrbcu.curriculum.pojo.TbUserRole; /** @@ -23,4 +24,5 @@ public interface TbUserRoleService { List selectAllUserRole(); + List selectRoleByUser(Long userId,Boolean isAssigned); } diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserRoleServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbUserRoleServiceImpl.java index 2afd43a..546ae03 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserRoleServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserRoleServiceImpl.java @@ -1,13 +1,18 @@ package cn.edu.hrbcu.curriculum.service; +import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; +import cn.edu.hrbcu.curriculum.dao.TbRoleMapper; import cn.edu.hrbcu.curriculum.dao.TbUserRoleMapper; +import cn.edu.hrbcu.curriculum.pojo.TbRole; +import cn.edu.hrbcu.curriculum.pojo.TbRoleExample; import cn.edu.hrbcu.curriculum.pojo.TbUserRole; import cn.edu.hrbcu.curriculum.pojo.TbUserRoleExample; import cn.edu.hrbcu.utils.Common; @@ -16,11 +21,14 @@ import cn.edu.hrbcu.utils.Common; * @author Youguangfu * */ +@Service public class TbUserRoleServiceImpl implements TbUserRoleService { - - @Autowired TbUserRoleMapper tbUserRoleMapper; + @Autowired + TbRoleMapper roleMapper; + @Autowired + TbRoleService tbRoleService; @Override public int insertUserRole(TbUserRole userUserRole) { @@ -75,4 +83,44 @@ public class TbUserRoleServiceImpl implements TbUserRoleService { criteria.andIdGreaterThan(-1L); return tbUserRoleMapper.selectByExample(example); } + + @Override + public List selectRoleByUser(Long userId,Boolean isAssigned) { + // TODO Auto-generated method stub + List ids = new ArrayList(); + List allRoleIds = new ArrayList(); + TbUserRoleExample example = new TbUserRoleExample(); + TbUserRoleExample.Criteria criteria = example.createCriteria(); + criteria.andUseridEqualTo(userId); + + List list = tbUserRoleMapper.selectByExample(example); + List allRoles = tbRoleService.selectAllRole(); + for (TbRole tbRole : allRoles) { + allRoleIds.add(tbRole.getId()); + } + + + if(list != null && list.size() > 0){ + for (TbUserRole tbUserRole : list) { + ids.add(tbUserRole.getRoleid()); + } + + TbRoleExample exa = new TbRoleExample(); + TbRoleExample.Criteria c = exa.createCriteria(); + if(isAssigned){ + c.andIdIn(ids); + }else{ + allRoleIds.removeAll(ids); + c.andIdIn(allRoleIds); + } + return roleMapper.selectByExample(exa); + }else{ + if(isAssigned){ + return null; + }else{ + return allRoles; + } + } + } + } diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserService.java b/src/cn/edu/hrbcu/curriculum/service/TbUserService.java index 4aea5cd..32ba9a8 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserService.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserService.java @@ -19,6 +19,9 @@ public interface TbUserService { List selectAllUser(); + List selectAllUserBySpecialityId(Long specialityid); + boolean registerData(TbUser user); + } diff --git a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java index f5fd728..46dd418 100644 --- a/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java +++ b/src/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.java @@ -108,4 +108,14 @@ public class TbUserServiceImpl implements TbUserService{ } return false; } + + @Override + public List selectAllUserBySpecialityId(Long specialityid) { + // TODO Auto-generated method stub + TbUserExample example = new TbUserExample(); + TbUserExample.Criteria criteria = example.createCriteria(); + criteria.andSpecialityidEqualTo(specialityid); + + return bUserMapper.selectByExample(example); + } } -- Gitee