diff --git a/WebContent/images/academy.png b/WebContent/images/academy.png new file mode 100644 index 0000000000000000000000000000000000000000..59af8296bee2fd3093c123bd5e60ee7d5d40cdc4 Binary files /dev/null and b/WebContent/images/academy.png differ diff --git a/WebContent/images/role.png b/WebContent/images/role.png new file mode 100644 index 0000000000000000000000000000000000000000..f415d0d01797c78d95d896a6af4b7b1ebb9bb74b Binary files /dev/null and b/WebContent/images/role.png differ diff --git a/WebContent/images/speciality.png b/WebContent/images/speciality.png new file mode 100644 index 0000000000000000000000000000000000000000..876e85b943894a34d38eb111166919c3bd9bddf4 Binary files /dev/null and b/WebContent/images/speciality.png differ diff --git a/WebContent/images/user.png b/WebContent/images/user.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd2339cb3d8425108b2568c1196c7e684a45099 Binary files /dev/null and b/WebContent/images/user.png differ diff --git a/WebContent/jsp/QueryCurriculums.jsp b/WebContent/jsp/QueryCurriculums.jsp index ba45a4f8dc0e74b9cb7a8fba4ea1496694dc9061..336c8dfe7635f49187e404a386640bd5f7138200 100644 --- a/WebContent/jsp/QueryCurriculums.jsp +++ b/WebContent/jsp/QueryCurriculums.jsp @@ -57,24 +57,6 @@ } } }); - /* - - ${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 60639ecd299fbdf2fe6d33d4b7d2d6a3da64a8cb..f1e521a6635d6a0c33b44c71e2fabf4dc507d5ab 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 Binary files a/build/classes/cn/edu/hrbcu/curriculum/pojo/Academy.class and b/build/classes/cn/edu/hrbcu/curriculum/pojo/Academy.class differ 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 Binary files a/build/classes/cn/edu/hrbcu/curriculum/pojo/TbUser.class and b/build/classes/cn/edu/hrbcu/curriculum/pojo/TbUser.class differ 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 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserService.class differ 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 Binary files a/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class and b/build/classes/cn/edu/hrbcu/curriculum/service/TbUserServiceImpl.class differ diff --git a/src/cn/edu/hrbcu/curriculum/controller/TbRoleController.java b/src/cn/edu/hrbcu/curriculum/controller/TbRoleController.java index 643857f3d7730ff945d6dbde10395210e446b3f0..953d83eb2a0556f055acde1a3e2918241f982cb6 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 8f9ee2d4777b10f7fa37fecdf37796597fe4c576..a4a46f2bf3475f7fc1df391c0d1b4e6976281c2d 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 d2b9513096e72ff0eef355ee26b830a22cc2f95e..3e02b7adeb28737a0efcfba90ae61d3a5aaa089f 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 0c91dc3043e9899f9a89d2733ccf865a00e5ca04..9ea4d762aff2cfbd6cf37fdaf39fae7297d956d8 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 300b6db76b599c5adf8eaf16ed7330fb041f6a93..aa675b8befd4d5019e2c038e97a63a597b1f7b4f 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 8265bd6b059801e3c98aa69ac9bfdc1c54957404..99f7f382d384cdf88cd0236bbc80f2a5d17d91f1 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 2afd43aae754e276671c91df67b6fd0fa91f5ebd..546ae03f339c16c6e9fe6e4333a1168078f1f9e3 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 4aea5cdba8a715863685f2562afd56eaf7fdde9c..32ba9a8910f0bc5d7494bae291f5db46f8e78a7d 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 f5fd7287bb28298b7a87295254e5b25e7b253c68..46dd418919656e88f83313e9eaba12d09d07465b 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); + } }