修改角色信息

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysRolePO.java

@@ -32,6 +32,11 @@ public class SysRolePO extends NewBaseDomain {
     private String roleCode;
 
     /**
+     * 角色类型
+     */
+    private Integer roleType;
+
+    /**
      * 是否可用
      */
     private Integer roleAvailable;

energy-manage-common/src/main/java/com/energy/manage/common/po/system/SysUserInfoPO.java

@@ -20,7 +20,10 @@ import javax.persistence.Table;
 @Accessors(chain = true)
 public class SysUserInfoPO extends NewBaseDomain {
 
-
+    /**
+     * 登录名
+     */
+    private String loginName;
     /**
      * 用户名称
      */

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysRoleController.java

@@ -61,6 +61,7 @@ public class SysRoleController {
 		rolePO = new SysRolePO();
 		rolePO.setRoleCode(roleAddDto.getRoleCode());
 		rolePO.setRoleDescription(roleAddDto.getRoleName());
+		rolePO.setRoleType(roleAddDto.getRoleType());
 		rolePO.setRoleAvailable(Constants.GLOBAL_IN_USE);
 		rolePO.setCreateTime(new Date());
 		rolePO.setUpdateTime(new Date());
@@ -102,6 +103,7 @@ public class SysRoleController {
 		rolePO.setId(roleUpdateDto.getRoleId());
 		rolePO.setRoleDescription(roleUpdateDto.getRoleName());
 		rolePO.setRoleCode(roleUpdateDto.getRoleCode());
+		rolePO.setRoleType(roleUpdateDto.getRoleType());
 		boolean flag = sysRoleService.updateRole(rolePO);
 		if (flag) {
 			return ResultResp.SUCCESS();
@@ -132,8 +134,9 @@ public class SysRoleController {
 	 */
 	@UserLoginToken
 	@PostMapping(value = "/通过角色名称查询角色列表")
+	@ApiOperation(value = "角色分页列表")
 	public ResultResp<Page<SysRolePO>> getRoleListByName(@RequestBody RoleListDto roleListDto) {
-		Page<SysRolePO> page = sysRoleService.getRoleListByName(roleListDto.getPageNum(), roleListDto.getPageSize(), roleListDto.getRoleName());
+		Page<SysRolePO> page = sysRoleService.getRoleListByName(roleListDto.getPageNum(), roleListDto.getPageSize(), roleListDto.getRoleName(),roleListDto.getRoleAvailable());
 		return ResultResp.SUCCESS(page);
 	}
 

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysUserInfoController.java

@@ -66,7 +66,7 @@ public class SysUserInfoController {
             return ResultResp.NOTNULLPARAM();
         }
         SysUserInfoPO userPO = new SysUserInfoPO();
-        userPO.setUserName(userAddDto.getUserName());
+        userPO.setLoginName(userAddDto.getLoginName());
         userPO = sysUserInfoService.selectOne(userPO);
         if (null != userPO) {
             log.info("用户名已被占用！");
@@ -75,6 +75,7 @@ public class SysUserInfoController {
         userPO = new SysUserInfoPO();
         userPO.setUserPhone(userAddDto.getPhone());
         userPO.setState(Constants.GLOBAL_IN_USE);
+        userPO.setLoginName(userAddDto.getLoginName());
         userPO.setUserName(userAddDto.getUserName());
         userPO.setUserPassword(BCryptTools.hashpw(userAddDto.getPwd()));
         userPO.setCreateTime(new Date());
@@ -268,7 +269,7 @@ public class SysUserInfoController {
         }
 
         SysUserInfoPO userPO = new SysUserInfoPO();
-        userPO.setUserName(userName);
+        userPO.setLoginName(userName);
         userPO = sysUserInfoService.selectOne(userPO);
         if (null == userPO || null == userPO.getId()) {
             return ResultResp.NOTEXISTSUSER();
@@ -283,7 +284,7 @@ public class SysUserInfoController {
         }
 
 
-        String token = JwtUtil.getLoginToken(userPO.getId(), userPO.getUserName(), userPO.getUserPhone(), userPO.getUserPassword());
+        String token = JwtUtil.getLoginToken(userPO.getId(), userPO.getLoginName(), userPO.getUserPhone(), userPO.getUserPassword());
         Map<String, Object> map = new HashMap<>(4);
 
         List<PermissionVo> list = permissionService.getRolePermissionByUserId(userPO.getId());

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleAddDto.java

@@ -15,6 +15,11 @@ public class RoleAddDto {
     private String roleName;
     @ApiModelProperty(value = "角色code")
     private String roleCode;
+    /**
+     * 角色类型
+     */
+    @ApiModelProperty(value = "角色类型")
+    private Integer roleType;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleListDto.java

@@ -15,4 +15,7 @@ public class RoleListDto extends BaseDto {
     @ApiModelProperty(value = "角色名字")
     private String roleName;
 
+    @ApiModelProperty(value = "状态1 启用 0停用")
+    private Integer roleAvailable;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/RoleUpdateDto.java

@@ -17,5 +17,10 @@ public class RoleUpdateDto {
     private String roleName;
     @ApiModelProperty(value = "角色code")
     private String roleCode;
+    /**
+     * 角色类型
+     */
+    @ApiModelProperty(value = "角色类型")
+    private Integer roleType;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/UserAddDto.java

@@ -14,6 +14,12 @@ public class UserAddDto {
     @ApiModelProperty(value = "用户名字")
     private String userName;
 
+    /**
+     * 登录名
+     */
+    @ApiModelProperty(value = "登录名")
+    private String loginName;
+
     @ApiModelProperty(value = "密码")
     private String pwd = "123456";
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/system/UserUpdateDto.java

@@ -14,6 +14,8 @@ public class UserUpdateDto {
     private String phone;
     @ApiModelProperty("用户名字")
     private String userName;
+    @ApiModelProperty("登录名")
+    private String loginName;
     @ApiModelProperty("密码")
     private String pwd = "123456";
     @ApiModelProperty("角色id")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/UserRoleVo.java

@@ -20,6 +20,11 @@ public class UserRoleVo implements Serializable {
   private Long roleId;
   @ApiModelProperty("用户名字")
   private String userName;
+  /**
+   * 登录名
+   */
+  @ApiModelProperty(value = "登录名")
+  private String loginName;
   @ApiModelProperty("角色名字")
   private String roleName;
   @ApiModelProperty("用户手机号")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/system/UserVo.java

@@ -18,6 +18,11 @@ import java.io.Serializable;
 public class UserVo implements Serializable {
   @ApiModelProperty("用户id")
   private Long userId;
+  /**
+   * 登录名
+   */
+  @ApiModelProperty(value = "登录名")
+  private String loginName;
   @ApiModelProperty("用户名字")
   private String userName;
   @ApiModelProperty("用户手机号")

energy-manage-service/src/main/java/com/energy/manage/service/mappers/system/SysRoleMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Repository
 public interface SysRoleMapper extends MyMapper<SysRolePO> {
 
-    List<SysRolePO> getRoleListByName(@Param("roleName") String roleName);
+    List<SysRolePO> getRoleListByName(@Param("roleName") String roleName,@Param("roleAvailable") Integer roleAvailable);
 
     int updateRoleSelective(SysRolePO rolePO);
 

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysRoleService.java

@@ -17,7 +17,7 @@ public interface SysRoleService extends BaseService<SysRolePO> {
 
     boolean updateRole(SysRolePO rolePO);
 
-    Page<SysRolePO> getRoleListByName(Integer pageNum, Integer pageSize, String roleName);
+    Page<SysRolePO> getRoleListByName(Integer pageNum, Integer pageSize, String roleName,Integer roleAvailable);
 
     SysRolePO getSysRole(Integer userId);
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysRoleServiceImpl.java

@@ -67,9 +67,9 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRolePO> implements Sy
 	}
 
 	@Override
-	public Page<SysRolePO> getRoleListByName(Integer pageNum, Integer pageSize, String roleName) {
+	public Page<SysRolePO> getRoleListByName(Integer pageNum, Integer pageSize, String roleName,Integer roleAvailable) {
 		PageHelper.startPage(pageNum, pageSize);
-		List<SysRolePO> list = sysRoleMapper.getRoleListByName(roleName);
+		List<SysRolePO> list = sysRoleMapper.getRoleListByName(roleName,roleAvailable);
 		Long total = CollectionUtils.isEmpty(list) ? 0L : new PageInfo<>(list).getTotal();
 		return Page.build(pageNum, pageSize, total, list);
 	}

energy-manage-service/src/main/resources/mybatis/system/RoleMapper.xml

@@ -7,12 +7,16 @@
         id AS id,
         role_description AS roleDescription,
         role_code AS roleCode,
-        role_available AS roleAvailable
+        role_available AS roleAvailable,
+        role_type as roleType
         FROM sys_role
         <where>
             <if test="null != roleName and '' != roleName">
                 role_description LIKE CONCAT('%',#{roleName,jdbcType=VARCHAR},'%')
             </if>
+            <if test="null != roleAvailable and '' != roleAvailable">
+                role_available = #{roleAvailable}
+            </if>
         </where>
         ORDER BY id ASC
     </select>

energy-manage-service/src/main/resources/mybatis/system/UserMapper.xml

@@ -7,6 +7,7 @@
         u.id AS userId,
         u.user_name AS userName,
         u.user_phone AS userPhone,
+        u.login_name as loginName,
         r.id AS roleId,
         r.role_description AS roleName,
         u.state AS state
@@ -28,6 +29,7 @@
         u.id AS userId,
         u.user_name AS userName,
         u.user_phone AS userPhone,
+        u.login_name as loginName,
         r.id AS roleId,
         r.role_description AS roleName,
         u.state AS state