添加controller

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -3,10 +3,7 @@ package com.xintong.visualinspection.controller;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,11 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.err.BusinessException;
-import com.xintong.visualinspection.securityTools.RedisCacheUtil;
-import com.xintong.visualinspection.service.AuthService;
-import com.xintong.visualinspection.service.UserService;
+import com.xintong.visualinspection.service.DepartmentService;
 
 /**
  * 文件名：TestController
@@ -29,76 +24,40 @@ import com.xintong.visualinspection.service.UserService;
  * @author wenhongquan
  *
  */
-/**
- * @author wenhongquan
- *
- */
 @RestController
 @RequestMapping("/dept")
 public class DepartmentController extends BaseController {
 
     @Autowired
-    private UserService userService;
-    
-    @Autowired
-    private AuthService authService;
-    
-    @Autowired
-    private RedisCacheUtil redisCacheUtil;
-    
-    @Value("${jwt.header}")
-    private String tokenHeader;
-
-    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String login(@RequestBody User user){
-    	User u = authService.login(user.getUsername(), user.getPassword());
-        return returnSuccessResult("登陆成功", u);
-    }
-    
-   
-    
-    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String logout(){
-    	//获取用户名
-    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
-    	if(username!=null){
-    		redisCacheUtil.removeForUserName(username);
-    	}
-    	//返回成功
-    	return returnSuccessResult("退出成功");
-    }
-    
-    
-    
-    
+    private DepartmentService departmentService;
     
     /**
-     * 添加用户
+     * 添加部门
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
     @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String addUser(@RequestBody User user) throws Exception{
-    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
-    	userService.insert(user);
+    @RequestMapping(value = "/addDept",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addDept(@RequestBody Organ organ) throws Exception{
+        
+    	departmentService.insert(organ);
     	return returnResult(0, "添加成功", null);
     }
     
     /**
-     * 修改用户
+     * 修改部门
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
-    public String updateUser(@RequestBody User user,@PathVariable int userid){
+    @RequestMapping(value = "/updateDept/{organid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateDept(@RequestBody Organ organ,@PathVariable int organid){
         try{
-        	user.setId(userid);
-        	userService.update(user);
+        	organ.setId(organid);
+        	departmentService.update(organ);
         	return super.returnResult(0, "修改成功", null);
         }catch(Exception e){
         	throw new BusinessException(20003);
@@ -106,17 +65,16 @@ public class DepartmentController extends BaseController {
     }
     
     /**
-     * 删除用户（软删除）
+     * 删除部门（软删除）
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
-    public String deleteUser(@PathVariable Integer userid){
+    @RequestMapping(value = "/deleteDept/{organid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteDept(@PathVariable Integer organid){
         try{
-        	userService.delete((userid));
+        	departmentService.delete((organid));
         	return returnResult(0, "删除成功", null);
         }catch(Exception e){
         	throw new BusinessException(20002);
@@ -124,53 +82,48 @@ public class DepartmentController extends BaseController {
     }
     
     /**
-     * 获取所用用户
+     * 获取所用部门
      * @param page
      * @param size
      * @return
      */
-    @SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+    public String getAllDept(@PathVariable Integer page,@PathVariable Integer size ){
         try{
         	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getAll();
-        	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	List<Organ> organs= departmentService.getOrgans(new Organ());
+        	return returnResult(0, "获取成功", new PageInfo(organs));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
     
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+    @RequestMapping(value = "/getDeptByParent/{pid}/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getDeptByParent(@PathVariable Integer pid,@PathVariable Integer page,@PathVariable Integer size){
         try{
         	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getUsers(user);
-        	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	Organ organ = new Organ();
+        	organ.setParentid(pid);
+        	List<Organ> organs= departmentService.getOrgans(organ);
+        	return returnResult(0, "获取成功", new PageInfo(organs));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
     
-    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getUser(@PathVariable Integer userid){
+    @RequestMapping(value = "/getDeptById/{organid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getDeptById(@PathVariable Integer organid){
         try{
-            User u = userService.getOne(userid);
-        	return returnResult(0, "获取成功", u);
+        	Organ organ = new Organ();
+        	organ.setId(organid);
+        	
+        	List<Organ> organs = departmentService.getOrgans(organ);
+        	if(organs==null||organs.size()<1 ) throw  new BusinessException(20001);
+        	return returnResult(0, "获取成功", organs.get(0));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
-    
-    
-    
-
-
-    
-    
+   
     
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -3,10 +3,7 @@ package com.xintong.visualinspection.controller;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,11 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.bean.Menu;
 import com.xintong.visualinspection.err.BusinessException;
-import com.xintong.visualinspection.securityTools.RedisCacheUtil;
-import com.xintong.visualinspection.service.AuthService;
-import com.xintong.visualinspection.service.UserService;
+import com.xintong.visualinspection.service.MenuService;
 
 /**
  * 文件名：TestController
@@ -34,67 +29,35 @@ import com.xintong.visualinspection.service.UserService;
 public class MenuController extends BaseController {
 
     @Autowired
-    private UserService userService;
-    
-    @Autowired
-    private AuthService authService;
-    
-    @Autowired
-    private RedisCacheUtil redisCacheUtil;
-    
-    @Value("${jwt.header}")
-    private String tokenHeader;
-
-    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String login(@RequestBody User user){
-    	User u = authService.login(user.getUsername(), user.getPassword());
-        return returnSuccessResult("登陆成功", u);
-    }
-    
-   
-    
-    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String logout(){
-    	//获取用户名
-    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
-    	if(username!=null){
-    		redisCacheUtil.removeForUserName(username);
-    	}
-    	//返回成功
-    	return returnSuccessResult("退出成功");
-    }
-    
-    
-    
+    private MenuService menuService;
     
     
     /**
-     * 添加用户
+     * 添加菜单
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
     @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String addUser(@RequestBody User user) throws Exception{
-    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
-    	userService.insert(user);
+    @RequestMapping(value = "/addMenu",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addMenu(@RequestBody Menu menu) throws Exception{
+    	menuService.insert(menu);
     	return returnResult(0, "添加成功", null);
     }
     
     /**
-     * 修改用户
+     * 修改菜单
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
-    public String updateUser(@RequestBody User user,@PathVariable int userid){
+    @RequestMapping(value = "/updateMenu/{menuid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updateMenu(@RequestBody Menu menu,@PathVariable int menuid){
         try{
-        	user.setId(userid);
-        	userService.update(user);
+        	menu.setId(menuid);
+        	menuService.update(menu);
         	return super.returnResult(0, "修改成功", null);
         }catch(Exception e){
         	throw new BusinessException(20003);
@@ -102,17 +65,16 @@ public class MenuController extends BaseController {
     }
     
     /**
-     * 删除用户（软删除）
+     * 删除菜单（软删除）
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
-    public String deleteUser(@PathVariable Integer userid){
+    @RequestMapping(value = "/deleteMenu/{menuid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deleteMenu(@PathVariable Integer menuid){
         try{
-        	userService.delete((userid));
+        	menuService.delete((menuid));
         	return returnResult(0, "删除成功", null);
         }catch(Exception e){
         	throw new BusinessException(20002);
@@ -120,43 +82,47 @@ public class MenuController extends BaseController {
     }
     
     /**
-     * 获取所用用户
+     * 获取所有菜单
      * @param page
      * @param size
      * @return
      */
     @SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+    public String getAllMenu(@PathVariable Integer page,@PathVariable Integer size ){
         try{
         	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getAll();
-        	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	List<Menu> menus= menuService.getMenus(new Menu());
+        	return returnResult(0, "获取成功", new PageInfo(menus));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
-    
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+  
+    @RequestMapping(value = "/getMenuByParent/{pid}/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getMenuByParent(@PathVariable Integer pid,@PathVariable Integer page,@PathVariable Integer size){
         try{
         	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getUsers(user);
+        	Menu menu =new Menu();
+        	menu.setParentId(pid);
+        	List<Menu> menus= menuService.getMenus(menu);
         	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	return returnResult(0, "获取成功", new PageInfo(menus));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
     
-    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getUser(@PathVariable Integer userid){
+    @RequestMapping(value = "/getMenuById/{menuid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getMenuById(@PathVariable Integer menuid){
         try{
-            User u = userService.getOne(userid);
-        	return returnResult(0, "获取成功", u);
+        	
+        	Menu menu = new Menu();
+        	menu.setId(menuid);
+        	
+        	List<Menu> menus = menuService.getMenus(menu);
+        	if(menus==null||menus.size()<1 ) throw  new BusinessException(20001);
+        	return returnResult(0, "获取成功", menus.get(0));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/PermissionController.java

@@ -15,10 +15,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.err.BusinessException;
 import com.xintong.visualinspection.securityTools.RedisCacheUtil;
 import com.xintong.visualinspection.service.AuthService;
+import com.xintong.visualinspection.service.PermissionService;
 import com.xintong.visualinspection.service.UserService;
 
 /**
@@ -29,76 +31,38 @@ import com.xintong.visualinspection.service.UserService;
  * @author wenhongquan
  *
  */
-/**
- * @author wenhongquan
- *
- */
 @RestController
 @RequestMapping("/permission")
 public class PermissionController extends BaseController {
 
     @Autowired
-    private UserService userService;
-    
-    @Autowired
-    private AuthService authService;
-    
-    @Autowired
-    private RedisCacheUtil redisCacheUtil;
-    
-    @Value("${jwt.header}")
-    private String tokenHeader;
-
-    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String login(@RequestBody User user){
-    	User u = authService.login(user.getUsername(), user.getPassword());
-        return returnSuccessResult("登陆成功", u);
-    }
-    
-   
-    
-    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String logout(){
-    	//获取用户名
-    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
-    	if(username!=null){
-    		redisCacheUtil.removeForUserName(username);
-    	}
-    	//返回成功
-    	return returnSuccessResult("退出成功");
-    }
-    
-    
-    
-    
+    private PermissionService permissionService;
     
     /**
-     * 添加用户
+     * 添加权限
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String addUser(@RequestBody User user) throws Exception{
-    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
-    	userService.insert(user);
+    @RequestMapping(value = "/addPermission",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String addPermission(@RequestBody Permission permission) throws Exception{
+    	permissionService.insert(permission);
     	return returnResult(0, "添加成功", null);
     }
     
     /**
-     * 修改用户
+     * 修改权限
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
-    public String updateUser(@RequestBody User user,@PathVariable int userid){
+    @RequestMapping(value = "/updatePermission/{permissionid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
+    public String updatePermission(@RequestBody Permission permission,@PathVariable int permissionid){
         try{
-        	user.setId(userid);
-        	userService.update(user);
+        	permission.setId(permissionid);
+        	permissionService.update(permission);
         	return super.returnResult(0, "修改成功", null);
         }catch(Exception e){
         	throw new BusinessException(20003);
@@ -106,17 +70,17 @@ public class PermissionController extends BaseController {
     }
     
     /**
-     * 删除用户（软删除）
+     * 删除权限（软删除）
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
     @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
-    public String deleteUser(@PathVariable Integer userid){
+    @RequestMapping(value = "/deletePermission/{permissionid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
+    public String deletePermission(@PathVariable Integer permissionid){
         try{
-        	userService.delete((userid));
+        	permissionService.delete((permissionid));
         	return returnResult(0, "删除成功", null);
         }catch(Exception e){
         	throw new BusinessException(20002);
@@ -124,53 +88,40 @@ public class PermissionController extends BaseController {
     }
     
     /**
-     * 获取所用用户
+     * 获取所用权限
      * @param page
      * @param size
      * @return
      */
     @SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
+    public String getAllPermission(@PathVariable Integer page,@PathVariable Integer size ){
         try{
         	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getAll();
+        	List<Permission> permissions= permissionService.getPermissions(new  Permission());
         	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	return returnResult(0, "获取成功", new PageInfo(permissions));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
     
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+    
+    //TODO 待完成
+    @RequestMapping(value = "/getPermissionByRole/{roleid}/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getPermissionByRole(@PathVariable Integer roleid,@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
         try{
         	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getUsers(user);
         	
-        	return returnResult(0, "获取成功", new PageInfo(users));
-        }catch(Exception e){
-        	throw new BusinessException(20001);
-        }
-    }
-    
-    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getUser(@PathVariable Integer userid){
-        try{
-            User u = userService.getOne(userid);
-        	return returnResult(0, "获取成功", u);
+        	List<Permission> permissions= permissionService.getPermissions(new  Permission());
+        	
+        	return returnResult(0, "获取成功", new PageInfo(permissions));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }
     }
     
-    
-    
-
-
-    
+   
     
     
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/RoleController.java

@@ -3,10 +3,8 @@ package com.xintong.visualinspection.controller;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,11 +13,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.Role;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.err.BusinessException;
-import com.xintong.visualinspection.securityTools.RedisCacheUtil;
-import com.xintong.visualinspection.service.AuthService;
-import com.xintong.visualinspection.service.UserService;
+import com.xintong.visualinspection.service.RoleService;
 
 /**
  * 文件名：TestController
@@ -29,148 +26,113 @@ import com.xintong.visualinspection.service.UserService;
  * @author wenhongquan
  *
  */
-/**
- * @author wenhongquan
- *
- */
 @RestController
 @RequestMapping("/role")
 public class RoleController extends BaseController {
 
-    @Autowired
-    private UserService userService;
-    
-    @Autowired
-    private AuthService authService;
-    
-    @Autowired
-    private RedisCacheUtil redisCacheUtil;
-    
-    @Value("${jwt.header}")
-    private String tokenHeader;
-
-    @RequestMapping(value = "/auth/login",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String login(@RequestBody User user){
-    	User u = authService.login(user.getUsername(), user.getPassword());
-        return returnSuccessResult("登陆成功", u);
-    }
-    
-   
-    
-    @RequestMapping(value = "/logout",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String logout(){
-    	//获取用户名
-    	String username = SecurityContextHolder.getContext().getAuthentication().getName();
-    	if(username!=null){
-    		redisCacheUtil.removeForUserName(username);
-    	}
-    	//返回成功
-    	return returnSuccessResult("退出成功");
-    }
-    
-    
-    
-    
-    
-    /**
-     * 添加用户
-     * @return
-     * String
-     * @exception
-     * @since  1.0.0
-     */
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String addUser(@RequestBody User user) throws Exception{
-    	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
-    	userService.insert(user);
-    	return returnResult(0, "添加成功", null);
-    }
-    
-    /**
-     * 修改用户
-     * @return
-     * String
-     * @exception
-     * @since  1.0.0
-     */
-    @RequestMapping(value = "/updateUser/{userid}",method=RequestMethod.PUT,produces="application/json;charset=UTF-8")
-    public String updateUser(@RequestBody User user,@PathVariable int userid){
-        try{
-        	user.setId(userid);
-        	userService.update(user);
-        	return super.returnResult(0, "修改成功", null);
-        }catch(Exception e){
-        	throw new BusinessException(20003);
-        }
-    }
-    
-    /**
-     * 删除用户（软删除）
-     * @return
-     * String
-     * @exception
-     * @since  1.0.0
-     */
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
-    public String deleteUser(@PathVariable Integer userid){
-        try{
-        	userService.delete((userid));
-        	return returnResult(0, "删除成功", null);
-        }catch(Exception e){
-        	throw new BusinessException(20002);
-        }
-    }
-    
-    /**
-     * 获取所用用户
-     * @param page
-     * @param size
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
-        try{
-        	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getAll();
-        	
-        	return returnResult(0, "获取成功", new PageInfo(users));
-        }catch(Exception e){
-        	throw new BusinessException(20001);
-        }
-    }
-    
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
-        try{
-        	PageHelper.startPage(page, size); 
-        	List<User> users= userService.getUsers(user);
-        	
-        	return returnResult(0, "获取成功", new PageInfo(users));
-        }catch(Exception e){
-        	throw new BusinessException(20001);
-        }
-    }
-    
-    @RequestMapping(value = "/getUserById/{userid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getUser(@PathVariable Integer userid){
-        try{
-            User u = userService.getOne(userid);
-        	return returnResult(0, "获取成功", u);
-        }catch(Exception e){
-        	throw new BusinessException(20001);
-        }
-    }
-    
-    
-    
-
-
-    
-    
-    
+	@Autowired
+	private RoleService roleService;
+
+	/**
+	 * 添加角色
+	 * 
+	 * @return String
+	 * @exception @since
+	 *                1.0.0
+	 */
+	@RequestMapping(value = "/addRole", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+	public String addRole(@RequestBody Role role) throws Exception {
+		roleService.insert(role);
+		return returnResult(0, "添加成功", null);
+	}
+
+	/**
+	 * 修改角色
+	 * 
+	 * @return String
+	 * @exception @since
+	 *                1.0.0
+	 */
+	@RequestMapping(value = "/updateRole/{roleid}", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
+	public String updateRole(@RequestBody Role role, @PathVariable int roleid) {
+		try {
+			role.setId(roleid);
+			roleService.update(role);
+			return super.returnResult(0, "修改成功", null);
+		} catch (Exception e) {
+			throw new BusinessException(20003);
+		}
+	}
+
+	/**
+	 * 删除角色（软删除）
+	 * 
+	 * @return String
+	 * @exception @since
+	 *                1.0.0
+	 */
+	@RequestMapping(value = "/deleteRole/{roleid}", method = RequestMethod.DELETE, produces = "application/json;charset=UTF-8")
+	public String deleteRole(@PathVariable Integer roleid) {
+		try {
+			roleService.delete((roleid));
+			return returnResult(0, "删除成功", null);
+		} catch (Exception e) {
+			throw new BusinessException(20002);
+		}
+	}
+
+	/**
+	 * 获取所有角色
+	 * 
+	 * @param page
+	 * @param size
+	 * @return
+	 */
+	@RequestMapping(value = "/get/all/{page}/{size}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+	public String getAllRole(@PathVariable Integer page, @PathVariable Integer size) {
+		try {
+			PageHelper.startPage(page, size);
+			List<Role> roles = roleService.getRoles(new Role());
+
+			return returnResult(0, "获取成功", new PageInfo(roles));
+		} catch (Exception e) {
+			throw new BusinessException(20001);
+		}
+	}
+
+	// TODO 待完成
+	@RequestMapping(value = "/roleBindPermission/{roleId}/{permissions}", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
+	public String roleBindPermission(@PathVariable Integer roleId, @PathVariable String permissions) {
+
+		return returnResult(0, "获取成功", null);
+	}
+
+	// TODO 待完成
+	@RequestMapping(value = "/roleBindUser/{roleId}/{users}", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
+	public String roleBindUser(@PathVariable Integer roleId, @PathVariable String users) {
+
+		return returnResult(0, "获取成功", null);
+	}
+
+	// TODO 待完成
+	@RequestMapping(value = "/getRoleByDept/{deptId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+	public String getRoleByDept(@PathVariable Integer deptId) {
+
+		return returnResult(0, "获取成功", null);
+	}
+
+	// TODO 待完成
+	@RequestMapping(value = "/getRoleByUser/{userId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+	public String getRoleByUser(@PathVariable Integer userId) {
+
+		return returnResult(0, "获取成功", null);
+	}
+
+	// TODO 待完成
+	@RequestMapping(value = "/getRoleByPosition/{positionId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+	public String getRoleByPosition(@PathVariable Integer positionId) {
+
+		return returnResult(0, "获取成功", null);
+	}
+
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/RoleServiceImpl.java

@@ -1,23 +1,13 @@
 package com.xintong.visualinspection.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import com.xintong.visualinspection.bean.Permission;
 import com.xintong.visualinspection.bean.Role;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.dao.cluster.UserInfoDao;
-import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.RoleDao;
-import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.RoleService;