user/role/tright 5.15

个体用户还需要增加Token
准备企业用户注册
user/role/tright修改完

readme.md

@@ -147,7 +147,7 @@ StringHelper.md5(from)
 # 如下代码需要调换顺序
 ```java 
 List<RoleVo> roleVoList = roleServiceImpl.getRoleVoList();
-List<RoleDto> roleDtoList = new ArrayList(roleVoList.size());     // roleVoList有可能为null
+List<RoleDto> webRoleReqVoList = new ArrayList(roleVoList.size());     // roleVoList有可能为null
 if (roleVoList == null || roleVoList.size() == 0){
     return new Result(0,"暂无角色信息",null);
 }

src/main/java/com/pangding/web/authority/controller/AuthorityController.java

@@ -4,6 +4,11 @@ package com.pangding.web.authority.controller;
 import com.pangding.web.authority.currency.Result;
 import com.pangding.web.authority.service.AuthorityService;
 import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
+import com.pangding.web.authority.vo.reqvo.WebAuthorityReqVo;
+import com.pangding.web.authority.vo.reqvo.WebAuthorityResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -26,11 +31,9 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object saveAuthority(@RequestBody AuthorityVo authorityVo){
-        authorityServiceImpl.checkValid(authorityVo);
+    public ResponseResult saveAuthority(@RequestBody AuthorityVo authorityVo){
         authorityServiceImpl.save(authorityVo);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+        return new ResponseResult();
     }
 
     /**
@@ -39,11 +42,9 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object updateAuthority(@RequestBody AuthorityVo authorityVo){
-        authorityServiceImpl.checkValid(authorityVo);
+    public ResponseResult updateAuthority(@RequestBody AuthorityVo authorityVo){
         authorityServiceImpl.update(authorityVo);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+        return new ResponseResult();
     }
 
     /**
@@ -51,12 +52,8 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object listAuthoritys(){
-        List<AuthorityVo> list = authorityServiceImpl.listAllAuthority();
-        if (list == null){
-            return new Result(4001,"暂无权限，请先添加",null);
-        }
-        return new Result(0,"SUCCESS",list);
+    public ResponseResult<PageSizeData<WebAuthorityResVo>> listAuthoritys(ListAuthorityReqVo reqVo){
+        return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
     }
 
     /**
@@ -64,38 +61,29 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/firstLevel", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object parentAuthoritys(){
-        List<AuthorityVo> list = authorityServiceImpl.listLevel1();
-        if (list == null){
-            return new Result(4001,"暂无一级权限，请先添加",null);
-        }
-        return new Result(0,"SUCCESS",list);
+    public ResponseResult<PageSizeData<WebAuthorityResVo>> parentAuthoritys(ListAuthorityReqVo reqVo){
+        return ResponseResult.result(authorityServiceImpl.getWebAuthorityResVoList(reqVo));
     }
 
     /**
      * 根据ID查询权限
-     * @param id
+     * @param reqVo
      * @return
      */
-    @RequestMapping(value = "/role/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object authority(@PathVariable String id){
-        AuthorityVo authorityVo = authorityServiceImpl.getAuthorityById(id);
-        if (authorityVo == null){
-            return new Result(4001,"未查询到该权限",null);
-        }
-        return new Result(0,"SUCCESS",authorityVo);
+    @RequestMapping(value = "/role", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<AuthorityVo> authority(@RequestBody WebAuthorityReqVo reqVo){
+        return ResponseResult.result(authorityServiceImpl.getAuthorityById(reqVo));
     }
 
     /**
      * 删除权限
-     * @param id
+     * @param reqVo
      * @return
      */
-    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object delete(@PathVariable String id){
-
-        authorityServiceImpl.deleteAuthorityById(id);
-        return new Result(0,"SUCCESS",null);
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult delete(@RequestBody WebAuthorityReqVo reqVo){
+        authorityServiceImpl.deleteAuthorityById(reqVo);
+        return new ResponseResult();
 
     }
 }

src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java

@@ -7,7 +7,6 @@ import com.pangding.web.authority.dto.RegisterIndividualDto;
 import com.pangding.web.authority.dto.RegisterUserDto;
 import com.pangding.web.authority.service.MobileRegisterService;
 import com.pangding.web.authority.service.UserService;
-import com.pangding.web.authority.utils.Md5AndSalt;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.MobileLoginInfo;
 import com.pangding.web.authority.vo.UserVo;

src/main/java/com/pangding/web/authority/controller/MobileRegisterController.java

@@ -6,7 +6,6 @@ import com.pangding.web.authority.dto.RegisterUserDto;
 import com.pangding.web.authority.cloudvo.MobileRegisterUserReturnVo;
 import com.pangding.web.authority.service.MobileRegisterService;
 import com.pangding.web.authority.service.UserService;
-import com.pangding.web.authority.utils.Md5AndSalt;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.MobileLoginInfo;
 import com.pangding.web.authority.vo.UserVo;

src/main/java/com/pangding/web/authority/controller/RoleController.java

 package com.pangding.web.authority.controller;
 
 
-import com.pangding.web.authority.currency.Result;
-import com.pangding.web.authority.dto.RoleDto;
+import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
+import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.service.RoleService;
-import com.pangding.web.authority.vo.RoleVo;
-import com.yanzuoguang.util.helper.StringHelper;
+import com.pangding.web.authority.vo.reqvo.WebRoleResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author zhangjinyao
@@ -25,30 +24,24 @@ public class RoleController {
 
     /**
      * 新增角色
-     * @param roleDto
+     * @param webRoleReqVo
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object saveRole(@RequestBody RoleDto roleDto){
-        RoleVo roleVo = roleDto;
-        roleServiceImpl.checkNameExist(roleVo);
-        roleDto.setId(StringHelper.getNewID());
-        roleServiceImpl.saveRole(roleDto);
-        return new Result(0,"SUCCESS",null);
+    public ResponseResult saveRole(@RequestBody WebRoleReqVo webRoleReqVo){
+        roleServiceImpl.saveRole(webRoleReqVo);
+        return new ResponseResult();
     }
 
     /**
      * 修改角色信息
-     * @param roleDto
+     * @param webRoleReqVo
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object updateRole(@RequestBody RoleDto roleDto){
-        RoleVo roleVo = roleDto;
-        roleServiceImpl.checkNameExist(roleVo);
-        roleServiceImpl.updateRole(roleDto);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+    public ResponseResult updateRole(@RequestBody WebRoleReqVo webRoleReqVo){
+        roleServiceImpl.updateRole(webRoleReqVo);
+        return new ResponseResult();
     }
 
     /**
@@ -56,48 +49,18 @@ public class RoleController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object listRoles(){
-        List<RoleVo> roleVoList = roleServiceImpl.getRoleVoList();
-        List<RoleDto> roleDtoList = new ArrayList(roleVoList.size());
-        if (roleVoList == null || roleVoList.size() == 0){
-            return new Result(0,"暂无角色信息",null);
+    public ResponseResult<PageSizeData<WebRoleResVo>> listRoles(@RequestBody ListRoleReqVo req){
+        return ResponseResult.result(roleServiceImpl.getWebRoleResVoList(req));
     }
-        for (RoleVo roleVo:roleVoList) {
-            List<String> authorityIdList = roleServiceImpl.getAuthorityIdListByRoleId(roleVo.getId());
-            List<String> authorityNameList = new ArrayList(authorityIdList.size());
-            for (String authorityId:authorityIdList) {
-                String authorityName = roleServiceImpl.getAuthorityNameByAuthorityId(authorityId);
-                authorityNameList.add(authorityName);
-            }
-            RoleDto roleDto = roleServiceImpl.makeRoleDto(roleVo,authorityIdList,authorityNameList);
-            roleDtoList.add(roleDto);
-        }
-        Result result = new Result(0,"SUCCESS",roleDtoList);
-        return result;
-    }
-
-
 
     /**
      * 根据ID查询角色
      * @param
      * @return
      */
-    @RequestMapping(value = "/role/{roleId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object getRoleById(@PathVariable String roleId){
-        RoleVo roleVo = roleServiceImpl.getRoleById(roleId);
-        if(roleVo == null){
-            return new Result(4001,"未查询到该角色",null);
-        }
-        List<String> authorityIdList = roleServiceImpl.getAuthorityIdListByRoleId(roleId);
-        List<String> authorityNameList = new ArrayList(authorityIdList.size());
-        for (String authorityId:authorityIdList) {
-            String authorityName = roleServiceImpl.getAuthorityNameByAuthorityId(authorityId);
-            authorityNameList.add(authorityName);
-        }
-        RoleDto roleDto = roleServiceImpl.makeRoleDto(roleVo,authorityIdList,authorityNameList);
-        Result result = new Result(0,"SUCCESS",roleDto);
-        return result;
+    @RequestMapping(value = "/role", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<WebRoleResVo> getRoleById(@RequestBody WebRoleReqVo webRoleReqVo){
+        return ResponseResult.result(roleServiceImpl.getRoleById(webRoleReqVo));
     }
 
     /**
@@ -105,11 +68,9 @@ public class RoleController {
      * @param
      * @return
      */
-    @RequestMapping(value = "/delete/{roleId}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object delete(@PathVariable String roleId){
-        RoleVo roleVo = roleServiceImpl.getRoleById(roleId);
-        roleServiceImpl.deleteRole(roleVo);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult delete(@RequestBody WebRoleReqVo webRoleReqVo){
+        roleServiceImpl.delete(webRoleReqVo);
+        return new ResponseResult();
     }
 }

src/main/java/com/pangding/web/authority/controller/UserController.java

@@ -2,12 +2,12 @@ package com.pangding.web.authority.controller;
 
 
 import com.pangding.web.authority.currency.Result;
-import com.pangding.web.authority.dto.UserDto;
-import com.pangding.web.authority.reqvo.GetRoleByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserRoleListByUserIdReqVo;
+import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.*;
 import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -27,24 +27,13 @@ public class UserController {
 
     /**
      * 新增用户
-     * @param userDto
+     * @param webUserReqVo
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object saveUser(@RequestBody UserDto userDto){
-
-        if (!userServiceImpl.isValid(userDto.getAccount())){
-            return new Result(4001,"用户名由字母与数字组成，且不能为纯数字",userDto);
-        }
-        userServiceImpl.checkAccount(userDto);
-        userServiceImpl.checkPhone(userDto);
-        userDto.setRemark(userDto.getPassword());
-        String saltPassword = userServiceImpl.passwordEncoder(userDto.getPassword());
-        userDto.setPassword(saltPassword);
-        userDto.setId(StringHelper.getNewID());
-        userServiceImpl.saveUser(userDto);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+    public ResponseResult saveUser(@RequestBody WebUserReqVo webUserReqVo){
+        userServiceImpl.saveUser(webUserReqVo);
+        return new ResponseResult();
     }
 
     /**
@@ -53,48 +42,20 @@ public class UserController {
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object updateUser(@RequestBody UserDto userDto){
-        userServiceImpl.checkAccount(userDto);
-        userServiceImpl.checkPhone(userDto);
-        userDto.setRemark(userDto.getPassword());
-        userDto.setPassword(userServiceImpl.passwordEncoder(userDto.getPassword()));
-        userServiceImpl.updateUser(userDto);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+    public ResponseResult updateUser(@RequestBody WebUserReqVo webUserReqVo){
+
+
+        userServiceImpl.updateUser(webUserReqVo);
+        return new ResponseResult();
     }
 
     /**
      * 查询用户列表
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object listUsers(){
-
-        List<UserVo> userVoList = userServiceImpl.listUserVo();
-        List<UserDto> userDtoList = new ArrayList(userVoList.size());
-
-        for (int index1 = 0;index1 < userVoList.size();index1++){
-            UserVo userVo = userVoList.get(index1);
-            GetUserRoleListByUserIdReqVo reqVo = new GetUserRoleListByUserIdReqVo();
-            reqVo.setUserId(userVo.getId());
-            List<UserRoleRelation> userRole = userServiceImpl.listUserRoleListByUserId(reqVo);
-            List<String> roleIdList = new ArrayList(userRole.size());
-            for (UserRoleRelation userRoleRelation:userRole) {
-                roleIdList.add(userRoleRelation.getRoleId());
-            }
-            List<String> roleNameList = new ArrayList(roleIdList.size());
-            for (int index2 = 0;index2 < roleIdList.size();index2++){
-                GetRoleByRoleIdReqVo getRoleByRoleIdReqVo = new GetRoleByRoleIdReqVo();
-                getRoleByRoleIdReqVo.setId(roleIdList.get(index2));
-                RoleVo role = userServiceImpl.getRoleByRoleId(getRoleByRoleIdReqVo);
-                roleNameList.add(role.getName());
-            }
-            UserDto userDto = userServiceImpl.makeUserDto(userVo,roleIdList,roleNameList);
-            userDtoList.add(userDto);
-        }
-
-        Result result = new Result(0,"SUCCESS",userDtoList);
-        return result;
+    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<WebUserResVo>> listUsers(ListUserReqVo reqVo){
+        return ResponseResult.result(userServiceImpl.getWebUserResVoList(reqVo));
     }
 
     /**
@@ -102,29 +63,9 @@ public class UserController {
      * @param //id
      * @return
      */
-    @RequestMapping(value = "/user/{userId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object user(@PathVariable String userId){
-
-        UserVo userVo = userServiceImpl.getUserById(userId);
-        if(userVo == null){
-            return new Result(4001,"该用户不存在",null);
-        }
-        GetUserRoleListByUserIdReqVo reqVo = new GetUserRoleListByUserIdReqVo();
-        reqVo.setUserId(userVo.getId());
-        List<UserRoleRelation> userRole = userServiceImpl.listUserRoleListByUserId(reqVo);
-        List<String> roleIdList = new ArrayList(userRole.size());
-        for (UserRoleRelation userRoleRelation:userRole) {
-            roleIdList.add(userRoleRelation.getRoleId());
-        }
-        List<String> roleNameList = new ArrayList(roleIdList.size());
-        for (int index2 = 0;index2 < roleIdList.size();index2++){
-            GetRoleByRoleIdReqVo getRoleByRoleIdReqVo = new GetRoleByRoleIdReqVo();
-            getRoleByRoleIdReqVo.setId(roleIdList.get(index2));
-            RoleVo role = userServiceImpl.getRoleByRoleId(getRoleByRoleIdReqVo);
-            roleNameList.add(role.getName());
-        }
-        UserDto userDto = userServiceImpl.makeUserDto(userVo,roleIdList,roleNameList);
-        return new Result(0,"SUCCESS",userDto);
+    @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<WebUserResVo> user(@RequestBody WebUserReqVo webUserReqVo){
+        return ResponseResult.result(userServiceImpl.getUserById(webUserReqVo.getId()));
     }
 
 }

src/main/java/com/pangding/web/authority/dao/AuthorityDao.java

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.reqvo.GetAuthorityByIdReqVo;
+import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
 import com.pangding.web.authority.reqvo.ListLevel1ReqVo;
 import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -22,11 +24,14 @@ public interface AuthorityDao extends BaseDao {
     /**
      * 根据主键获取authorityVo对象
      *
-     * @param getAuthorityByIdReqVo 主键
+     * @param authorityGetReqVo 主键
      * @return authorityVo对象
      */
-    AuthorityVo getAuthorityById(GetAuthorityByIdReqVo getAuthorityByIdReqVo);
+    AuthorityVo getAuthority(AuthorityGetReqVo authorityGetReqVo);
 
+    PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo);
+
+    List<AuthorityVo> getAuthoritys(AuthorityGetReqVo reqVo);
     /**
      * 获取authorityVo对象列表
      *

src/main/java/com/pangding/web/authority/dao/RoleAuthorityDao.java

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.reqvo.GetRoleAuthorityListByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetRoleAuthorityListByAuthorityIdReqVo;
-import com.pangding.web.authority.vo.RoleAuthorityRelation;
+import com.pangding.web.authority.vo.reqvo.RoleAuthorityGetReqVo;
+import com.pangding.web.authority.vo.RoleAuthorityVo;
 import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;
@@ -11,19 +10,12 @@ import java.util.List;
  * @author zhangjinyao
  */
 public interface RoleAuthorityDao extends BaseDao {
-    /**
-     * 通过角色id获取角色权限关系表对象列表
-     *
-     * @param getRoleAuthorityListByRoleIdReqVo 角色id
-     * @return 角色权限关系表主键列表
-     */
-    List<RoleAuthorityRelation> getRoleAuthorityListByRoleId(GetRoleAuthorityListByRoleIdReqVo getRoleAuthorityListByRoleIdReqVo);
 
     /**
      * 通过权限id获取角色权限关系表主键列表
      *
-     * @param getRoleAuthorityListByAuthorityIdReqVo 封装权限id
+     * @param roleAuthorityGetReqVo 封装权限id
      * @return 角色权限关系表主键列表
      */
-    List<RoleAuthorityRelation> getRoleAuthorityListByAuthorityId(GetRoleAuthorityListByAuthorityIdReqVo getRoleAuthorityListByAuthorityIdReqVo);
+    List<RoleAuthorityVo> getRoleAuthorityList(RoleAuthorityGetReqVo roleAuthorityGetReqVo);
 }

src/main/java/com/pangding/web/authority/dao/RoleDao.java

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.reqvo.GetRoleByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetRoleByRoleNameReqVo;
+import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
+import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
 import com.pangding.web.authority.vo.RoleVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -15,10 +16,10 @@ public interface RoleDao extends BaseDao {
     /**
      * 通过主键id获取RoleVo对象
      *
-     * @param getRoleByRoleIdReqVo getRoleByRoleIdReqVo对象
+     * @param roleGetReqVo getRoleByRoleIdReqVo对象
      * @return  RoleVo对象
      */
-    RoleVo getRoleById(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo);
+    RoleVo getRoleById(RoleGetReqVo roleGetReqVo);
 
     /**
      * 通过角色名查询RoleVo对象
@@ -26,7 +27,7 @@ public interface RoleDao extends BaseDao {
      * @param getRoleByRoleNameReqVo 角色名
      * @return RoleVo对象
      */
-    RoleVo getRoleByRoleName(GetRoleByRoleNameReqVo getRoleByRoleNameReqVo);
+    RoleVo getRoleByRoleName(RoleGetReqVo getRoleByRoleNameReqVo);
 
     /**
      * 检查用户名是否已存在
@@ -43,14 +44,14 @@ public interface RoleDao extends BaseDao {
      *
      * @return RoleVo对象列表
      */
-    List<RoleVo> getRoleVoList();
+    PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
 
     /**
      * 通过角色id获取子角色列表
      *
-     * @param getRoleByRoleIdReqVo 封装角色id
+     * @param roleGetReqVo 封装角色id
      * @return 角色列表
      */
-    List<RoleVo> getChild(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo);
+    List<RoleVo> getChild(RoleGetReqVo roleGetReqVo);
 
 }

src/main/java/com/pangding/web/authority/dao/UserDao.java

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.reqvo.GetUserByCompanyIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserByIdReqVo;
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
+import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -28,20 +29,14 @@ public interface UserDao extends BaseDao {
      */
     void checkPhone(UserVo phone);
 
-    /**
-     * 获取UserVo对象列表
-     *
-     * @return UserVo对象列表
-     */
-    List<UserVo> listUserVo();
 
     /**
      * 通过用户id查询UserVo对象
      *
-     * @param id 用户id
+     * @param reqVo 用户id
      * @return UserVo对象
      */
-    UserVo getUserById(GetUserByIdReqVo id);
+    UserVo getUser(UserGetReqVo reqVo);
 
     /**
      * 根据公司id获取UserVo对象
@@ -49,5 +44,7 @@ public interface UserDao extends BaseDao {
      * @param companyId GetUserByCompanyIdReqVo请求对象，封装公司id
      * @return UserVo对象
      */
-    UserVo getUserByCompanyId(GetUserByCompanyIdReqVo companyId);
+    UserVo getUserByCompanyId(UserGetReqVo companyId);
+
+    PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/dao/UserRoleDao.java

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.reqvo.GetUserRoleListByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserRoleListByUserIdReqVo;
-import com.pangding.web.authority.vo.UserRoleRelation;
+import com.pangding.web.authority.vo.reqvo.UserRoleGetReqVo;
+import com.pangding.web.authority.vo.UserRoleVo;
 import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;
@@ -15,16 +14,9 @@ public interface UserRoleDao extends BaseDao {
     /**
      * 通过userId查询用户角色对应关系列表
      *
-     * @param userId 用户id
+     * @param reqVo 用户id
      * @return user和role对应关系对象列表
      */
-    List<UserRoleRelation> getUserRoleListByUserId(GetUserRoleListByUserIdReqVo userId);
+    List<UserRoleVo> getUserRoleList(UserRoleGetReqVo reqVo);
 
-    /**
-     * 通过角色id获取用户和角色的对应关系对象列表
-     *
-     * @param roleId 封装角色id
-     * @return 用户和角色的对应关系对象列表
-     */
-    List<UserRoleRelation> getUserRoleListByRoleId(GetUserRoleListByRoleIdReqVo roleId);
 }

src/main/java/com/pangding/web/authority/dao/impl/AuthorityDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.AuthorityDao;
-import com.pangding.web.authority.reqvo.GetAuthorityByIdReqVo;
+import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
 import com.pangding.web.authority.reqvo.ListLevel1ReqVo;
 import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -25,7 +27,9 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
 
         table.add(SELECT,"select * from pd_authority where 1=1")
                 .add("exist","and pid = '' ")
-                .add("id","and pid = ?");
+                .add("id","and pid = ? ")
+                .add("pid","and pid = ? ")
+                .add("exist","and pid ? ''");
     }
 
     @Override
@@ -34,8 +38,18 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
     }
 
     @Override
-    public AuthorityVo getAuthorityById(GetAuthorityByIdReqVo getAuthorityByIdReqVo) {
-        return this.load(getAuthorityByIdReqVo, AuthorityVo.class);
+    public AuthorityVo getAuthority(AuthorityGetReqVo authorityGetReqVo) {
+        return this.load(authorityGetReqVo, AuthorityVo.class);
+    }
+
+    @Override
+    public PageSizeData<AuthorityVo> getAuthorityList(ListAuthorityReqVo reqVo) {
+        return this.queryPage(AuthorityVo.class,reqVo,SELECT,reqVo);
+    }
+
+    @Override
+    public List<AuthorityVo> getAuthoritys(AuthorityGetReqVo reqVo) {
+        return this.query(AuthorityVo.class,SELECT,reqVo);
     }
 
     @Override

src/main/java/com/pangding/web/authority/dao/impl/RoleAuthorityDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.RoleAuthorityDao;
-import com.pangding.web.authority.reqvo.GetRoleAuthorityListByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetRoleAuthorityListByAuthorityIdReqVo;
-import com.pangding.web.authority.vo.RoleAuthorityRelation;
+import com.pangding.web.authority.vo.reqvo.RoleAuthorityGetReqVo;
+import com.pangding.web.authority.vo.RoleAuthorityVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
@@ -20,7 +19,7 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
     @Override
     protected void init() {
 
-        register(RoleAuthorityRelation.class);
+        register(RoleAuthorityVo.class);
 
         table.add(SELECT,"select id,role_id,authority_id from pd_role_authority where 1=1 ")
                 .add("roleId","and role_id = ?")
@@ -29,13 +28,7 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
     }
 
     @Override
-    public List<RoleAuthorityRelation> getRoleAuthorityListByRoleId(GetRoleAuthorityListByRoleIdReqVo getRoleAuthorityListByRoleIdReqVo) {
-
-        return this.query(RoleAuthorityRelation.class,SELECT,getRoleAuthorityListByRoleIdReqVo);
-    }
-
-    @Override
-    public List<RoleAuthorityRelation> getRoleAuthorityListByAuthorityId(GetRoleAuthorityListByAuthorityIdReqVo getRoleAuthorityListByAuthorityIdReqVo) {
-        return this.query(RoleAuthorityRelation.class,SELECT,getRoleAuthorityListByAuthorityIdReqVo);
+    public List<RoleAuthorityVo> getRoleAuthorityList(RoleAuthorityGetReqVo roleAuthorityGetReqVo) {
+        return this.query(RoleAuthorityVo.class,SELECT, roleAuthorityGetReqVo);
     }
 }

src/main/java/com/pangding/web/authority/dao/impl/RoleDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.RoleDao;
-import com.pangding.web.authority.reqvo.GetRoleByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetRoleByRoleNameReqVo;
+import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
+import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
 import com.pangding.web.authority.vo.RoleVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -31,12 +32,12 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
     }
 
     @Override
-    public RoleVo getRoleById(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo) {
-        return this.load(getRoleByRoleIdReqVo,RoleVo.class);
+    public RoleVo getRoleById(RoleGetReqVo roleGetReqVo) {
+        return this.load(roleGetReqVo,RoleVo.class);
     }
 
     @Override
-    public RoleVo getRoleByRoleName(GetRoleByRoleNameReqVo getRoleByRoleNameReqVo) {
+    public RoleVo getRoleByRoleName(RoleGetReqVo getRoleByRoleNameReqVo) {
         return this.load(getRoleByRoleNameReqVo, RoleVo.class);
     }
 
@@ -46,12 +47,13 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
     }
 
     @Override
-    public List<RoleVo> getRoleVoList() {
-        return this.query(RoleVo.class,SELECT,null);
+    public PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req) {
+
+        return this.queryPage(RoleVo.class,req,SELECT,req);
     }
 
     @Override
-    public List<RoleVo> getChild(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo) {
-        return this.query(RoleVo.class,SELECT,getRoleByRoleIdReqVo);
+    public List<RoleVo> getChild(RoleGetReqVo roleGetReqVo) {
+        return this.query(RoleVo.class,SELECT, roleGetReqVo);
     }
 }

src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.UserDao;
-import com.pangding.web.authority.reqvo.GetUserByCompanyIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserByIdReqVo;
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
+import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -43,19 +44,17 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     }
 
     @Override
-    public List<UserVo> listUserVo() {
-
-        return this.query(UserVo.class,SELECT,null);
-
+    public UserVo getUser(UserGetReqVo reqVo) {
+        return this.load(reqVo,UserVo.class);
     }
 
     @Override
-    public UserVo getUserById(GetUserByIdReqVo id) {
-        return this.load(id,UserVo.class);
+    public UserVo getUserByCompanyId(UserGetReqVo companyId) {
+        return this.load(companyId,UserVo.class);
     }
 
     @Override
-    public UserVo getUserByCompanyId(GetUserByCompanyIdReqVo companyId) {
-        return this.load(companyId,UserVo.class);
+    public PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo) {
+        return this.queryPage(UserVo.class,reqVo,SELECT,reqVo);
     }
 }

src/main/java/com/pangding/web/authority/dao/impl/UserRoleDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.UserRoleDao;
-import com.pangding.web.authority.reqvo.GetUserRoleListByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserRoleListByUserIdReqVo;
-import com.pangding.web.authority.vo.UserRoleRelation;
+import com.pangding.web.authority.vo.reqvo.UserRoleGetReqVo;
+import com.pangding.web.authority.vo.UserRoleVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
@@ -20,7 +19,7 @@ public class UserRoleDaoImpl extends BaseDaoImpl implements UserRoleDao {
     @Override
     protected void init() {
 
-        register(UserRoleRelation.class);
+        register(UserRoleVo.class);
 
         table.add(GET_USER_ROLE_LIST,"select * from pd_user_role where 1=1 ")
                 .add("userId","and user_id = ?")
@@ -29,12 +28,8 @@ public class UserRoleDaoImpl extends BaseDaoImpl implements UserRoleDao {
     }
 
     @Override
-    public List<UserRoleRelation> getUserRoleListByUserId(GetUserRoleListByUserIdReqVo userId) {
-        return this.query(UserRoleRelation.class,GET_USER_ROLE_LIST,userId);
+    public List<UserRoleVo> getUserRoleList(UserRoleGetReqVo reqVo) {
+        return this.query(UserRoleVo.class,GET_USER_ROLE_LIST,reqVo);
     }
 
-    @Override
-    public List<UserRoleRelation> getUserRoleListByRoleId(GetUserRoleListByRoleIdReqVo roleId) {
-        return this.query(UserRoleRelation.class,GET_USER_ROLE_LIST,roleId);
-    }
 }

src/main/java/com/pangding/web/authority/reqvo/GetRoleAuthorityListByRoleIdReqVo.java

-package com.pangding.web.authority.reqvo;
-
-import com.yanzuoguang.util.vo.BaseVo;
-
-import java.io.Serializable;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/11 14:38
- */
-public class GetRoleAuthorityListByRoleIdReqVo implements Serializable {
-    private String roleId;
-
-    public String getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(String roleId) {
-        this.roleId = roleId;
-    }
-}

src/main/java/com/pangding/web/authority/reqvo/GetUserByCompanyIdReqVo.java

-package com.pangding.web.authority.reqvo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/14 11:24
- */
-public class GetUserByCompanyIdReqVo {
-    private String companyId;
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-}

src/main/java/com/pangding/web/authority/reqvo/GetUserByIdReqVo.java

-package com.pangding.web.authority.reqvo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/10 17:21
- */
-public class GetUserByIdReqVo {
-    private String id;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-}

src/main/java/com/pangding/web/authority/reqvo/GetUserByPhoneReqVo.java

-package com.pangding.web.authority.reqvo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/14 15:48
- */
-public class GetUserByPhoneReqVo {
-    private String phone;
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-}

src/main/java/com/pangding/web/authority/reqvo/GetUserRoleListByUserIdReqVo.java

-package com.pangding.web.authority.reqvo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/5/10 19:34
- */
-public class GetUserRoleListByUserIdReqVo {
-    private String userId;
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}

src/main/java/com/pangding/web/authority/service/AuthorityService.java

 package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.reqvo.ListAuthorityReqVo;
+import com.pangding.web.authority.vo.reqvo.WebAuthorityReqVo;
+import com.pangding.web.authority.vo.reqvo.WebAuthorityResVo;
+import com.pangding.web.authority.vo.reqvo.WebUserResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -25,17 +30,17 @@ public interface AuthorityService {
     /**
      * 通过权限表主键获取authorityVo对象
      *
-     * @param id 主键
+     * @param reqVo 主键
      * @return authorityVo对象
      */
-    AuthorityVo getAuthorityById(String id);
+    AuthorityVo getAuthorityById(WebAuthorityReqVo reqVo);
 
     /**
      * 通过权限表主键删除authorityVo对象，并删除权限和角色的对应关系
      *
-     * @param id 主键
+     * @param reqVo 主键
      */
-    void deleteAuthorityById(String id);
+    void deleteAuthorityById(WebAuthorityReqVo reqVo);
 
     /**
      * 检查新建、修改的authorityVo对象是否合法
@@ -45,18 +50,7 @@ public interface AuthorityService {
      */
     void checkValid(AuthorityVo authorityVo);
 
-    /**
-     * 获取authorityVo对象列表
-     *
-     * @return authorityVo对象列表
-     */
-    List<AuthorityVo> listAllAuthority();
 
-    /**
-     * 获取一级权限列表
-     *
-     * @return 一级权限列表
-     */
-    List<AuthorityVo> listLevel1();
+    PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo);
 
 }

src/main/java/com/pangding/web/authority/service/RoleService.java

 package com.pangding.web.authority.service;
 
-import com.pangding.web.authority.dto.RoleDto;
+import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
+import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.vo.RoleVo;
+import com.pangding.web.authority.vo.reqvo.WebRoleResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -13,24 +17,24 @@ public interface RoleService {
     /**
      * 保存RoleDto对象,并保存角色权限的对应关系
      *
-     * @param roleDto RoleDto对象
+     * @param webRoleReqVo RoleDto对象
      */
-    void saveRole(RoleDto roleDto);
+    void saveRole(WebRoleReqVo webRoleReqVo);
 
     /**
      * 更新RoleDto对象,并更新角色权限的对应关系
      *
-     * @param roleDto RoleDto对象
+     * @param webRoleReqVo RoleDto对象
      */
-    void updateRole(RoleDto roleDto);
+    void updateRole(WebRoleReqVo webRoleReqVo);
 
     /**
      * 通过主键id查询RoleVo对象
      *
-     * @param id 主键
+     * @param webRoleReqVo 主键
      * @return RoleVo对象
      */
-    RoleVo getRoleById(String id);
+    WebRoleResVo getRoleById(WebRoleReqVo webRoleReqVo);
 
     /**
      * 通过角色名查询RoleVo对象
@@ -51,9 +55,12 @@ public interface RoleService {
     /**
      * 获取RoleVo对象列表
      *
+     * @param req
      * @return RoleVo对象列表
      */
-    List<RoleVo> getRoleVoList();
+    PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req);
+
+    PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req);
 
     /**
      * 通过角色id查询该角色权限id列表
@@ -61,7 +68,7 @@ public interface RoleService {
      * @param roleId 角色id
      * @return 权限id列表
      */
-    List<String> getAuthorityIdListByRoleId(String roleId);
+    List<AuthorityVo> getAuthorityListByRoleId(String roleId);
 
     /**
      * 通过权限id查询权限名
@@ -75,11 +82,10 @@ public interface RoleService {
      * 将RoleVo对象添加权限ID列表和权限名列表封装成RoleDto对象
      *
      * @param roleVo RoleVo对象
-     * @param authorityIdList 权限id列表
-     * @param authorityNameList 权限名列表
+     * @param authorityList 权限列表
      * @return RoleDto对象
      */
-    RoleDto makeRoleDto(RoleVo roleVo,List<String> authorityIdList,List<String> authorityNameList);
+    WebRoleResVo makeResVo(RoleVo roleVo, List<AuthorityVo> authorityList);
 
     /**
      * 删除角色，并删除角色和用户的对应关系以及角色和权限的对应关系
@@ -88,4 +94,6 @@ public interface RoleService {
      */
     void deleteRole(RoleVo roleVo);
 
+    void delete(WebRoleReqVo webRoleReqVo);
+
 }

src/main/java/com/pangding/web/authority/service/UserService.java

 package com.pangding.web.authority.service;
 
-import com.pangding.web.authority.dto.UserDto;
-import com.pangding.web.authority.reqvo.GetRoleByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserRoleListByUserIdReqVo;
+import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.*;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -17,14 +16,14 @@ public interface UserService {
      *
      * @param userDto UserDto对象
      */
-    void saveUser(UserDto userDto);
+    void saveUser(WebUserReqVo userDto);
 
     /**
      * 保存更新后的用户信息，并更新用户和角色的对应关系
      *
      * @param userDto UserDto对象
      */
-    void updateUser(UserDto userDto);
+    void updateUser(WebUserReqVo userDto);
 
     /**
      * 检查用户名是否存在
@@ -48,22 +47,14 @@ public interface UserService {
      */
     String passwordEncoder(String password);
 
-    /**
-     * 获取UserVo对象列表
-     *
-     * @return UserVo对象列表
-     */
-    List<UserVo> listUserVo();
 
     /**
      * 将UserVo对象添加角色id列表和角色名列表封装成UserDto对象
      *
      * @param userVo UserVo对象
-     * @param roleIdList 角色id列表
-     * @param roleNameList 角色名列表
      * @return UserDto对象
      */
-    UserDto makeUserDto(UserVo userVo,List<String> roleIdList,List<String> roleNameList);
+    WebUserResVo makeResVo(UserVo userVo);
 
     /**
      * 通过用户id查询UserVo对象
@@ -71,7 +62,11 @@ public interface UserService {
      * @param userId 用户id
      * @return UserVo对象
      */
-    UserVo getUserById(String userId);
+    WebUserResVo getUserById(String userId);
+
+    PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
+
+    PageSizeData<WebUserResVo> getWebUserResVoList(ListUserReqVo reqVo);
 
     /**
      * 通过userId查询user和role对应关系对象列表
@@ -79,15 +74,15 @@ public interface UserService {
      * @param reqVo GetUserRoleListByUserIdReqVo对象
      * @return UserRole对应关系对象列表
      */
-    List<UserRoleRelation> listUserRoleListByUserId(GetUserRoleListByUserIdReqVo reqVo);
+    List<UserRoleVo> listUserRoleListByUserId(UserRoleGetReqVo reqVo);
 
     /**
      * 根据roleId查询RoleVo对象
      *
-     * @param getRoleByRoleIdReqVo GetRoleByRoleIdReqVo对象
+     * @param roleGetReqVo GetRoleByRoleIdReqVo对象
      * @return RoleVo对象
      */
-    RoleVo getRoleByRoleId(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo);
+    RoleVo getRoleByRoleId(RoleGetReqVo roleGetReqVo);
 
     /**
      * 检查用户名是否合法
@@ -95,7 +90,7 @@ public interface UserService {
      * @param account 用户名
      * @return
      */
-    Boolean isValid(String account);
+    void isValid(String account);
 
     /**
      * 检查是否为纯数字，用来判断输入的是用户名还是手机号
@@ -120,4 +115,6 @@ public interface UserService {
      * @return UserVo对象
      */
     UserVo getUserByAccount(String account);
+
+    List<RoleVo> getRoleListByUserId(String userId);
 }

src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java

@@ -2,16 +2,18 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.RoleAuthorityDao;
 import com.pangding.web.authority.dao.AuthorityDao;
-import com.pangding.web.authority.reqvo.GetAuthorityByIdReqVo;
-import com.pangding.web.authority.reqvo.GetRoleAuthorityListByAuthorityIdReqVo;
+import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.reqvo.ListLevel1ReqVo;
 import com.pangding.web.authority.service.AuthorityService;
 import com.pangding.web.authority.vo.*;
+import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,12 +30,14 @@ public class AuthorityServiceImpl implements AuthorityService {
 
     @Override
     public void save(AuthorityVo authorityVo) {
+        this.checkValid(authorityVo);
         authorityVo.setId(StringHelper.getNewID());
         authorityDao.create(authorityVo);
     }
 
     @Override
     public void update(AuthorityVo authorityVo) {
+        this.checkValid(authorityVo);
         authorityDao.update(authorityVo);
     }
 
@@ -43,38 +47,72 @@ public class AuthorityServiceImpl implements AuthorityService {
     }
 
     @Override
-    public AuthorityVo getAuthorityById(String id) {
-        GetAuthorityByIdReqVo getAuthorityByIdReqVo = new GetAuthorityByIdReqVo();
-        getAuthorityByIdReqVo.setId(id);
-        AuthorityVo authorityVo = authorityDao.getAuthorityById(getAuthorityByIdReqVo);
-        return authorityVo != null ? authorityVo : null;
+    public AuthorityVo getAuthorityById(WebAuthorityReqVo reqVo) {
+        AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
+        authorityGetReqVo.setId(reqVo.getId());
+        AuthorityVo authorityVo = authorityDao.getAuthority(authorityGetReqVo);
+        if (authorityVo == null){
+            throw new CodeException("该权限不存在");
+        }
+        return authorityVo;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteAuthorityById(String id) {
+    public void deleteAuthorityById(WebAuthorityReqVo reqVo) {
         AuthorityVo authorityVo = new AuthorityVo();
-        authorityVo.setId(id);
+        authorityVo.setId(reqVo.getId());
         authorityDao.remove(authorityVo);
-        GetRoleAuthorityListByAuthorityIdReqVo getRoleAuthorityListByAuthorityIdReqVo = new GetRoleAuthorityListByAuthorityIdReqVo();
-        getRoleAuthorityListByAuthorityIdReqVo.setAuthorityId(id);
-        List<RoleAuthorityRelation> roleAuthorityList = roleAuthorityDao.getRoleAuthorityListByAuthorityId(getRoleAuthorityListByAuthorityIdReqVo);
-        for (RoleAuthorityRelation roleAuthority:roleAuthorityList) {
+
+        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+        roleAuthorityGetReqVo.setAuthorityId(reqVo.getId());
+        List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDao.getRoleAuthorityList(roleAuthorityGetReqVo);
+        for (RoleAuthorityVo roleAuthority:roleAuthorityList) {
             roleAuthorityDao.remove(roleAuthority);
         }
+
+        AuthorityGetReqVo reqVo1 = new AuthorityGetReqVo();
+        reqVo1.setPid(reqVo.getId());
+        List<AuthorityVo> childList = authorityDao.getAuthoritys(reqVo1);
+        if (childList != null && childList.size() != 0){
+            for (AuthorityVo child:childList) {
+                WebAuthorityReqVo reqVo2 = new WebAuthorityReqVo();
+                reqVo2.setId(child.getId());
+                this.deleteAuthorityById(reqVo2);
+            }
+        }
     }
 
+
     @Override
-    public List<AuthorityVo> listAllAuthority() {
-        List<AuthorityVo> list = authorityDao.listAll();
-        return (list != null && list.size() != 0) ? list : null;
+    public PageSizeData<WebAuthorityResVo> getWebAuthorityResVoList(ListAuthorityReqVo reqVo) {
+        reqVo.setExist("exist");
+        PageSizeData<AuthorityVo> authorityVoPageSizeData = authorityDao.getAuthorityList(reqVo);
+        PageSizeData<WebAuthorityResVo> webAuthorityResVoPageSizeData = new PageSizeData();
+        List<AuthorityVo> authorityVoList = authorityVoPageSizeData.getList();
+        if (authorityVoList == null || authorityVoList.size() == 0){
+            throw new CodeException("没有更多权限");
         }
+        List<WebAuthorityResVo> webAuthorityResVoList = new ArrayList(authorityVoList.size());
+        for (AuthorityVo authorityVo:authorityVoList) {
+            WebAuthorityResVo resVo = new WebAuthorityResVo();
+            resVo.setUrl(authorityVo.getUrl());
+            resVo.setType(authorityVo.getType());
+            resVo.setRemark(authorityVo.getRemark());
+            resVo.setPid(authorityVo.getPid());
+            resVo.setOpenMode(authorityVo.getOpenMode());
+            resVo.setName(authorityVo.getName());
+            resVo.setId(authorityVo.getId());
+            resVo.setCreateTime(authorityVo.getCreateTime());
+            resVo.setAlias(authorityVo.getAlias());
 
-    @Override
-    public List<AuthorityVo> listLevel1() {
-        ListLevel1ReqVo listLevel1ReqVo = new ListLevel1ReqVo();
-        listLevel1ReqVo.setExist("exist");
-        List<AuthorityVo> list = authorityDao.listLevel1(listLevel1ReqVo);
-        return (list != null && list.size() != 0) ? list : null;
+            webAuthorityResVoList.add(resVo);
+        }
+        webAuthorityResVoPageSizeData.setPageSize(authorityVoPageSizeData.getPageSize());
+        webAuthorityResVoPageSizeData.setPageIndex(authorityVoPageSizeData.getPageIndex());
+        webAuthorityResVoPageSizeData.setPageTotal(authorityVoPageSizeData.getPageTotal());
+        webAuthorityResVoPageSizeData.setList(webAuthorityResVoList);
+
+        return webAuthorityResVoPageSizeData;
     }
 }

src/main/java/com/pangding/web/authority/service/impl/MobileRegisterServiceImpl.java

@@ -2,9 +2,7 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.MobileRegisterDao;
 import com.pangding.web.authority.dao.UserDao;
-import com.pangding.web.authority.dto.RegisterIndividualDto;
 import com.pangding.web.authority.reqvo.CheckMerchantIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserByCompanyIdReqVo;
 import com.pangding.web.authority.service.MobileRegisterService;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;

src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java

@@ -4,11 +4,12 @@ import com.pangding.web.authority.dao.RoleDao;
 import com.pangding.web.authority.dao.RoleAuthorityDao;
 import com.pangding.web.authority.dao.AuthorityDao;
 import com.pangding.web.authority.dao.UserRoleDao;
-import com.pangding.web.authority.dto.RoleDto;
-import com.pangding.web.authority.reqvo.*;
+import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.RoleService;
 import com.pangding.web.authority.vo.*;
+import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,52 +37,68 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveRole(RoleDto roleDto) {
-        RoleVo roleVo = roleDto;
+    public void saveRole(WebRoleReqVo webRoleReqVo) {
+        RoleVo roleVo = webRoleReqVo;
+        this.checkNameExist(roleVo);
+        webRoleReqVo.setId(StringHelper.getNewID());
+
         roleDao.create(roleVo);
-        List<String> authorityIds = roleDto.getAuthorityIds();
+        List<String> authorityIds = webRoleReqVo.getAuthorityIds();
+        if (authorityIds != null && authorityIds.size() != 0){
             for (String authorityId : authorityIds) {
-            RoleAuthorityRelation roleAuthorityRelation = new RoleAuthorityRelation();
+                RoleAuthorityVo roleAuthorityRelation = new RoleAuthorityVo();
                 roleAuthorityRelation.setAuthorityId(authorityId);
-            roleAuthorityRelation.setRoleId(roleDto.getId());
+                roleAuthorityRelation.setRoleId(webRoleReqVo.getId());
                 roleAuthorityRelation.setId(StringHelper.getNewID());
                 roleAuthorityDaoImpl.create(roleAuthorityRelation);
             }
         }
 
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateRole(RoleDto roleDto) {
-        RoleVo roleVo = roleDto;
+    public void updateRole(WebRoleReqVo webRoleReqVo) {
+        RoleVo roleVo = webRoleReqVo;
+        this.checkNameExist(roleVo);
+
         roleDao.update(roleVo);
-        GetRoleAuthorityListByRoleIdReqVo getRoleAuthorityListByRoleIdReqVo = new GetRoleAuthorityListByRoleIdReqVo();
-        getRoleAuthorityListByRoleIdReqVo.setRoleId(roleDto.getId());
-        List<RoleAuthorityRelation> roleAuthorityList = roleAuthorityDaoImpl.getRoleAuthorityListByRoleId(getRoleAuthorityListByRoleIdReqVo);
+        RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
+        reqVo.setRoleId(webRoleReqVo.getId());
+        List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.getRoleAuthorityList(reqVo);
         if (roleAuthorityList != null && roleAuthorityList.size() != 0){
-            for (RoleAuthorityRelation roleAuthorityRelation:roleAuthorityList) {
+            for (RoleAuthorityVo roleAuthorityRelation:roleAuthorityList) {
                 roleAuthorityDaoImpl.remove(roleAuthorityRelation);
             }
         }
-        List<String> authorityIds = roleDto.getAuthorityIds();
+        List<String> authorityIds = webRoleReqVo.getAuthorityIds();
+        if (authorityIds != null && authorityIds.size() != 0){
             for (String authorityId : authorityIds) {
-            RoleAuthorityRelation roleAuthorityRelation = new RoleAuthorityRelation();
+                RoleAuthorityVo roleAuthorityRelation = new RoleAuthorityVo();
                 roleAuthorityRelation.setAuthorityId(authorityId);
-            roleAuthorityRelation.setRoleId(roleDto.getId());
+                roleAuthorityRelation.setRoleId(webRoleReqVo.getId());
                 roleAuthorityRelation.setId(StringHelper.getNewID());
                 roleAuthorityDaoImpl.create(roleAuthorityRelation);
             }
         }
 
+    }
+
     @Override
-    public RoleVo getRoleById(String id) {
-        GetRoleByRoleIdReqVo getRoleByRoleIdReqVo = new GetRoleByRoleIdReqVo();
-        getRoleByRoleIdReqVo.setId(id);
-        return roleDao.getRoleById(getRoleByRoleIdReqVo);
+    public WebRoleResVo getRoleById(WebRoleReqVo webRoleReqVo) {
+        RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
+        roleGetReqVo.setId(webRoleReqVo.getId());
+        RoleVo roleVo = roleDao.getRoleById(roleGetReqVo);
+        if (roleVo == null){
+            throw new CodeException("未找到该角色");
+        }
+        List<AuthorityVo> authorityList = this.getAuthorityListByRoleId(webRoleReqVo.getId());
+        return this.makeResVo(roleVo,authorityList);
     }
 
     @Override
     public RoleVo getRoleByName(String name) {
-        GetRoleByRoleNameReqVo getRoleByRoleNameReqVo = new GetRoleByRoleNameReqVo();
+        RoleGetReqVo getRoleByRoleNameReqVo = new RoleGetReqVo();
         getRoleByRoleNameReqVo.setName(name);
         return roleDao.getRoleByRoleName(getRoleByRoleNameReqVo);
     }
@@ -92,81 +109,121 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public List<RoleVo> getRoleVoList() {
-        return roleDao.getRoleVoList();
+    public PageSizeData<RoleVo> getRoleVoList(ListRoleReqVo req) {
+
+        PageSizeData<RoleVo> roleVoPageSizeData = roleDao.getRoleVoList(req);
+        if (roleVoPageSizeData.getList() == null || roleVoPageSizeData.getList().size() == 0){
+            throw new CodeException("没有更多权限");
+        }
+        return roleVoPageSizeData;
+    }
+
+    @Override
+    public PageSizeData<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) {
+        PageSizeData<RoleVo> roleVoPageSizeData = this.getRoleVoList(req);
+        PageSizeData<WebRoleResVo> webRoleResVoPageSizeData = new PageSizeData();
+        List<RoleVo> roleVoList = roleVoPageSizeData.getList();
+        List<WebRoleResVo> webRoleResVoList = new ArrayList(roleVoList.size());
+        for (RoleVo roleVo:roleVoList) {
+            WebRoleResVo resVo = new WebRoleResVo();
+            List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId());
+
+            resVo.setAuthorityList(authorityVoList);
+            resVo.setId(roleVo.getId());
+            resVo.setName(roleVo.getName());
+            resVo.setPid(roleVo.getPid());
+            resVo.setRemark(roleVo.getRemark());
+
+            webRoleResVoList.add(resVo);
+        }
+        webRoleResVoPageSizeData.setPageTotal(roleVoPageSizeData.getPageTotal());
+        webRoleResVoPageSizeData.setList(webRoleResVoList);
+        webRoleResVoPageSizeData.setPageIndex(roleVoPageSizeData.getPageIndex());
+        webRoleResVoPageSizeData.setPageSize(roleVoPageSizeData.getPageSize());
+
+        return webRoleResVoPageSizeData;
     }
 
     @Override
-    public List<String> getAuthorityIdListByRoleId(String roleId) {
-        GetRoleAuthorityListByRoleIdReqVo getRoleAuthorityListByRoleIdReqVo = new GetRoleAuthorityListByRoleIdReqVo();
-        getRoleAuthorityListByRoleIdReqVo.setRoleId(roleId);
-        List<RoleAuthorityRelation> roleAuthorityRelationList = roleAuthorityDaoImpl.getRoleAuthorityListByRoleId(getRoleAuthorityListByRoleIdReqVo);
-        List<String> authorityIdList = new ArrayList(roleAuthorityRelationList.size());
-        for (RoleAuthorityRelation roleAuthorityRelation:roleAuthorityRelationList) {
-            authorityIdList.add(roleAuthorityRelation.getAuthorityId());
+    public List<AuthorityVo> getAuthorityListByRoleId(String roleId) {
+        RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
+        reqVo.setRoleId(roleId);
+        List<RoleAuthorityVo> roleAuthorityRelationList = roleAuthorityDaoImpl.getRoleAuthorityList(reqVo);
+        if (roleAuthorityRelationList != null && roleAuthorityRelationList.size() != 0){
+            List<AuthorityVo> authorityList = new ArrayList(roleAuthorityRelationList.size());
+            for (RoleAuthorityVo roleAuthorityRelation:roleAuthorityRelationList) {
+                AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
+                authorityGetReqVo.setId(roleAuthorityRelation.getAuthorityId());
+                AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
+                authorityList.add(authorityVo);
+            }
+            return authorityList;
         }
-        return authorityIdList;
+        return null;
     }
 
     @Override
     public String getAuthorityNameByAuthorityId(String authorityId) {
-        GetAuthorityByIdReqVo getAuthorityByIdReqVo = new GetAuthorityByIdReqVo();
-        getAuthorityByIdReqVo.setId(authorityId);
-        AuthorityVo authorityVo = authorityDaoImpl.getAuthorityById(getAuthorityByIdReqVo);
+        AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
+        authorityGetReqVo.setId(authorityId);
+        AuthorityVo authorityVo = authorityDaoImpl.getAuthority(authorityGetReqVo);
         return authorityVo.getName();
     }
 
     @Override
-    public RoleDto makeRoleDto(RoleVo roleVo, List<String> authorityIdList, List<String> authorityNameList) {
-        RoleDto roleDto = new RoleDto();
-        roleDto.setId(roleVo.getId());
-        roleDto.setName(roleVo.getName());
-        roleDto.setPid(roleVo.getPid());
-        roleDto.setRemark(roleVo.getRemark());
-        roleDto.setAuthorityIds(authorityIdList);
-        roleDto.setAuthorityNames(authorityNameList);
-        return roleDto;
+    public WebRoleResVo makeResVo(RoleVo roleVo, List<AuthorityVo> authorityList) {
+        WebRoleResVo ResVo = new WebRoleResVo();
+        ResVo.setId(roleVo.getId());
+        ResVo.setName(roleVo.getName());
+        ResVo.setPid(roleVo.getPid());
+        ResVo.setRemark(roleVo.getRemark());
+        ResVo.setAuthorityList(authorityList);
+        return ResVo;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteRole(RoleVo roleVo) {
 
+        roleDao.remove(roleVo);
 
-
-        GetUserRoleListByRoleIdReqVo getUserRoleListByRoleIdReqVo = new GetUserRoleListByRoleIdReqVo();
-        getUserRoleListByRoleIdReqVo.setRoleId(roleVo.getId());
-        List<UserRoleRelation> userRoleList = userRoleDaoImpl.getUserRoleListByRoleId(getUserRoleListByRoleIdReqVo);
+        UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
+        userRoleGetReqVo.setRoleId(roleVo.getId());
+        List<UserRoleVo> userRoleList = userRoleDaoImpl.getUserRoleList(userRoleGetReqVo);
         if (userRoleList != null && userRoleList.size() != 0){
-            for (UserRoleRelation userRoleRelation:userRoleList) {
+            for (UserRoleVo userRoleRelation:userRoleList) {
                 userRoleDaoImpl.remove(userRoleRelation);
             }
         }
 
-        GetRoleAuthorityListByRoleIdReqVo getRoleAuthorityListByRoleIdReqVo = new GetRoleAuthorityListByRoleIdReqVo();
-        getRoleAuthorityListByRoleIdReqVo.setRoleId(roleVo.getId());
-        List<RoleAuthorityRelation> roleAuthorityList = roleAuthorityDaoImpl.getRoleAuthorityListByRoleId(getRoleAuthorityListByRoleIdReqVo);
+        RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
+        reqVo.setRoleId(roleVo.getId());
+        List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.getRoleAuthorityList(reqVo);
         if (roleAuthorityList != null && roleAuthorityList.size() != 0){
-            for (RoleAuthorityRelation roleAuthority:roleAuthorityList) {
+            for (RoleAuthorityVo roleAuthority:roleAuthorityList) {
                 roleAuthorityDaoImpl.remove(roleAuthority);
             }
         }
 
-        GetRoleByRoleIdReqVo getRoleByRoleIdReqVo = new GetRoleByRoleIdReqVo();
-        getRoleByRoleIdReqVo.setId(roleVo.getId());
-        List<RoleVo> childList = roleDao.getChild(getRoleByRoleIdReqVo);
+        RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
+        roleGetReqVo.setId(roleVo.getId());
+        List<RoleVo> childList = roleDao.getChild(roleGetReqVo);
         for (RoleVo child:childList) {
             roleDao.remove(child);
-            GetRoleAuthorityListByRoleIdReqVo getRoleAuthorityListByRoleIdReqVo2 = new GetRoleAuthorityListByRoleIdReqVo();
-            getRoleAuthorityListByRoleIdReqVo.setRoleId(child.getId());
-            List<RoleAuthorityRelation> roleAuthorityList2 = roleAuthorityDaoImpl.getRoleAuthorityListByRoleId(getRoleAuthorityListByRoleIdReqVo2);
+            RoleAuthorityGetReqVo reqVo1 = new RoleAuthorityGetReqVo();
+            reqVo1.setRoleId(child.getId());
+            List<RoleAuthorityVo> roleAuthorityList2 = roleAuthorityDaoImpl.getRoleAuthorityList(reqVo1);
             if (roleAuthorityList2 != null && roleAuthorityList2.size() != 0){
-                for (RoleAuthorityRelation roleAuthority:roleAuthorityList) {
+                for (RoleAuthorityVo roleAuthority:roleAuthorityList) {
                     roleAuthorityDaoImpl.remove(roleAuthority);
                 }
             }
         }
-        roleDao.remove(roleVo);
+    }
 
+    @Override
+    public void delete(WebRoleReqVo webRoleReqVo) {
+        RoleVo roleVo = this.getRoleById(webRoleReqVo);
+        this.deleteRole(roleVo);
     }
 }

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -3,12 +3,12 @@ package com.pangding.web.authority.service.impl;
 import com.pangding.web.authority.dao.RoleDao;
 import com.pangding.web.authority.dao.UserDao;
 import com.pangding.web.authority.dao.UserRoleDao;
-import com.pangding.web.authority.dto.UserDto;
-import com.pangding.web.authority.reqvo.*;
+import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
-import com.pangding.web.authority.utils.Md5AndSalt;
 import com.pangding.web.authority.vo.*;
+import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,15 +33,23 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveUser(UserDto userDto) {
-        UserVo userVo = userDto;
+    public void saveUser(WebUserReqVo webUserReqVo) {
+        this.isValid(webUserReqVo.getAccount());
+        this.checkAccount(webUserReqVo);
+        this.checkPhone(webUserReqVo);
+        webUserReqVo.setRemark(webUserReqVo.getPassword());
+        String md5Password = this.passwordEncoder(webUserReqVo.getPassword());
+        webUserReqVo.setPassword(md5Password);
+        webUserReqVo.setId(StringHelper.getNewID());
+
+        UserVo userVo = webUserReqVo;
         userDao.create(userVo);
-        if (userDto.getRoleIds()!=null&&userDto.getRoleIds().size()!=0){
-            List<String> roleIds = userDto.getRoleIds();
+        if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().size()!=0){
+            List<String> roleIds = webUserReqVo.getRoleIds();
             for (String roleId : roleIds) {
-                UserRoleRelation userRoleRelation = new UserRoleRelation();
+                UserRoleVo userRoleRelation = new UserRoleVo();
                 userRoleRelation.setRoleId(roleId);
-                userRoleRelation.setUserId(userDto.getId());
+                userRoleRelation.setUserId(webUserReqVo.getId());
                 userRoleRelation.setId(StringHelper.getNewID());
                 userRoleDao.create(userRoleRelation);
             }
@@ -50,39 +58,41 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateUser(UserDto userDto) {
-        UserVo userVo = userDto;
+    public void updateUser(WebUserReqVo webUserReqVo) {
+        this.isValid(webUserReqVo.getAccount());
+        this.checkAccount(webUserReqVo);
+        this.checkPhone(webUserReqVo);
+        webUserReqVo.setRemark(webUserReqVo.getPassword());
+        webUserReqVo.setPassword(this.passwordEncoder(webUserReqVo.getPassword()));
+
+        UserVo userVo = webUserReqVo;
         userDao.update(userVo);
-        GetUserRoleListByUserIdReqVo userId = new GetUserRoleListByUserIdReqVo();
-        userId.setUserId(userDto.getId());
-        List<UserRoleRelation> userRoleList = userRoleDao.getUserRoleListByUserId(userId);
+        UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
+        reqVo.setUserId(webUserReqVo.getId());
+        List<UserRoleVo> userRoleList = userRoleDao.getUserRoleList(reqVo);
+        if(userRoleList != null && userRoleList.size() != 0){
             List<String> userRoleIdList = new ArrayList(userRoleList.size());
-        for (UserRoleRelation userRole:userRoleList) {
+            for (UserRoleVo userRole:userRoleList) {
                 userRoleIdList.add(userRole.getId());
             }
             if (userRoleIdList != null && userRoleIdList.size() != 0){
                 for (String userRoleId:userRoleIdList){
-                UserRoleDaoRemoveReqVo userRole = new UserRoleDaoRemoveReqVo();
+                    UserRoleRemoveReqVo userRole = new UserRoleRemoveReqVo();
                     userRole.setId(userRoleId);
                     userRoleDao.remove(userRole);
                 }
             }
-        if (userDto.getRoleIds()!=null&&userDto.getRoleIds().size()!=0){
-            List<String> roleIds = userDto.getRoleIds();
+            if (webUserReqVo.getRoleIds()!=null && webUserReqVo.getRoleIds().size()!=0){
+                List<String> roleIds = webUserReqVo.getRoleIds();
                 for (String roleId : roleIds) {
-                UserRoleRelation userRoleRelation = new UserRoleRelation();
+                    UserRoleVo userRoleRelation = new UserRoleVo();
                     userRoleRelation.setRoleId(roleId);
-                userRoleRelation.setUserId(userDto.getId());
+                    userRoleRelation.setUserId(webUserReqVo.getId());
                     userRoleRelation.setId(StringHelper.getNewID());
                     userRoleDao.create(userRoleRelation);
                 }
             }
         }
-
-    @Override
-    public List<UserVo> listUserVo() {
-
-        return userDao.listUserVo();
     }
 
     @Override
@@ -96,40 +106,60 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String passwordEncoder(String password) { return Md5AndSalt.generate(password); }
+    public String passwordEncoder(String password) { return StringHelper.md5(password); }
 
 
     @Override
-    public UserDto makeUserDto(UserVo userVo, List<String> roleIdList, List<String> roleNameList) {
-        UserDto userDto = new UserDto();
-        userDto.setPassword(userVo.getPassword());
-        userDto.setAccount(userVo.getAccount());
-        userDto.setCreateTime(userVo.getCreateTime());
-        userDto.setCreator(userVo.getCreator());
-        userDto.setId(userVo.getId());
-        userDto.setPhone(userVo.getPhone());
-        userDto.setRemark(userVo.getRemark());
-        userDto.setStatus(userVo.getStatus());
-        userDto.setRoleIds(roleIdList);
-        userDto.setRoles(roleNameList);
-        return userDto;
+    public WebUserResVo makeResVo(UserVo userVo) {
+
+        WebUserResVo resVo = new WebUserResVo();
+        resVo.setPassword(userVo.getPassword());
+        resVo.setAccount(userVo.getAccount());
+        resVo.setCreateTime(userVo.getCreateTime());
+        resVo.setCreator(userVo.getCreator());
+        resVo.setId(userVo.getId());
+        resVo.setPhone(userVo.getPhone());
+        resVo.setRemark(userVo.getRemark());
+        resVo.setStatus(userVo.getStatus());
+
+        UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
+        reqVo.setUserId(userVo.getId());
+        List<UserRoleVo> userRoleVoList = this.listUserRoleListByUserId(reqVo);
+        if (userRoleVoList != null && userRoleVoList.size() != 0){
+            List<RoleVo> roleList = new ArrayList(userRoleVoList.size());
+            for (UserRoleVo userRoleRelation:userRoleVoList) {
+                String roleId = userRoleRelation.getRoleId();
+                RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
+                roleGetReqVo.setId(roleId);
+                RoleVo roleVo = roleDao.load(roleGetReqVo,RoleVo.class);
+                roleList.add(roleVo);
+            }
+            resVo.setRoleList(roleList);
+        }
+
+        return resVo;
     }
 
     @Override
-    public UserVo getUserById(String userId) {
-        GetUserByIdReqVo id = new GetUserByIdReqVo();
-        id.setId(userId);
-        return userDao.getUserById(id);
+    public WebUserResVo getUserById(String userId) {
+        UserGetReqVo reqVo = new UserGetReqVo();
+        reqVo.setId(userId);
+        UserVo userVo = userDao.getUser(reqVo);
+        if (userVo == null){
+            throw new CodeException("该用户不存在");
+        }
+        WebUserResVo resVo = this.makeResVo(userVo);
+        return resVo;
     }
 
     @Override
-    public List<UserRoleRelation> listUserRoleListByUserId(GetUserRoleListByUserIdReqVo reqVo) {
-        return userRoleDao.getUserRoleListByUserId(reqVo);
+    public List<UserRoleVo> listUserRoleListByUserId(UserRoleGetReqVo reqVo) {
+        return userRoleDao.getUserRoleList(reqVo);
     }
 
     @Override
-    public RoleVo getRoleByRoleId(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo) {
-        return roleDao.getRoleById(getRoleByRoleIdReqVo);
+    public RoleVo getRoleByRoleId(RoleGetReqVo roleGetReqVo) {
+        return roleDao.getRoleById(roleGetReqVo);
     }
 
     @Override
@@ -144,22 +174,80 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public Boolean isValid(String account) {
+    public void isValid(String account) {
         String regex = "^(?!\\d+$)[\\da-zA-Z]+$";
-        return account.matches(regex);
+        if(!account.matches(regex)){
+            throw new CodeException("用户名仅支持字母和数字的组合，且不能为纯数字");
+        }
     }
 
     @Override
     public UserVo getUserByPhone(String phone) {
-        GetUserByPhoneReqVo getUserByPhoneReqVo = new GetUserByPhoneReqVo();
-        getUserByPhoneReqVo.setPhone(phone);
-        return userDao.load(getUserByPhoneReqVo,UserVo.class);
+        UserGetReqVo reqVo = new UserGetReqVo();
+        reqVo.setPhone(phone);
+        return userDao.load(reqVo,UserVo.class);
     }
 
     @Override
     public UserVo getUserByAccount(String account) {
-        GetUserByAccountReqVo getUserByAccountReqVo = new GetUserByAccountReqVo();
-        getUserByAccountReqVo.setAccount(account);
-        return userDao.load(getUserByAccountReqVo, UserVo.class);
+        UserGetReqVo userGetReqVo = new UserGetReqVo();
+        userGetReqVo.setAccount(account);
+        return userDao.load(userGetReqVo, UserVo.class);
+    }
+
+    @Override
+    public PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo) {
+        PageSizeData<UserVo> userVoPageSizeData = userDao.getUserVoList(reqVo);
+        if (userVoPageSizeData.getList() == null || userVoPageSizeData.getList().size() == 0){
+            throw new CodeException("没有更多用户");
+        }
+        return userVoPageSizeData;
+    }
+
+    @Override
+    public PageSizeData<WebUserResVo> getWebUserResVoList(ListUserReqVo reqVo) {
+        PageSizeData<UserVo> userVoPageSizeData = this.getUserVoList(reqVo);
+        PageSizeData<WebUserResVo> webUserResVoPageSizeData = new PageSizeData();
+        List<UserVo> userVoList = userVoPageSizeData.getList();
+        List<WebUserResVo> webUserResVoList = new ArrayList(userVoList.size());
+        for (UserVo userVo:userVoList) {
+            WebUserResVo resVo = new WebUserResVo();
+            List<RoleVo> roleVoList = this.getRoleListByUserId(userVo.getId());
+
+            resVo.setRoleList(roleVoList);
+            resVo.setAccount(userVo.getAccount());
+            resVo.setCompanyId(userVo.getCompanyId());
+            resVo.setCreateTime(userVo.getCreateTime());
+            resVo.setCreator(userVo.getCreator());
+            resVo.setId(userVo.getId());
+            resVo.setPhone(userVo.getPhone());
+            resVo.setStatus(userVo.getStatus());
+
+            webUserResVoList.add(resVo);
+        }
+        webUserResVoPageSizeData.setPageTotal(webUserResVoPageSizeData.getPageTotal());
+        webUserResVoPageSizeData.setList(webUserResVoList);
+        webUserResVoPageSizeData.setPageIndex(webUserResVoPageSizeData.getPageIndex());
+        webUserResVoPageSizeData.setPageSize(webUserResVoPageSizeData.getPageSize());
+
+        return webUserResVoPageSizeData;
+    }
+
+    @Override
+    public List<RoleVo> getRoleListByUserId(String userId) {
+        UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
+        reqVo.setUserId(userId);
+        List<UserRoleVo> userRoleVoList = userRoleDao.getUserRoleList(reqVo);
+        if (userRoleVoList != null && userRoleVoList.size() != 0){
+            List<RoleVo> roleVoList = new ArrayList(userRoleVoList.size());
+            for (UserRoleVo userRoleVo:userRoleVoList) {
+                RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
+                roleGetReqVo.setId(userRoleVo.getRoleId());
+                RoleVo roleVo = roleDao.load(roleGetReqVo,RoleVo.class);
+                roleVoList.add(roleVo);
+            }
+            return roleVoList;
+        }
+        return null;
     }
 }

src/main/java/com/pangding/web/authority/utils/Md5AndSalt.java

-package com.pangding.web.authority.utils;
-
-import org.apache.commons.codec.binary.Hex;
-
-import java.security.MessageDigest;
-import java.util.Random;
-
-/**
- * @author 源自网络
- */
-public class Md5AndSalt {
-    public static String generate(String password) {
-        Random r = new Random();
-        StringBuilder sb = new StringBuilder(16);
-        sb.append(r.nextInt(99999999)).append(r.nextInt(99999999));
-        int len = sb.length();
-        int defaultLen = 16;
-        if (len < defaultLen) {
-            for (int i = 0; i < defaultLen - len; i++) {
-                sb.append("0");
-            }
-        }
-        String salt = sb.toString();
-        password = md5Hex(password + salt);
-        char[] cs = new char[48];
-        int bound = 48;
-        int step = 3;
-        for (int i = 0; i < bound; i += step) {
-            cs[i] = password.charAt(i / 3 * 2);
-            char c = salt.charAt(i / 3);
-            cs[i + 1] = c;
-            cs[i + 2] = password.charAt(i / 3 * 2 + 1);
-        }
-        return new String(cs);
-    }
-    /**
-     * 获取十六进制字符串形式的MD5摘要
-     */
-    private static String md5Hex(String src) {
-        try {
-            MessageDigest md5 = MessageDigest.getInstance("MD5");
-            byte[] bs = md5.digest(src.getBytes());
-            return new String(new Hex().encode(bs));
-        } catch (Exception e) {
-            return null;
-        }
-    }
-    public static boolean verify(String password, String md5) {
-        char[] cs1 = new char[32];
-        char[] cs2 = new char[16];
-        int bound = 48;
-        int step = 3;
-        for (int i = 0; i < bound; i += step) {
-            cs1[i / 3 * 2] = md5.charAt(i);
-            cs1[i / 3 * 2 + 1] = md5.charAt(i + 2);
-            cs2[i / 3] = md5.charAt(i + 1);
-        }
-        String salt = new String(cs2);
-        return md5Hex(password + salt).equals(new String(cs1));
-    }
-}

src/main/java/com/pangding/web/authority/vo/RoleAuthorityRelation.java → src/main/java/com/pangding/web/authority/vo/RoleAuthorityVo.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * @author zhangjinyao
  */
 @TableAnnotation("pd_role_authority")
-public class RoleAuthorityRelation implements Serializable {
+public class RoleAuthorityVo implements Serializable {
 
     private String id;
 

src/main/java/com/pangding/web/authority/vo/UserRoleRelation.java → src/main/java/com/pangding/web/authority/vo/UserRoleVo.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
  * @author zhangjinyao
  */
 @TableAnnotation("pd_user_role")
-public class UserRoleRelation implements Serializable {
+public class UserRoleVo implements Serializable {
 
     private String id;
 

src/main/java/com/pangding/web/authority/reqvo/GetAuthorityByIdReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/AuthorityGetReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/11 15:05
  */
-public class GetAuthorityByIdReqVo {
+public class AuthorityGetReqVo {
     private String id;
 
+    private String pid;
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
     public String getId() {
         return id;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/ListAuthorityReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.yanzuoguang.util.vo.PageSizeReqVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/15 20:03
+ */
+public class ListAuthorityReqVo extends PageSizeReqVo {
+    private String exist;
+
+    public String getExist() {
+        return exist;
+    }
+
+    public void setExist(String exist) {
+        this.exist = exist;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/ListRoleReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.yanzuoguang.util.vo.PageSizeReqVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/15 17:54
+ */
+public class ListRoleReqVo extends PageSizeReqVo {
+}

src/main/java/com/pangding/web/authority/vo/reqvo/ListUserReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.yanzuoguang.util.vo.PageSizeReqVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/15 19:17
+ */
+public class ListUserReqVo extends PageSizeReqVo{
+}

src/main/java/com/pangding/web/authority/reqvo/GetRoleAuthorityListByAuthorityIdReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/RoleAuthorityGetReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/11 16:41
  */
-public class GetRoleAuthorityListByAuthorityIdReqVo {
+public class RoleAuthorityGetReqVo {
     private String authorityId;
 
+    private String roleId;
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
     public String getAuthorityId() {
         return authorityId;
     }

src/main/java/com/pangding/web/authority/reqvo/GetRoleByRoleNameReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/RoleGetReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
- * @create 2019/5/10 20:27
+ * @create 2019/5/10 20:09
  */
-public class GetRoleByRoleNameReqVo {
+public class RoleGetReqVo {
+    private String id;
+
     private String name;
 
     public String getName() {
@@ -14,4 +16,12 @@ public class GetRoleByRoleNameReqVo {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

src/main/java/com/pangding/web/authority/reqvo/GetUserByAccountReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/UserGetReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 import org.springframework.context.annotation.Bean;
 
@@ -7,9 +7,39 @@ import org.springframework.context.annotation.Bean;
  * @create 2019/5/10 17:17
  */
 
-public class GetUserByAccountReqVo {
+public class UserGetReqVo {
     private String account;
 
+    private String companyId;
+
+    private String id;
+
+    private String phone;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     public String getAccount() {
         return account;
     }

src/main/java/com/pangding/web/authority/reqvo/GetUserRoleListByRoleIdReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/UserRoleGetReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/11 15:37
  */
-public class GetUserRoleListByRoleIdReqVo {
+public class UserRoleGetReqVo {
     private String roleId;
 
+    private String userId;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getRoleId() {
         return roleId;
     }

src/main/java/com/pangding/web/authority/reqvo/UserRoleDaoRemoveReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/UserRoleRemoveReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/10 19:47
  */
-public class UserRoleDaoRemoveReqVo {
+public class UserRoleRemoveReqVo {
     private String id;
 
     public String getId() {

src/main/java/com/pangding/web/authority/reqvo/GetRoleByRoleIdReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/WebAuthorityReqVo.java

-package com.pangding.web.authority.reqvo;
+package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
- * @create 2019/5/10 20:09
+ * @create 2019/5/15 15:59
  */
-public class GetRoleByRoleIdReqVo {
+public class WebAuthorityReqVo {
     private String id;
 
     public String getId() {

src/main/java/com/pangding/web/authority/vo/reqvo/WebAuthorityResVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.pangding.web.authority.vo.AuthorityVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/15 20:06
+ */
+public class WebAuthorityResVo extends AuthorityVo {
+
+}

src/main/java/com/pangding/web/authority/dto/RoleDto.java → src/main/java/com/pangding/web/authority/vo/reqvo/WebRoleReqVo.java

-package com.pangding.web.authority.dto;
+package com.pangding.web.authority.vo.reqvo;
 
 import com.pangding.web.authority.vo.RoleVo;
 
@@ -7,13 +7,10 @@ import java.util.List;
 /**
  * @author zhangjinyao
  */
-public class RoleDto extends RoleVo {
+public class WebRoleReqVo extends RoleVo {
 
     private List<String> authorityIds;
 
-
-    private List<String> authorityNames;
-
     public List<String> getAuthorityIds() {
         return authorityIds;
     }
@@ -22,11 +19,4 @@ public class RoleDto extends RoleVo {
         this.authorityIds = authorityIds;
     }
 
-    public List<String> getAuthorityNames() {
-        return authorityNames;
-    }
-
-    public void setAuthorityNames(List<String> authorityNames) {
-        this.authorityNames = authorityNames;
-    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/WebRoleResVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.RoleVo;
+
+import java.util.List;
+
+/**
+ * @author zhangjinyao
+ */
+public class WebRoleResVo extends RoleVo {
+
+    private List<AuthorityVo> authorityList;
+
+    public List<AuthorityVo> getAuthorityList() {
+        return authorityList;
+    }
+
+    public void setAuthorityList(List<AuthorityVo> authorityList) {
+        this.authorityList = authorityList;
+    }
+}

src/main/java/com/pangding/web/authority/dto/UserDto.java → src/main/java/com/pangding/web/authority/vo/reqvo/WebUserReqVo.java

-package com.pangding.web.authority.dto;
+package com.pangding.web.authority.vo.reqvo;
 
 import com.pangding.web.authority.vo.UserVo;
 
@@ -7,12 +7,10 @@ import java.util.List;
 /**
  * @author zhangjinyao
  */
-public class UserDto extends UserVo {
+public class WebUserReqVo extends UserVo {
 
     private List<String> roleIds;
 
-    private List<String> roles;
-
     public List<String> getRoleIds() {
         return roleIds;
     }
@@ -21,11 +19,4 @@ public class UserDto extends UserVo {
         this.roleIds = roleIds;
     }
 
-    public List<String> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(List<String> roles) {
-        this.roles = roles;
-    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/WebUserResVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.pangding.web.authority.vo.RoleVo;
+import com.pangding.web.authority.vo.UserVo;
+
+import java.util.List;
+
+/**
+ * @author zhangjinyao
+ */
+public class WebUserResVo extends UserVo {
+
+    private List<RoleVo> roleList;
+
+    public List<RoleVo> getRoleList() {
+        return roleList;
+    }
+
+    public void setRoleList(List<RoleVo> roleList) {
+        this.roleList = roleList;
+    }
+}