user/role/tright

src/main/java/com/pangding/web/UserApp.java

@@ -7,6 +7,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 日志自动启动服务
+ * @author Administrator
  */
 @SpringBootApplication(scanBasePackages = {
         "com.pangding.*",

src/main/java/com/pangding/web/demo/dao/pd/DemoDao.java

-package com.pangding.web.demo.dao.pd;
-
-
-import com.pangding.web.demo.vo.tbd.DemoVo;
-import com.yanzuoguang.dao.BaseDao;
-import com.yanzuoguang.util.vo.PageSizeData;
-import com.yanzuoguang.util.vo.PageSizeReqVo;
-
-/**
- * 日志接口基本操作类
- */
-public interface DemoDao extends BaseDao {
-    PageSizeData<DemoVo> query(PageSizeReqVo req);
-}

src/main/java/com/pangding/web/demo/dao/pd/impl/DemoDaoImpl.java

-package com.pangding.web.demo.dao.pd.impl;
-
-import com.pangding.web.demo.vo.tbd.DemoVo;
-import com.pangding.web.demo.dao.pd.DemoDao;
-import com.yanzuoguang.dao.DaoConst;
-import com.yanzuoguang.dao.Impl.BaseDaoImpl;
-import com.yanzuoguang.util.vo.PageSizeData;
-import com.yanzuoguang.util.vo.PageSizeReqVo;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DemoDaoImpl extends BaseDaoImpl implements DemoDao {
-    /**
-     * 注册SQL语句
-     */
-    @Override
-    protected void init() {
-        // 根据实体生成增删改查语句
-        register(DemoVo.class);
-
-        Table.add(DaoConst.Query, "SELECT * FROM tbd_demo");
-    }
-
-    @Override
-    public PageSizeData<DemoVo> query(PageSizeReqVo req) {
-        return this.queryPage(DemoVo.class, req, DaoConst.Query, req);
-    }
-}

src/main/java/com/pangding/web/demo/feign/DemoLogFeign.java

-package com.pangding.web.demo.feign;
-
-import com.yanzuoguang.util.vo.LogVo;
-import com.yanzuoguang.util.vo.ResponseResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/**
- * LogInterFeign
- *
- * @author: Kang
- * @time: 2018年04月25日 14:00
- */
-@FeignClient(value = "tbd-log")
-public interface DemoLogFeign {
-
-    /**
-     * 请求日志服务
-     *
-     * @param logVo
-     */
-    @RequestMapping(value = "/log/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    ResponseResult<String> save(LogVo logVo);
-}

src/main/java/com/pangding/web/demo/service/DemoService.java

-package com.pangding.web.demo.service;
-
-
-import com.pangding.web.demo.vo.tbd.DemoVo;
-import com.yanzuoguang.util.vo.PageSizeData;
-import com.yanzuoguang.util.vo.PageSizeReqVo;
-
-/**
- * 日志服务
- */
-public interface DemoService {
-    /**
-     * 保存接口请求日志
-     *
-     * @param logVo
-     */
-    String create(DemoVo logVo);
-
-    PageSizeData<DemoVo> query(PageSizeReqVo req);
-}

src/main/java/com/pangding/web/demo/service/impl/DemoServiceImpl.java

-package com.pangding.web.demo.service.impl;
-
-import com.pangding.web.demo.service.DemoService;
-import com.pangding.web.demo.vo.tbd.DemoVo;
-import com.pangding.web.demo.dao.pd.DemoDao;
-import com.yanzuoguang.util.vo.PageSizeData;
-import com.yanzuoguang.util.vo.PageSizeReqVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 日志写入服务类
- */
-@Component
-@Transactional
-public class DemoServiceImpl implements DemoService {
-
-    @Autowired
-    private DemoDao demoDao;
-
-    /**
-     * 保存接口请求日志
-     *
-     * @param demoVo
-     */
-    public String create(DemoVo demoVo) {
-        return demoDao.create(demoVo);
-    }
-
-    @Override
-    public PageSizeData<DemoVo> query(PageSizeReqVo req) {
-        return demoDao.query(req);
-    }
-
-}

src/main/java/com/pangding/web/demo/vo/tbd/DemoVo.java

-package com.pangding.web.demo.vo.tbd;
-
-
-import com.yanzuoguang.dao.TableAnnotation;
-
-@TableAnnotation("tbd_demo")
-public class DemoVo {
-    /**
-     * 编号,主键请放第一个
-     */
-    // @TableAnnotation("id")   // 假如是一样的字段，则不需要写映射
-    private String id;
-    /**
-     * 接口对象(通联,携程等)
-     */
-    private String name;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

src/main/java/com/pangding/web/demo/web/DemoController.java

-package com.pangding.web.demo.web;
-
-import com.pangding.web.demo.feign.DemoLogFeign;
-import com.pangding.web.demo.service.DemoService;
-import com.pangding.web.demo.vo.tbd.DemoVo;
-import com.yanzuoguang.util.exception.CodeException;
-import com.yanzuoguang.util.helper.CheckerHelper;
-import com.yanzuoguang.util.vo.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 日志操作控制类
- */
-@RestController
-@RequestMapping("/demo")
-public class DemoController {
-
-    @Autowired
-    private DemoService logsService;
-
-    @Autowired
-    private DemoLogFeign demoLogFeign;
-
-    /**
-     * 保存演示DEMO
-     *
-     * @param req
-     */
-    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult save(@RequestBody DemoVo req) {
-        CheckerHelper.newInstance()
-                .notBlankCheck("name", req.getName())
-                .checkException(req);
-        return ResponseResult.result(logsService.create(req));
-    }
-
-    /**
-     * 保存演示DEMO
-     *
-     * @param req
-     */
-    @RequestMapping(value = "/save_exception", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult save_exception(@RequestBody DemoVo req) {
-        throw new CodeException("01", "异常错误");
-    }
-
-    /**
-     * 保存演示DEMO
-     *
-     * @param req
-     */
-    @RequestMapping(value = "/log", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> log_exception(@RequestBody LogVo req) {
-        demoLogFeign.save(req);
-        return ResponseResult.result("保存成功");
-    }
-
-    /**
-     * 查询
-     * @param req
-     * @return
-     */
-    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<DemoVo>> query(@RequestBody PageSizeReqVo req){
-        return ResponseResult.result(logsService.query(req));
-    }
-}

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

@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 @RestController
 @RequestMapping("/roles")
 public class RoleController {
@@ -63,7 +66,7 @@ public class RoleController {
      * 查询角色列表
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @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());
@@ -88,10 +91,10 @@ public class RoleController {
 
     /**
      * 根据ID查询角色
-     * @param id
+     * @param
      * @return
      */
-    @RequestMapping(value = "/role", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "/role", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object role(@PathVariable String roleId){
         RoleVo roleVo = roleServiceImpl.getRoleById(roleId);
         List<String> trightIdList = roleServiceImpl.getTrightIdList(roleId);
@@ -107,14 +110,21 @@ public class RoleController {
 
     /**
      * 删除角色
-     * @param id
+     * @param
      * @return
      */
-    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "/delete/{roleId}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object delete(@PathVariable String roleId){
         roleServiceImpl.deleteRole(roleId);
-        roleServiceImpl.deleteRoleUser(roleServiceImpl.getRoleUserPKByRoleId(roleId));
-        roleServiceImpl.deleteRoleTright(roleServiceImpl.getRoleTrightPKByRoleId(roleId));
+        List<String> roleUserList = roleServiceImpl.getRoleUserPKListByRoleId(roleId);
+        for (String roleUserId:roleUserList) {
+            roleServiceImpl.deleteRoleUser(roleUserId);
+        }
+
+        List<String> roleTrightList = roleServiceImpl.getRoleTrightPKListByRoleId(roleId);
+        for (String roleTrightId:roleTrightList) {
+            roleServiceImpl.deleteRoleTright(roleTrightId);
+        }
         Result result = new Result(0,"SUCCESS",null);
         return result;
     }

src/main/java/com/pangding/web/tright/controller/TrightController.java

@@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 @RestController
 @RequestMapping("/tright")
 public class TrightController {
@@ -58,7 +61,7 @@ public class TrightController {
      * 查询权限列表
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object listTrights(){
         List<TrightVo> list = trightServiceImpl.listAllTright();
         if (list == null){
@@ -71,7 +74,7 @@ public class TrightController {
      * 查询一级权限
      * @return
      */
-    @RequestMapping(value = "/firstLevel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "/firstLevel", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object parentTrights(){
         List<TrightVo> list = trightServiceImpl.listLevel1();
         if (list == null){
@@ -85,7 +88,7 @@ public class TrightController {
      * @param id
      * @return
      */
-    @RequestMapping(value = "/role/{id}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "/role/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object tright(@PathVariable String id){
         TrightVo trightVo = trightServiceImpl.getTrightById(id);
         if (trightVo == null){
@@ -101,8 +104,35 @@ public class TrightController {
      */
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object delete(@PathVariable String id){
+        Boolean checkResult = trightServiceImpl.checkChild(id);
+        if (checkResult){
+            trightServiceImpl.deleteTrightById(id);
+            return new Result(0,"SUCCESS",null);
+        }
+        return new Result(4001,"该权限具有子权限，删除该权限会将其子权限一并删除",null);
+    }
+
+    /**
+     * 删除权限
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/delete/{id}/commit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object deleteWithChild(@PathVariable String id){
+        List<String> childIdList = trightServiceImpl.getChildIdList(id);
+        if (childIdList != null && childIdList.size() != 0){
+            for (String childId:childIdList) {
+                deleteWithChild(childId);
+            }
+        }
         trightServiceImpl.deleteTrightById(id);
-        Result result = new Result(0,"SUCCESS",null);
-        return result;
+        List<String> roleTrightList = trightServiceImpl.getRoleTrightPKListByTrightId(id);
+        for (String roleTrightId:roleTrightList) {
+            trightServiceImpl.deleteRoleTright(roleTrightId);
+        }
+
+        return new Result(0,"SUCCESS",null);
     }
 }
+
+

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

@@ -15,6 +15,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 @RestController
 @RequestMapping(value = "/user")
 public class UserController {
@@ -30,15 +33,13 @@ public class UserController {
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object saveUser(@RequestBody UserDto userDto){
-        //userDto.setPassword();
-        //检查用户是否存在
+
         UserVo u = userServiceImpl.getUser(userDto);
-        //存在，直接返回
+
         if (u != null) {
             return new Result(4001,"该用户已存在",null);
-            //throw new IllegalArgumentException(userDto.getUserName() + "已存在");
         }
-        //不存在，保存用户信息
+
         String saltPassword = userServiceImpl.passwordEncoder(userDto.getPassword());
         userDto.setPassword(saltPassword);
         userDao.create(userDto);
@@ -56,7 +57,7 @@ public class UserController {
      * @param //userDto
      * @return
      */
-    @RequestMapping(value = "/update", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object updateUser(@RequestBody UserDto userDto){
         UserVo u = userDto;
         u.setPassword(userServiceImpl.passwordEncoder(u.getPassword()));
@@ -70,18 +71,18 @@ public class UserController {
      * 查询用户列表
      * @return
      */
-    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @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 var1 = 0;var1 < userVoList.size();++var1){
+        for (int var1 = 0;var1 < userVoList.size();var1++){
             UserVo userVo = userVoList.get(var1);
             List<String> roleIdList = userServiceImpl.listRoleIdList(userVo);
             List<String> roleList = new ArrayList(roleIdList.size());
             for (int var2 = 0;var2 < roleIdList.size();++var2){
-                String role = userServiceImpl.getRoleByRoleId(roleIdList.get(var2));
+                String role = userServiceImpl.getRoleNameByRoleId(roleIdList.get(var2));
                 roleList.add(role);
             }
             UserDto userDto = userServiceImpl.makeUserDto(userVo,roleIdList,roleList);
@@ -106,8 +107,8 @@ public class UserController {
         }
         List<String> roleIdList = userServiceImpl.listRoleIdList(userVo);
         List<String> roleList = new ArrayList(roleIdList.size());
-        for (int var2 = 0;var2 < roleIdList.size();++var2){
-            String role = userServiceImpl.getRoleByRoleId(roleIdList.get(var2));
+        for (int var2 = 0;var2 < roleIdList.size();var2++){
+            String role = userServiceImpl.getRoleNameByRoleId(roleIdList.get(var2));
             roleList.add(role);
         }
         UserDto userDto = userServiceImpl.makeUserDto(userVo,roleIdList,roleList);

src/main/java/com/pangding/web/tright/currency/Result.java

@@ -2,10 +2,13 @@ package com.pangding.web.tright.currency;
 
 import java.io.Serializable;
 
+/**
+ * @author Administrator
+ */
 public class Result implements Serializable {
-    private Integer code;//状态码
-    private String message;//消息
-    private Object data;//
+    private Integer code;
+    private String message;
+    private Object data;
 
     public Result(Integer code, String message, Object data) {
         this.code = code;

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

@@ -7,20 +7,58 @@ import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public interface RoleDao extends BaseDao {
 
+    /**
+     * 通过主键id获取RoleVo对象
+     *
+     * @param id 主键
+     * @return  RoleVo对象
+     */
     RoleVo getRoleById(String id);
 
+    /**
+     * 通过角色名查询RoleVo对象
+     *
+     * @param name 角色名
+     * @return RoleVo对象
+     */
     RoleVo getRoleByName(String name);
 
+    /**
+     * 检查用户名是否已存在
+     * 若返回数据大于0，则已存在，该用户名不可用
+     * 为0则可用
+     *
+     * @param roleVo 需要检查的RoleVo对象
+     * @return RoleVo对象的用户名在数据库中是否使用过
+     */
     int checkNameExist(RoleVo roleVo);
 
+    /**
+     * 获取RoleVo对象列表
+     *
+     * @return RoleVo对象列表
+     */
     List<RoleVo> getRoleVoList();
 
+    /**
+     * 通过角色id查询该角色具有的权限id列表
+     *
+     * @param roleId 角色id
+     * @return 权限id列表
+     */
     List<String> getTrightIdList(String roleId);
 
+    /**
+     * 通过权限id查询权限名
+     * 
+     * @param trightId 权限id
+     * @return 权限名
+     */
     String getTrightNameByTrightId(String trightId);
 
-    int update(RoleVo roleVo);
-
 }

src/main/java/com/pangding/web/tright/dao/RoleTrightDao.java

@@ -2,6 +2,25 @@ package com.pangding.web.tright.dao;
 
 import com.yanzuoguang.dao.BaseDao;
 
+import java.util.List;
+
+/**
+ * @author zhangjinyao
+ */
 public interface RoleTrightDao extends BaseDao {
-    String getPKByRoleId(String roleId);
+    /**
+     * 通过角色id获取角色权限关系表主键列表
+     *
+     * @param roleId 角色id
+     * @return 角色权限关系表主键列表
+     */
+    List<String> getRoleTrightPKListByRoleId(String roleId);
+
+    /**
+     * 通过权限id获取角色权限关系表主键列表
+     *
+     * @param trightId 权限id
+     * @return 角色权限关系表主键列表
+     */
+    List<String> getRoleTrightPKListByTrightId(String trightId);
 }

src/main/java/com/pangding/web/tright/dao/TrightDao.java

@@ -5,19 +5,54 @@ import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public interface TrightDao extends BaseDao {
 
+    /**
+     * 检查新建或修改的TrightVo对象是否合法
+     *
+     * @param trightVo TrightVo对象
+     * @return 0：合法 else：不合法
+     */
     int checkValid(TrightVo trightVo);
 
+    /**
+     * 根据主键获取TrightVo对象
+     *
+     * @param id 主键
+     * @return TrightVo对象
+     */
     TrightVo getTrightById(String id);
 
-    int deleteRoleTright(String id);
-
-    //int deleteTrightById(String id);
-
-    int deleteByParentId(String id);
-
+    /**
+     * 获取TrightVo对象列表
+     *
+     * @return TrightVo对象列表
+     */
     List<TrightVo> listAll();
 
+    /**
+     * 获取一级权限列表
+     *
+     * @return 一级权限列表
+     */
     List<TrightVo> listLevel1();
+
+    /**
+     * 通过权限表主键查询是否拥有子权限
+     *
+     * @param id 主键
+     * @return 0：没有子权限 else：子权限个数
+     */
+    int checkChild(String id);
+
+    /**
+     * 通过权限表主键获取子权限id列表
+     *
+     * @param id 主键
+     * @return 子权限id列表
+     */
+    List<String> getChildIdList(String id);
 }

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

@@ -7,21 +7,48 @@ import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public interface UserDao extends BaseDao {
 
-//    int saveUser(UserVo userVo);
-//
-    UserVo getUser(UserVo userVo);
-
 
-//
-//    int update(UserVo userVo);
+    /**
+     * 通过UserVo对象获取相同的UserVo对象
+     *
+     * @param userVo UserVo对象
+     * @return UserVo对象
+     */
+    UserVo getUser(UserVo userVo);
 
+    /**
+     * 获取UserVo对象列表
+     *
+     * @return UserVo对象列表
+     */
     List<UserVo> listUserVo();
 
+    /**
+     * 通过UserVo对象获取该用户角色id列表
+     *
+     * @param userVo UserVo对象
+     * @return 角色id列表
+     */
     List<String> getRoleIdList(UserVo userVo);
 
-    String getRoleByRoleId(String roleId);
-
+    /**
+     * 通过角色id获取角色名
+     *
+     * @param roleId 角色id
+     * @return 角色名
+     */
+    String getRoleNameByRoleId(String roleId);
+
+    /**
+     * 通过用户id查询UserVo对象
+     *
+     * @param userId 用户id
+     * @return UserVo对象
+     */
     UserVo getUserById(String userId);
 }

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

@@ -2,7 +2,18 @@ package com.pangding.web.tright.dao;
 
 import com.yanzuoguang.dao.BaseDao;
 
+import java.util.List;
+
+/**
+ * @author zhangjinyao
+ */
 public interface UserRoleDao extends BaseDao {
 
-    String getPKByRoleId(String roleId);
+    /**
+     * 通过角色id获取角色用户表主键列表
+     *
+     * @param roleId 角色id
+     * @return 角色用户表主键列表
+     */
+    List<String> getRoleUserPKListByRoleId(String roleId);
 }

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

@@ -2,11 +2,14 @@ package com.pangding.web.tright.dao.impl;
 
 import com.pangding.web.tright.dao.RoleDao;
 import com.pangding.web.tright.vo.RoleVo;
-import com.yanzuoguang.dao.Impl.BaseDaoImpl;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 @Component
 public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
 
@@ -21,22 +24,22 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
     protected void init() {
         register(RoleVo.class);
 
-        Table.add(GET_ROLE_BY_ID,"select r.* from pd_role r where 1=1")
+        table.add(GET_ROLE_BY_ID,"select r.* from pd_role r where 1=1 ")
         .add("id","and r.id = ?");
 
-        Table.add(GET_ROLE_BY_NAME,"select r.* from pd_role r where 1=1")
+        table.add(GET_ROLE_BY_NAME,"select r.* from pd_role r where 1=1 ")
         .add("name","and r.name = ?");
 
-        Table.add(CHECK_NAME_EXIST,"select count(r.id) from pd_role r where 1=1")
-        .add("name","and r.name = ?")
+        table.add(CHECK_NAME_EXIST,"select count(r.id) from pd_role r where 1=1 ")
+        .add("name","and r.name = ? ")
         .add("id","and r.id <> ?");
 
-        Table.add(GET_ROLELIST,"select * from pd_role where 1=1");
+        table.add(GET_ROLELIST,"select * from pd_role where 1=1");
 
-        Table.add(GET_TRIGHTID_LIST,"select authority_id from pd_role_authority where 1=1")
+        table.add(GET_TRIGHTID_LIST,"select authority_id from pd_role_authority where 1=1 ")
         .add("roleId","and role_id = ?");
 
-        Table.add(GET_TRIGHTNAME_BY_TRIGHTID,"select name from pd_authority where 1=1")
+        table.add(GET_TRIGHTNAME_BY_TRIGHTID,"select name from pd_authority where 1=1 ")
         .add("trightId","and id = ?");
 
     }
@@ -70,10 +73,4 @@ public class RoleDaoImpl extends BaseDaoImpl implements RoleDao {
     public String getTrightNameByTrightId(String trightId) {
         return this.queryFirst(String.class,GET_TRIGHTNAME_BY_TRIGHTID,trightId);
     }
-
-    @Override
-    public int update(RoleVo roleVo) {
-        return 0;
-    }
-
 }

src/main/java/com/pangding/web/tright/dao/impl/RoleTrightDaoImpl.java

@@ -2,25 +2,40 @@ package com.pangding.web.tright.dao.impl;
 
 import com.pangding.web.tright.dao.RoleTrightDao;
 import com.pangding.web.tright.vo.RoleTrightRelation;
-import com.yanzuoguang.dao.Impl.BaseDaoImpl;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
+/**
+ * @author zhangjinyao
+ */
 @Component
 public class RoleTrightDaoImpl extends BaseDaoImpl implements RoleTrightDao {
 
-    private static final String GET_PK_BY_ROLEID = "GET_PK_BY_ROLEID";
+    private static final String GET_ROLE_TRIGHT_PKLIST_BY_ROLEID = "GET_ROLE_TRIGHT_PKLIST_BY_ROLEID";
+    private static final String GET_ROLE_TRIGHT_PKLIST_BY_TRIGHTID = "GET_ROLE_TRIGHT_PKLIST_BY_TRIGHTID";
 
     @Override
     protected void init() {
 
         register(RoleTrightRelation.class);
 
-        Table.add(GET_PK_BY_ROLEID,"select id from pd_role_authority where 1=1")
+        table.add(GET_ROLE_TRIGHT_PKLIST_BY_ROLEID,"select id from pd_role_authority where 1=1 ")
         .add("roleId","and role_id = ?");
+
+        table.add(GET_ROLE_TRIGHT_PKLIST_BY_TRIGHTID,"select id from pd_role_authority where 1=1 ")
+        .add("trightId","and tright_id = ?");
+    }
+
+    @Override
+    public List<String> getRoleTrightPKListByRoleId(String roleId) {
+
+        return this.query(String.class,GET_ROLE_TRIGHT_PKLIST_BY_ROLEID,roleId);
     }
 
     @Override
-    public String getPKByRoleId(String roleId) {
-        return this.queryFirst(String.class,GET_PK_BY_ROLEID,roleId);
+    public List<String> getRoleTrightPKListByTrightId(String trightId) {
+        return this.query(String.class,GET_ROLE_TRIGHT_PKLIST_BY_TRIGHTID,trightId);
     }
 }

src/main/java/com/pangding/web/tright/dao/impl/TrightDaoImpl.java

@@ -2,10 +2,13 @@ package com.pangding.web.tright.dao.impl;
 
 import com.pangding.web.tright.dao.TrightDao;
 import com.pangding.web.tright.vo.TrightVo;
-import com.yanzuoguang.dao.Impl.BaseDaoImpl;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+/**
+ * @author zhangjinyao
+ */
 @Component
 public class TrightDaoImpl extends BaseDaoImpl implements TrightDao {
 
@@ -13,22 +16,30 @@ public class TrightDaoImpl extends BaseDaoImpl implements TrightDao {
     private static final String GET_TRIGHT_BY_ID = "GET_TRIGHT_BY_ID";
     private static final String LIST_ALL = "LIST_ALL";
     private static final String LIST_LEVEL_ONE = "LIST_LEVEL_ONE";
+    private static final String CHECK_CHILD = "CHECK_CHILD";
+    private static final String GET_CHILDID_LIST = "GET_CHILDID_LIST";
 
     @Override
     protected void init() {
         register(TrightVo.class);
 
-        Table.add(CHECK_VALID,"select count(a.id) from pd_authority a where 1=1")
-        .add("name","and a.name = ?")
-        .add("url","and a.url = ?")
+        table.add(CHECK_VALID,"select count(a.id) from pd_authority a where 1=1 ")
+        .add("name","and a.name = ? ")
+        .add("url","and a.url = ? ")
         .add("id","and a.id <> ?");
 
-        Table.add(GET_TRIGHT_BY_ID,"select * from pd_authority where 1=1")
+        table.add(GET_TRIGHT_BY_ID,"select * from pd_authority where 1=1 ")
         .add("id","and id = ?");
 
-        Table.add(LIST_ALL,"select * from pd_authority where 1=1");
+        table.add(LIST_ALL,"select * from pd_authority where 1=1");
 
-        Table.add(LIST_LEVEL_ONE,"select * from pd_authority where pid=null");
+        table.add(LIST_LEVEL_ONE,"select * from pd_authority where pid=null");
+
+        table.add(CHECK_CHILD,"select count(id) from pd_authority where 1=1 ")
+        .add("id","and pid = ?");
+
+        table.add(GET_CHILDID_LIST,"select id from pd_authority where 1=1 ")
+        .add("id","and pid = ?");
     }
 
     @Override
@@ -41,16 +52,6 @@ public class TrightDaoImpl extends BaseDaoImpl implements TrightDao {
         return this.queryFirst(TrightVo.class,GET_TRIGHT_BY_ID,id);
     }
 
-    @Override
-    public int deleteRoleTright(String id) {
-        return 0;
-    }
-
-    @Override
-    public int deleteByParentId(String id) {
-        return 0;
-    }
-
     @Override
     public List<TrightVo> listAll() {
 
@@ -63,5 +64,13 @@ public class TrightDaoImpl extends BaseDaoImpl implements TrightDao {
         return this.query(TrightVo.class,LIST_LEVEL_ONE,null);
     }
 
+    @Override
+    public int checkChild(String id) {
+        return this.queryFirst(int.class,CHECK_CHILD,id);
+    }
 
+    @Override
+    public List<String> getChildIdList(String id) {
+        return this.query(String.class,GET_CHILDID_LIST,id);
+    }
 }

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

@@ -5,7 +5,7 @@ import com.pangding.web.tright.dto.UserDto;
 import com.pangding.web.tright.vo.UserRoleRelation;
 import com.pangding.web.tright.vo.UserVo;
 import com.yanzuoguang.dao.DaoConst;
-import com.yanzuoguang.dao.Impl.BaseDaoImpl;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.MapRow;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.PageSizeReqVo;
@@ -15,6 +15,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+/**
+ * @author zhangjinyao
+ */
 @Component
 public class UserDaoImpl extends BaseDaoImpl implements UserDao {
 
@@ -31,21 +34,21 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     protected void init() {
         register(UserVo.class);
 
-        Table.add(GET_USER, "SELECT  id,account,phone,status,remark,create_time,creator FROM pd_user  WHERE 1=1 ")
+        table.add(GET_USER, "SELECT  id,account,phone,status,remark,create_time,creator FROM pd_user  WHERE 1=1 ")
                 .add("account", " AND account = ?");
 
-        Table.add(DELETE_USER_ROLE,"delete from pd_user_role_relation where 1=1")
+        table.add(DELETE_USER_ROLE,"delete from pd_user_role_relation where 1=1 ")
                 .add("userId","and user_id = ?");
 
-        Table.add(GET_ALL_USERS,"select id,account,phone,status,remark,create_time,creator from pd_user where 1=1");
+        table.add(GET_ALL_USERS,"select id,account,phone,status,remark,create_time,creator from pd_user where 1=1");
 
-        Table.add(GET_ROLE_IDS,"select role_id from pd_user_role where 1=1")
+        table.add(GET_ROLE_IDS,"select role_id from pd_user_role where 1=1 ")
                 .add("userId","and user_id = ?");
 
-        Table.add(GET_USER_BY_ID,"select id,account,phone,status,remark,create_time,creator from pd_user where 1=1")
+        table.add(GET_USER_BY_ID,"select id,account,phone,status,remark,create_time,creator from pd_user where 1=1 ")
                 .add("userId","and user_id = ?");
 
-        Table.add(GET_ROLE_BY_ROLEID,"select name from pd_role where 1=1")
+        table.add(GET_ROLE_BY_ROLEID,"select name from pd_role where 1=1 ")
                 .add("roleId","and id = ?");
 
     }
@@ -69,7 +72,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     }
 
     @Override
-    public String getRoleByRoleId(String roleId) {
+    public String getRoleNameByRoleId(String roleId) {
         return this.queryFirst(String.class,GET_ROLE_BY_ROLEID,roleId);
     }
 

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

@@ -2,26 +2,31 @@ package com.pangding.web.tright.dao.impl;
 
 import com.pangding.web.tright.dao.UserRoleDao;
 import com.pangding.web.tright.vo.UserRoleRelation;
-import com.yanzuoguang.dao.Impl.BaseDaoImpl;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
+/**
+ * @author zhangjinyao
+ */
 @Component
 public class UserRoleDaoImpl extends BaseDaoImpl implements UserRoleDao {
 
-    private static final String GET_PK_BY_ROLEID = "GET_PK_BY_ROLEID";
+    private static final String GET_ROLE_USER_PK_BY_ROLEID = "GET_ROLE_USER_PK_BY_ROLEID";
 
     @Override
     protected void init() {
 
         register(UserRoleRelation.class);
 
-        Table.add(GET_PK_BY_ROLEID,"select id from pd_user_role where 1=1")
+        table.add(GET_ROLE_USER_PK_BY_ROLEID,"select id from pd_user_role where 1=1 ")
                 .add("roleId","and role_id = ?");
 
     }
 
     @Override
-    public String getPKByRoleId(String roleId) {
-        return this.queryFirst(String.class,GET_PK_BY_ROLEID,roleId);
+    public List<String> getRoleUserPKListByRoleId(String roleId) {
+        return this.query(String.class,GET_ROLE_USER_PK_BY_ROLEID,roleId);
     }
 }

src/main/java/com/pangding/web/tright/dto/RoleDto.java

@@ -4,6 +4,9 @@ import com.pangding.web.tright.vo.RoleVo;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public class RoleDto extends RoleVo {
 
     private List<String> trightIds;

src/main/java/com/pangding/web/tright/dto/UserDto.java

@@ -4,6 +4,9 @@ import com.pangding.web.tright.vo.UserVo;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public class UserDto extends UserVo {
 
     private List<String> roleIds;

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

@@ -5,33 +5,116 @@ import com.pangding.web.tright.vo.RoleVo;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public interface RoleService {
 
+    /**
+     * 保存RoleVo对象
+     *
+     * @param roleVo RoleVo对象
+     */
     void saveRole(RoleVo roleVo);
 
+    /**
+     * 通过主键id查询RoleVo对象
+     *
+     * @param id 主键
+     * @return RoleVo对象
+     */
     RoleVo getRoleById(String id);
 
+    /**
+     * 通过角色名查询RoleVo对象
+     *
+     * @param name 角色名
+     * @return RoleVo对象
+     */
     RoleVo getRoleByName(String name);
 
+    /**
+     * 保存角色与权限的对应关系
+     *
+     * @param roleDto RoleDto对象
+     */
     void roleAndTright(RoleDto roleDto);
 
+    /**
+     * 检查角色名是否已存在
+     *
+     * @param roleVo RoleVo对象
+     * @return 角色名是否存在
+     */
     Boolean checkNameExist(RoleVo roleVo);
 
+    /**
+     * 获取RoleVo对象列表
+     *
+     * @return RoleVo对象列表
+     */
     List<RoleVo> getRoleVoList();
 
+    /**
+     * 通过角色id查询该角色权限id列表
+     *
+     * @param roleId 角色id
+     * @return 权限id列表
+     */
     List<String> getTrightIdList(String roleId);
 
+    /**
+     * 通过权限id查询权限名
+     *
+     * @param trightId 权限id
+     * @return 权限名
+     */
     String getTrightNameByTrightId(String trightId);
 
+    /**
+     * 将RoleVo对象添加权限ID列表和权限名列表封装成RoleDto对象
+     *
+     * @param roleVo RoleVo对象
+     * @param trightIdList 权限id列表
+     * @param trightNameList 权限名列表
+     * @return RoleDto对象
+     */
     RoleDto makeRoleDto(RoleVo roleVo,List<String> trightIdList,List<String> trightNameList);
 
+    /**
+     * 通过角色id删除角色
+     *
+     * @param roleId 角色id
+     */
     void deleteRole(String roleId);
 
+    /**
+     * 通过角色id删除角色与用户的对应关系
+     *
+     * @param roleId 角色id
+     */
     void deleteRoleUser(String roleId);
 
+    /**
+     * 通过角色id删除角色权限的对应关系
+     *
+     * @param roleId 角色id
+     */
     void deleteRoleTright(String roleId);
 
-    String getRoleUserPKByRoleId(String roleId);
-
-    String getRoleTrightPKByRoleId(String roleId);
+    /**
+     * 通过角色id获取角色用户关系表主键列表
+     *
+     * @param roleId 角色id
+     * @return 角色用户关系表主键列表
+     */
+    List<String> getRoleUserPKListByRoleId(String roleId);
+
+    /**
+     * 通过角色id获取角色权限主键列表
+     *
+     * @param roleId 角色id
+     * @return 角色权限主键列表
+     */
+    List<String> getRoleTrightPKListByRoleId(String roleId);
 }

src/main/java/com/pangding/web/tright/service/TrightService.java

@@ -4,18 +4,89 @@ import com.pangding.web.tright.vo.TrightVo;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public interface TrightService {
+    /**
+     * 保存TrightVo对象数据
+     *
+     * @param trightVo TrightVo对象
+     */
     void save(TrightVo trightVo);
 
+    /**
+     * 更新TrightVo对象数据
+     *
+     * @param trightVo TrightVo对象
+     */
     void update(TrightVo trightVo);
 
+    /**
+     * 通过权限表主键获取TrightVo对象
+     *
+     * @param id 主键
+     * @return TrightVo对象
+     */
     TrightVo getTrightById(String id);
 
+    /**
+     * 通过权限表主键删除TrightVo对象
+     *
+     * @param id 主键
+     */
     void deleteTrightById(String id);
 
+    /**
+     * 检查新建、修改的TrightVo对象是否合法
+     *
+     * @param trightVo TrightVo对象
+     * @return 0：合法 else：不合法
+     */
     Boolean checkValid(TrightVo trightVo);
 
+    /**
+     * 获取TrightVo对象列表
+     *
+     * @return TrightVo对象列表
+     */
     List<TrightVo> listAllTright();
 
+    /**
+     * 获取一级权限列表
+     *
+     * @return 一级权限列表
+     */
     List<TrightVo> listLevel1();
+
+    /**
+     * 通过权限id查询是否存在子权限
+     *
+     * @param id 权限id
+     * @return 是否存在子权限
+     */
+    Boolean checkChild(String id);
+
+    /**
+     * 通过权限id获取子权限id列表
+     *
+     * @param id 权限id
+     * @return 子权限id列表
+     */
+    List<String> getChildIdList(String id);
+
+    /**
+     * 通过权限id获取角色权限表主键列表
+     *
+     * @param id 权限id
+     * @return 角色权限表主键列表
+     */
+    List<String> getRoleTrightPKListByTrightId(String id);
+
+    /**
+     * 通过角色权限表主键删除角色权限对应关系
+     *
+     * @param roleTrightId 角色权限表主键
+     */
+    void deleteRoleTright(String roleTrightId);
 }

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

@@ -6,21 +6,72 @@ import com.pangding.web.tright.vo.UserVo;
 import java.lang.reflect.Array;
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 public interface UserService {
 
+    /**
+     * 保存用户和角色的对应关系
+     *
+     * @param userDto UserDto对象
+     */
     void userAndRole(UserDto userDto);
 
+    /**
+     * 通过UserVo对象获取相同的UserVo对象
+     *
+     * @param userVo UserVo对象
+     * @return UserVo对象
+     */
     UserVo getUser(UserVo userVo);
 
+    /**
+     * 对密码进行MD5盐值加密
+     *
+     * @param password 密码
+     * @return 加密后的密码
+     */
     String passwordEncoder(String password);
 
+    /**
+     * 获取UserVo对象列表
+     *
+     * @return UserVo对象列表
+     */
     List<UserVo> listUserVo();
 
+    /**
+     * 通过UserVo对象获取该用户的角色ID列表
+     *
+     * @param userVo UserVo对象
+     * @return 角色id列表
+     */
     List<String> listRoleIdList(UserVo userVo);
 
-    String getRoleByRoleId(String roleId);
+    /**
+     * 通过角色id获取角色名
+     *
+     * @param roleId 角色id
+     * @return 角色名
+     */
+    String getRoleNameByRoleId(String roleId);
 
-    UserDto makeUserDto(UserVo userVo,List<String> roleIdList,List<String> roleList);
+    /**
+     * 将UserVo对象添加角色id列表和角色名列表封装成UserDto对象
+     *
+     * @param userVo UserVo对象
+     * @param roleIdList 角色id列表
+     * @param roleNameList 角色名列表
+     * @return UserDto对象
+     */
+    UserDto makeUserDto(UserVo userVo,List<String> roleIdList,List<String> roleNameList);
 
+    /**
+     * 通过用户id查询UserVo对象
+     *
+     * @param userId 用户id
+     * @return UserVo对象
+     */
     UserVo getUserById(String userId);
 }

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

@@ -17,6 +17,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+/**
+ * @author zhangjinyao
+ */
 @Service
 public class RoleServiceImpl implements RoleService {
 
@@ -105,12 +108,13 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public String getRoleUserPKByRoleId(String roleId) {
-        return userRoleDaoImpl.getPKByRoleId(roleId);
+    public List<String> getRoleUserPKListByRoleId(String roleId) {
+        return userRoleDaoImpl.getRoleUserPKListByRoleId(roleId);
     }
 
     @Override
-    public String getRoleTrightPKByRoleId(String roleId) {
-        return roleTrightDaoImpl.getPKByRoleId(roleId);
+    public List<String> getRoleTrightPKListByRoleId(String roleId) {
+
+        return roleTrightDaoImpl.getRoleTrightPKListByRoleId(roleId);
     }
 }

src/main/java/com/pangding/web/tright/service/impl/TrightServiceImpl.java

 package com.pangding.web.tright.service.impl;
 
+import com.pangding.web.tright.dao.RoleTrightDao;
 import com.pangding.web.tright.dao.TrightDao;
 import com.pangding.web.tright.service.TrightService;
 import com.pangding.web.tright.vo.TrightVo;
@@ -8,11 +9,18 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+/**
+ * @author zhangjinyao
+ */
 @Service
 public class TrightServiceImpl implements TrightService {
 
     @Autowired
     TrightDao trightDao;
+
+    @Autowired
+    RoleTrightDao roleTrightDao;
+
     @Override
     public void save(TrightVo trightVo) {
         trightDao.create(trightVo);
@@ -38,10 +46,7 @@ public class TrightServiceImpl implements TrightService {
 
     @Override
     public void deleteTrightById(String id) {
-        trightDao.deleteRoleTright(id);
-        //trightDao.deleteTrightById(id);
         trightDao.remove(id);
-        trightDao.deleteByParentId(id);
     }
 
     @Override
@@ -55,4 +60,28 @@ public class TrightServiceImpl implements TrightService {
         List<TrightVo> list = trightDao.listLevel1();
         return (list != null && list.size() != 0) ? list : null;
     }
+
+    @Override
+    public Boolean checkChild(String id) {
+        int childNum = trightDao.checkChild(id);
+        return childNum == 0 ? true : false;
+    }
+
+    @Override
+    public List<String> getChildIdList(String id) {
+
+        return trightDao.getChildIdList(id);
+    }
+
+    @Override
+    public List<String> getRoleTrightPKListByTrightId(String id) {
+
+        return roleTrightDao.getRoleTrightPKListByTrightId(id);
+    }
+
+    @Override
+    public void deleteRoleTright(String roleTrightId) {
+
+        roleTrightDao.remove(roleTrightId);
+    }
 }

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

@@ -14,6 +14,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+/**
+ * @author zhangjinyao
+ */
 @Service
 public class UserServiceImpl implements UserService {
 
@@ -22,14 +25,14 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public List<UserVo> listUserVo() {
-//        return userDao.listUser();
+
         return userDao.listUserVo();
     }
 
     @Override
     public void userAndRole(UserDto userDto) {
 
-        List<String> roleIds = userDto.getRoleIds();//多个角色
+        List<String> roleIds = userDto.getRoleIds();
 
         for (String roleId : roleIds) {
             UserRoleRelation userRoleRelation = new UserRoleRelation();
@@ -64,8 +67,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String getRoleByRoleId(String roleId) {
-        return userDao.getRoleByRoleId(roleId);
+    public String getRoleNameByRoleId(String roleId) {
+        return userDao.getRoleNameByRoleId(roleId);
     }
 
     @Override

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

@@ -5,21 +5,27 @@ 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();
-        if (len < 16) {
-            for (int i = 0; i < 16 - len; i++) {
+        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];
-        for (int i = 0; i < 48; i += 3) {
+        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;
@@ -42,7 +48,9 @@ public class Md5AndSalt {
     public static boolean verify(String password, String md5) {
         char[] cs1 = new char[32];
         char[] cs2 = new char[16];
-        for (int i = 0; i < 48; i += 3) {
+        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);

src/main/java/com/pangding/web/tright/utils/UserUtil.java

-package com.pangding.web.tright.utils;
-
-public class UserUtil {
-
-}

src/main/java/com/pangding/web/tright/vo/RoleTrightRelation.java

@@ -4,14 +4,17 @@ import com.yanzuoguang.dao.TableAnnotation;
 
 import java.io.Serializable;
 
+/**
+ * @author zhangjinyao
+ */
 @TableAnnotation("pd_role_authority")
 public class RoleTrightRelation implements Serializable {
-    /*主键id*/
+
     private String id;
     @TableAnnotation("role_id")
-    /*角色id*/
+
     private String roleId;
-    /*权限id*/
+
     @TableAnnotation("authority_id")
     private String trightId;
 

src/main/java/com/pangding/web/tright/vo/RoleVo.java

@@ -5,16 +5,19 @@ import com.yanzuoguang.dao.TableAnnotation;
 import java.io.Serializable;
 import java.util.Date;
 
+/**
+ * @author zhangjinyao
+ */
 @TableAnnotation("pd_role")
 public class RoleVo implements Serializable {
 
-    private String id;//主键id
+    private String id;
 
-    private String pid;//父角色id
+    private String pid;
 
-    private String name;//角色名
+    private String name;
 
-    private String remark;//描述
+    private String remark;
 
     public String getId() {
         return id;

src/main/java/com/pangding/web/tright/vo/TrightVo.java

@@ -10,28 +10,30 @@ import java.sql.Timestamp;
 
 /**
  * 权限表
+ * @author zhangjinyao
  */
 @TableAnnotation("pd_authority")
 public class TrightVo implements Serializable, InitDao {
-    //主键id
+
     private String id;
-    //父权限id
+
     private String pid;
-    //权限名
+
     private String name;
-    //权限类型
+
     private String type;
-    //别名
+
     private String alias;
-    //权限url
+
     private String url;
+
     @TableAnnotation("open_mode")
-    //打开方式
     private String openMode;
-    //描述
+
     private String remark;
+
     @TableAnnotation("create_time")
-    //创建时间
+
     private Timestamp createTime;
 
     public String getId() {

src/main/java/com/pangding/web/tright/vo/UserRoleRelation.java

@@ -4,15 +4,18 @@ import com.yanzuoguang.dao.TableAnnotation;
 
 import java.io.Serializable;
 
+/**
+ * @author zhangjinyao
+ */
 @TableAnnotation("pd_user_role")
 public class UserRoleRelation implements Serializable {
 
     private String id;
+
     @TableAnnotation("user_id")
-    /*用户id*/
     private String userId;
+
     @TableAnnotation("role_id")
-    /*角色id*/
     private String roleId;
 
     public String getId() {

src/main/java/com/pangding/web/tright/vo/UserVo.java

@@ -9,25 +9,27 @@ import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;
 
+/**
+ * @author zhangjinyao
+ */
 @TableAnnotation("pd_user")
 public class UserVo implements Serializable, InitDao {
 
-    /*主键id*/
     private String id;
-    /*账号*/
+
     private String account;
-    /*密码*/
+
     private String password;
-    /*手机号*/
+
     private String phone;
-    /*状态*/
+
     private String status;
-    /*描述*/
+
     private String remark;
+
     @TableAnnotation("create_time")
-    /*创建时间*/
     private Timestamp createTime;
-    /*创建人*/
+
     private String creator;
 
     public String getId() {