Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit 73b2e1ea by zhoujinghao
Options

中心端用户角色相关接口提交

1 parent 876d025a
Inline Side-by-side
Showing 38 changed files with 930 additions and 275 deletions
nafmii-admin/src/main/java/org/nafmii/admin/user/controller/CenterRoleController.java
...@@ -4,9 +4,14 @@ import com.github.pagehelper.PageHelper; ...@@ -4,9 +4,14 @@ import com.github.pagehelper.PageHelper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.nafmii.admin.user.dto.CenterRoleDto; import org.nafmii.admin.user.dto.CenterRoleDto;
import org.nafmii.admin.user.param.QueryRoleListParam;
import org.nafmii.admin.user.param.QueryRolesParam; import org.nafmii.admin.user.param.QueryRolesParam;
import org.nafmii.admin.user.param.SwitchStatusParam;
import org.nafmii.admin.user.param.SwitchStatusRoleParam;
import org.nafmii.admin.user.service.ICenterRoleService; import org.nafmii.admin.user.service.ICenterRoleService;
import org.nafmii.admin.user.vo.CenterRoleVO; import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.admin.user.vo.CenterUserAndRoleVo;
import org.nafmii.admin.user.vo.RoleListVo;
import org.nafmii.common.param.BeanTransferUtils; import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.param.PageResult; import org.nafmii.common.param.PageResult;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
...@@ -31,39 +36,31 @@ public class CenterRoleController { ...@@ -31,39 +36,31 @@ public class CenterRoleController {
@Resource @Resource
private ICenterRoleService centerRoleService; private ICenterRoleService centerRoleService;
@ApiOperation( value = "中心端角色新增修改",notes = "中心端角色新增修改")
@PostMapping("/edit") @ApiOperation( value = "角色下拉框查询接口",notes = "角色下拉框查询接口")
@PostMapping("/queryRole")
@ResponseBody @ResponseBody
public ApiResponse editRoles (@Validated @RequestBody CenterRoleDto centerRoleDto){ public ApiResponse queryRole (){
ApiResponse result = centerRoleService.editRoles(centerRoleDto); ApiResponse result = centerRoleService.queryRole();
return result; return result;
} }
@ApiOperation( value = "中心端角色列表查询",notes = "中心端角色列表查询") @ApiOperation( value = "角色列表查询接口",notes = "角色列表查询接口")
@PostMapping("/queryRolesList") @PostMapping("/queryRoleList")
@ResponseBody @ResponseBody
public ApiResponse<List<CenterRoleVO>> queryRolesList (@RequestBody @Validated QueryRolesParam param){ public ApiResponse queryRoleList (@RequestBody QueryRoleListParam param){
PageHelper.startPage(param.getPageNum(),param.getPageSize()); PageHelper.startPage(param.getPageNum(),param.getPageSize());
PageResult<CenterRoleVO> result = PageResult<RoleListVo> result =
BeanTransferUtils.toPagedResult(centerRoleService.queryRolesList(param),CenterRoleVO.class); BeanTransferUtils.toPagedResult(centerRoleService.queryRoleList(param),RoleListVo.class);
return new ApiResponse(result); return new ApiResponse(result);
} }
@ApiOperation( value = "中心端角色删除",notes = "中心端角色删除") @ApiOperation( value = "角色启动禁用接口",notes = "角色启动禁用接口")
@PostMapping("/delete") @PostMapping("/switchStatus")
@ResponseBody @ResponseBody
public ApiResponse deleteRoles(@RequestParam Long[] ids){ public ApiResponse switchStatus (@RequestBody SwitchStatusRoleParam param){
ApiResponse result = centerRoleService.deleteRoles(ids); ApiResponse switchStatus = centerRoleService.switchStatus(param);
return result; return switchStatus;
}
@ApiOperation( value = "中心端用户对应角色查询",notes = "中心端用户对应角色查询")
@PostMapping("/queryUserRole")
@ResponseBody
public ApiResponse queryRolesByUser (){
ApiResponse result = centerRoleService.queryRolesByUser();
return result;
} }
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/controller/CenterUserController.java
...@@ -3,9 +3,12 @@ package org.nafmii.admin.user.controller; ...@@ -3,9 +3,12 @@ package org.nafmii.admin.user.controller;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.nafmii.admin.user.param.AddOrUpdateUserParam;
import org.nafmii.admin.user.param.LoginParam; import org.nafmii.admin.user.param.LoginParam;
import org.nafmii.admin.user.param.QueryUsersParam; import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.param.SwitchStatusParam;
import org.nafmii.admin.user.service.ICenterUserService; import org.nafmii.admin.user.service.ICenterUserService;
import org.nafmii.admin.user.vo.CenterUserAndRoleVo;
import org.nafmii.admin.user.vo.CenterUserVO; import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.param.BeanTransferUtils; import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.param.PageResult; import org.nafmii.common.param.PageResult;
...@@ -21,12 +24,12 @@ import java.util.List; ...@@ -21,12 +24,12 @@ import java.util.List;
* 中心端-用户表 前端控制器 * 中心端-用户表 前端控制器
* </p> * </p>
* *
* @author suncq * @author scq
* @since 2021-04-27 * @since 2021-04-27
*/ */
@RestController @RestController
@RequestMapping("/nafmii/admin/user") @RequestMapping("/nafmii/admin/user")
@Api(tags = "3.0.0", description = "中心端用户接口") @Api(tags = "2.0.0", description = "中心端用户接口【zjh】")
public class CenterUserController { public class CenterUserController {
@Resource @Resource
private ICenterUserService centerUserService; private ICenterUserService centerUserService;
...@@ -34,20 +37,43 @@ public class CenterUserController { ...@@ -34,20 +37,43 @@ public class CenterUserController {
@ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆") @ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆")
@PostMapping("/login") @PostMapping("/login")
@ResponseBody @ResponseBody
public ApiResponse<CenterUserVO> login (@Validated @RequestBody LoginParam param){ public ApiResponse login (@RequestBody LoginParam param){
ApiResponse<CenterUserVO> login = centerUserService.userLogin(param); ApiResponse login = centerUserService.userLogin(param);
return login; return login;
} }
@ApiOperation( value = "中心端用户列表",notes = "中心端用户列表") @ApiOperation( value = "中心端新建或编辑用户接口",notes = "中心端新建或编辑用户接口")
@PostMapping("/queryUserList") @PostMapping("/addOrUpdateUser")
@ResponseBody @ResponseBody
public ApiResponse<List<CenterUserVO>> queryUserList (@RequestBody @Validated QueryUsersParam param){ public ApiResponse addOrUpdateUser (@RequestBody AddOrUpdateUserParam param){
ApiResponse user = centerUserService.addOrUpdateUser(param);
return user;
}
@ApiOperation( value = "中心端用户",notes = "中心端用户")
@PostMapping("/queryUser")
@ResponseBody
public ApiResponse queryUser (@RequestBody QueryUsersParam param){
PageHelper.startPage(param.getPageNum(),param.getPageSize()); PageHelper.startPage(param.getPageNum(),param.getPageSize());
PageResult<CenterUserVO> result = PageResult<CenterUserAndRoleVo> result =
BeanTransferUtils.toPagedResult(centerUserService.queryUserList(param),CenterUserVO.class); BeanTransferUtils.toPagedResult(centerUserService.queryUser(param),CenterUserAndRoleVo.class);
return new ApiResponse(result); return new ApiResponse(result);
} }
@ApiOperation( value = "系统用户启动禁用接口",notes = "系统用户启动禁用接口")
@PostMapping("/switchStatus")
@ResponseBody
public ApiResponse switchStatus (@RequestBody SwitchStatusParam param){
ApiResponse switchStatus = centerUserService.switchStatus(param);
return switchStatus;
}
@ApiOperation( value = "用户删除接口",notes = "用户删除接口")
@PostMapping("/deleteUser")
@ResponseBody
public ApiResponse deleteUser (@RequestBody SwitchStatusParam param){
ApiResponse switchStatus = centerUserService.deleteUser(param);
return switchStatus;
}
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterRoleMapper.java
package org.nafmii.admin.user.dao; package org.nafmii.admin.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nafmii.admin.user.dto.QueryRoleListDto;
import org.nafmii.admin.user.dto.QueryRolesDto; import org.nafmii.admin.user.dto.QueryRolesDto;
import org.nafmii.admin.user.entity.CenterRolePO; import org.nafmii.admin.user.entity.CenterRolePO;
import org.nafmii.admin.user.vo.CenterRoleVO; import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.admin.user.vo.RoleListVo;
import java.util.List; import java.util.List;
...@@ -16,44 +18,8 @@ import java.util.List; ...@@ -16,44 +18,8 @@ import java.util.List;
* @since 2021-04-27 * @since 2021-04-27
*/ */
public interface CenterRoleMapper extends BaseMapper<CenterRolePO> { public interface CenterRoleMapper extends BaseMapper<CenterRolePO> {
/** //下拉框角色查询接口
* @author:suncq List<CenterRolePO> selectAll();
* @Function:中心端角色新增修改
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
*/
int updateRoleById(CenterRolePO crp);
/**
* @author:suncq
* @Function:中心端角色列表查询
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
* @param dto
*/
List<CenterRoleVO> queryRolesList(QueryRolesDto dto);
/** List<RoleListVo> selectByName(QueryRoleListDto userDto);
* @author:suncq
* @Function:中心端角色删除
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
*/
int deleteRoles(Long[] ids);
/**
* @author:suncq
* @Function:中心端用户对应角色查询
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
*/
List<CenterRoleVO> queryRolesByUser(Long userId);
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterUserMapper.java
...@@ -3,8 +3,10 @@ package org.nafmii.admin.user.dao; ...@@ -3,8 +3,10 @@ package org.nafmii.admin.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.nafmii.admin.user.dto.LoginDto;
import org.nafmii.admin.user.dto.QueryUsersDto; import org.nafmii.admin.user.dto.QueryUsersDto;
import org.nafmii.admin.user.entity.CenterUserPO; import org.nafmii.admin.user.entity.CenterUserPO;
import org.nafmii.admin.user.vo.CenterUserAndRoleVo;
import org.nafmii.admin.user.vo.CenterUserVO; import org.nafmii.admin.user.vo.CenterUserVO;
import java.util.List; import java.util.List;
...@@ -20,6 +22,13 @@ import java.util.List; ...@@ -20,6 +22,13 @@ import java.util.List;
@Mapper @Mapper
public interface CenterUserMapper extends BaseMapper<CenterUserPO> { public interface CenterUserMapper extends BaseMapper<CenterUserPO> {
/** /**
* 用户列表接口
* @param userDto
* @return
*/
List<CenterUserAndRoleVo> selectUserAndRole(QueryUsersDto userDto);
/**
* @author:suncq * @author:suncq
* @Function:中心端用户登陆 * @Function:中心端用户登陆
* @date 2021/4/27 * @date 2021/4/27
...@@ -27,7 +36,7 @@ public interface CenterUserMapper extends BaseMapper<CenterUserPO> { ...@@ -27,7 +36,7 @@ public interface CenterUserMapper extends BaseMapper<CenterUserPO> {
* @version: * @version:
* @remark: * @remark:
*/ */
CenterUserVO selectUserByPhone(@Param("phone") String phone); CenterUserVO selectUserByPhone(LoginDto loginDto);
/** /**
* @author:suncq * @author:suncq
......
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterUserRoleMapper.java 0 → 100644
package org.nafmii.admin.user.dao;
import org.apache.ibatis.annotations.Param;
import org.nafmii.admin.user.entity.CenterUserRolePO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 中心端用户角色关系表 Mapper 接口
* </p>
*
* @author zjh
* @since 2021-05-12
*/
public interface CenterUserRoleMapper extends BaseMapper<CenterUserRolePO> {
List<CenterUserRolePO> selectByUserId(@Param("id") Long id);
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CneterRoleMenuMapper.java 0 → 100644
package org.nafmii.admin.user.dao;
import org.nafmii.admin.user.entity.CneterRoleMenuPO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 中心端-角色菜单关系表 Mapper 接口
* </p>
*
* @author zjh
* @since 2021-05-12
*/
public interface CneterRoleMenuMapper extends BaseMapper<CneterRoleMenuPO> {
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/AddOrUpdateUserDto.java 0 → 100644
package org.nafmii.admin.user.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 14:29
* @ClassName:
* @version:
* @remark:
*/
@Data
public class AddOrUpdateUserDto {
@ApiModelProperty("中心端用户id：编辑时传入")
private Long id;
@ApiModelProperty("账号")
private String loginName;
@ApiModelProperty("登陆密码")
private String loginPwd;
@ApiModelProperty("中文姓名")
private String cnName;
@ApiModelProperty("英文姓名")
private String enNAme;
@ApiModelProperty("角色id")
private Long roleId;
@ApiModelProperty("手机号")
private String Phone;
@ApiModelProperty("0 有效 1 无效")
private String isEnable;
// @ApiModelProperty("创建人id")
// private Long userId;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/LoginDto.java
...@@ -18,11 +18,9 @@ import javax.validation.constraints.NotNull; ...@@ -18,11 +18,9 @@ import javax.validation.constraints.NotNull;
@ApiModel("app用户登陆参数对象") @ApiModel("app用户登陆参数对象")
public class LoginDto { public class LoginDto {
@NotNull(message = "手机号或登录账号不能为空") @ApiModelProperty("账号")
@ApiModelProperty("手机号/登录账号") private String loginName;
private String phone;
@NotNull(message = "登陆密码不能为空")
@ApiModelProperty("登陆密码") @ApiModelProperty("登陆密码")
private String loginPwd; private String loginPwd;
......
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/QueryRoleListDto.java 0 → 100644
package org.nafmii.admin.user.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 17:49
* @ClassName:
* @version:
* @remark:
*/
@Data
public class QueryRoleListDto {
@ApiModelProperty("角色名称")
private String roleName;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/QueryUsersDto.java
...@@ -13,9 +13,10 @@ import java.time.LocalDate; ...@@ -13,9 +13,10 @@ import java.time.LocalDate;
*/ */
@Data @Data
@ApiModel(value = "用户列表查询数据交互类型") @ApiModel(value = "用户列表查询数据交互类型")
public class QueryUsersDto extends PageQuery { public class QueryUsersDto{
@ApiModelProperty(value = "创建开始时间") @ApiModelProperty(value = "登陆用户名")
private LocalDate StartCreateTime; private String loginName;
@ApiModelProperty(value = "创建结束时间")
private LocalDate endCreateTime; @ApiModelProperty(value = "角色id")
private Long roleId;
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/SwitchStatusDto.java 0 → 100644
package org.nafmii.admin.user.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 17:26
* @ClassName:
* @version:
* @remark:
*/
@Data
public class SwitchStatusDto {
@ApiModelProperty("用户主键id")
private Long id;
@ApiModelProperty("启动禁用 0 启动 1 禁用")
private String isEnable;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/SwitchStatusRoleDto.java 0 → 100644
package org.nafmii.admin.user.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 18:02
* @ClassName:
* @version:
* @remark:
*/
@Data
public class SwitchStatusRoleDto {
@ApiModelProperty("角色主键id")
private Long id;
@ApiModelProperty("启动禁用 0 启动 1 禁用")
private String isEnable;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/entity/CenterRolePO.java
...@@ -54,7 +54,11 @@ public class CenterRolePO extends Model { ...@@ -54,7 +54,11 @@ public class CenterRolePO extends Model {
@ApiModelProperty(value = "修改人") @ApiModelProperty(value = "修改人")
@TableField("UPDATE_USER_ID") @TableField("UPDATE_USER_ID")
private Long updateUserId; private Long delFlag;
@ApiModelProperty(value = "是否删除0否1是")
@TableField("DEL_FLAG")
private String updateUserId;
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/entity/CenterUserPO.java
...@@ -84,5 +84,9 @@ public class CenterUserPO extends Model { ...@@ -84,5 +84,9 @@ public class CenterUserPO extends Model {
@TableField("IS_ENABLE") @TableField("IS_ENABLE")
private String isEnable; private String isEnable;
@ApiModelProperty(value = "0 有效 1 无效")
@TableField("DEL_FLAG")
private String delFlag;
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/entity/CenterUserRolePO.java 0 → 100644
package org.nafmii.admin.user.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 中心端用户角色关系表
* </p>
*
* @author zjh
* @since 2021-05-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("CENTER_USER_ROLE")
@ApiModel(value="CenterUserRolePO对象", description="中心端用户角色关系表")
public class CenterUserRolePO extends Model {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "主键")
@TableId("ID")
private Long id;
@ApiModelProperty(value = "用户表主键")
@TableField("USER_ID")
private Long userId;
@ApiModelProperty(value = "角色表主键")
@TableField("ROLE_ID")
private Long roleId;
@ApiModelProperty(value = "活动标识 0 有效 1 无效活动标识 0 有效 1 无效")
@TableField("IS_ENABLE")
private String isEnable;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/entity/CneterRoleMenuPO.java 0 → 100644
package org.nafmii.admin.user.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 中心端-角色菜单关系表
* </p>
*
* @author zjh
* @since 2021-05-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("CNETER_ROLE_MENU")
@ApiModel(value="CneterRoleMenuPO对象", description="中心端-角色菜单关系表")
public class CneterRoleMenuPO extends Model {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "主键")
@TableId("ID")
private Long id;
@ApiModelProperty(value = "角色主键")
@TableField("ROLE_ID")
private Long roleId;
@ApiModelProperty(value = "菜单主键")
@TableField("MENU_ID")
private Long menuId;
@ApiModelProperty(value = "活动标识 0 有效 1 无效")
@TableField("IS_ENABLE")
private String isEnable;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/AddOrUpdateUserParam.java 0 → 100644
package org.nafmii.admin.user.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 14:18
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel(value="新建或编辑用户参数对象")
public class AddOrUpdateUserParam {
@ApiModelProperty("中心端主键id：编辑时传入")
private Long id;
@ApiModelProperty("账号")
private String loginName;
@ApiModelProperty("登陆密码")
private String loginPwd;
@ApiModelProperty("中文姓名")
private String cnName;
@ApiModelProperty("英文姓名")
private String enNAme;
@ApiModelProperty("角色id")
private Long roleId;
@ApiModelProperty("手机号")
private String phone;
@ApiModelProperty("0 有效 1 无效")
private String isEnable;
//
// @ApiModelProperty("创建人id")
// private Long userId;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/LoginParam.java
...@@ -7,7 +7,7 @@ import lombok.Data; ...@@ -7,7 +7,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
/** /**
* @author:suncq * @author:zjh
* @Function:TODO * @Function:TODO
* @date 2021/4/28 * @date 2021/4/28
* @ClassName: * @ClassName:
...@@ -18,15 +18,9 @@ import javax.validation.constraints.NotNull; ...@@ -18,15 +18,9 @@ import javax.validation.constraints.NotNull;
@ApiModel("中心端用户登陆参数对象") @ApiModel("中心端用户登陆参数对象")
public class LoginParam { public class LoginParam {
@NotNull(message = "手机号或登录账号不能为空") @ApiModelProperty("账号")
@ApiModelProperty("手机号/登录账号") private String loginName;
private String phone;
@ApiModelProperty("登陆密码") @ApiModelProperty("登陆密码")
@NotNull(message = "登陆密码不能为空")
private String loginPwd; private String loginPwd;
@NotNull(message = "登陆方式不能为空")
@ApiModelProperty("登陆方式0密码1验证码")
private String type;
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/param/QueryRoleListParam.java 0 → 100644
package org.nafmii.admin.user.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.nafmii.common.param.PageQuery;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 17:40
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("角色列表查询返回报文")
public class QueryRoleListParam extends PageQuery {
@ApiModelProperty("角色名称")
private String roleName;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/QueryUsersParam.java
...@@ -14,9 +14,10 @@ import java.time.LocalDate; ...@@ -14,9 +14,10 @@ import java.time.LocalDate;
@Data @Data
@ApiModel(value="用户列表查询入参对象") @ApiModel(value="用户列表查询入参对象")
public class QueryUsersParam extends PageQuery { public class QueryUsersParam extends PageQuery {
@ApiModelProperty(value = "创建开始时间 yyyy-MM-dd") @ApiModelProperty(value = "登陆用户名")
private LocalDate startCreateTime; private String loginName;
@ApiModelProperty(value = "创建结束时间 yyyy-MM-dd")
private LocalDate endCreateTime; @ApiModelProperty(value = "角色id")
private Long roleId;
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/param/SwitchStatusParam.java 0 → 100644
package org.nafmii.admin.user.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 17:10
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("中心端用户启动禁用接口")
public class SwitchStatusParam {
@ApiModelProperty("用户主键id")
private Long id;
@ApiModelProperty("启动禁用 0 启动 1 禁用")
private String isEnable;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/SwitchStatusRoleParam.java 0 → 100644
package org.nafmii.admin.user.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 18:00
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("角色启用禁用参数")
public class SwitchStatusRoleParam {
@ApiModelProperty("角色主键id")
private Long id;
@ApiModelProperty("启动禁用 0 启动 1 禁用")
private String isEnable;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterRoleService.java
package org.nafmii.admin.user.service; package org.nafmii.admin.user.service;
import org.nafmii.admin.user.dto.CenterRoleDto; import org.nafmii.admin.user.dto.CenterRoleDto;
import org.nafmii.admin.user.param.QueryRoleListParam;
import org.nafmii.admin.user.param.QueryRolesParam; import org.nafmii.admin.user.param.QueryRolesParam;
import org.nafmii.admin.user.param.SwitchStatusRoleParam;
import org.nafmii.admin.user.vo.CenterRoleVO; import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.admin.user.vo.RoleListVo;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import java.util.List; import java.util.List;
...@@ -24,35 +27,20 @@ public interface ICenterRoleService{ ...@@ -24,35 +27,20 @@ public interface ICenterRoleService{
* @version: * @version:
* @remark: * @remark:
*/ */
ApiResponse editRoles(CenterRoleDto centerRoleDto); //下拉框角色查询接口
ApiResponse queryRole();
/** /**
* @author:suncq * 角色列表查询接口
* @Function:中心端角色列表查询 * @param param
* @date 2021/4/27 * @return
* @ClassName:
* @version:
* @remark:
*/
List<CenterRoleVO> queryRolesList(QueryRolesParam param);
/**
* @author:suncq
* @Function:中心端角色删除
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
*/ */
ApiResponse deleteRoles(Long[] ids); List<RoleListVo>queryRoleList(QueryRoleListParam param);
/** /**
* @author:suncq * 角色启用禁用
* @Function:中心端用户对应角色查询 * @param param
* @date 2021/4/27 * @return
* @ClassName:
* @version:
* @remark:
*/ */
ApiResponse queryRolesByUser(); ApiResponse switchStatus(SwitchStatusRoleParam param);
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterUserRoleService.java 0 → 100644
package org.nafmii.admin.user.service;
import org.nafmii.admin.user.entity.CenterUserRolePO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中心端用户角色关系表 服务类
* </p>
*
* @author zjh
* @since 2021-05-12
*/
public interface ICenterUserRoleService extends IService<CenterUserRolePO> {
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterUserService.java
package org.nafmii.admin.user.service; package org.nafmii.admin.user.service;
import org.nafmii.admin.user.param.AddOrUpdateUserParam;
import org.nafmii.admin.user.param.LoginParam; import org.nafmii.admin.user.param.LoginParam;
import org.nafmii.admin.user.param.QueryUsersParam; import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.param.SwitchStatusParam;
import org.nafmii.admin.user.vo.CenterUserAndRoleVo;
import org.nafmii.admin.user.vo.CenterUserVO; import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
...@@ -16,23 +19,42 @@ import java.util.List; ...@@ -16,23 +19,42 @@ import java.util.List;
* @since 2021-04-27 * @since 2021-04-27
*/ */
public interface ICenterUserService { public interface ICenterUserService {
/**\
* 新建或编辑用户接口
* @param param
* @return
*/
ApiResponse addOrUpdateUser(AddOrUpdateUserParam param);
/** /**
* @author:suncq * 用户删除接口
* @Function:中心端用户登陆 * @param param
* @date 2021/4/27 * @return
* @ClassName:
* @version:
* @remark:
*/ */
ApiResponse<CenterUserVO> userLogin(LoginParam param); ApiResponse deleteUser(SwitchStatusParam param);
/**
* 用户列表查询接口
* @param param
* @return
*/
List<CenterUserAndRoleVo> queryUser(QueryUsersParam param);
/**
* 用户启动禁用接口
* @param param
* @return
*/
ApiResponse switchStatus(SwitchStatusParam param);
/** /**
* @author:suncq * @author:suncq
* @Function:中心端用户列表查询 * @Function:中心端用户登陆
* @date 2021/4/27 * @date 2021/4/27
* @ClassName: * @ClassName:
* @version: * @version:
* @remark: * @remark:
*/ */
List<CenterUserVO> queryUserList(QueryUsersParam param); ApiResponse userLogin(LoginParam param);
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICneterRoleMenuService.java 0 → 100644
package org.nafmii.admin.user.service;
import org.nafmii.admin.user.entity.CneterRoleMenuPO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中心端-角色菜单关系表 服务类
* </p>
*
* @author zjh
* @since 2021-05-12
*/
public interface ICneterRoleMenuService extends IService<CneterRoleMenuPO> {
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterRoleServiceImpl.java
package org.nafmii.admin.user.service.impl; package org.nafmii.admin.user.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.nafmii.admin.user.dao.CenterRoleMapper; import org.nafmii.admin.user.dao.CenterRoleMapper;
import org.nafmii.admin.user.dto.CenterRoleDto; import org.nafmii.admin.user.dto.*;
import org.nafmii.admin.user.dto.QueryRolesDto;
import org.nafmii.admin.user.entity.CenterRolePO; import org.nafmii.admin.user.entity.CenterRolePO;
import org.nafmii.admin.user.entity.CenterUserPO;
import org.nafmii.admin.user.param.QueryRoleListParam;
import org.nafmii.admin.user.param.QueryRolesParam; import org.nafmii.admin.user.param.QueryRolesParam;
import org.nafmii.admin.user.param.SwitchStatusRoleParam;
import org.nafmii.admin.user.service.ICenterRoleService; import org.nafmii.admin.user.service.ICenterRoleService;
import org.nafmii.admin.user.vo.CenterRoleVO; import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.admin.user.vo.RoleListVo;
import org.nafmii.common.param.BeanTransferUtils; import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.nafmii.common.utils.RequestUtils; import org.nafmii.common.utils.RequestUtils;
...@@ -26,85 +30,45 @@ import java.util.List; ...@@ -26,85 +30,45 @@ import java.util.List;
* @since 2021-04-27 * @since 2021-04-27
*/ */
@Service @Service
@Slf4j
public class CenterRoleServiceImpl implements ICenterRoleService { public class CenterRoleServiceImpl implements ICenterRoleService {
@Resource @Resource
private CenterRoleMapper centerRoleMapper; private CenterRoleMapper roleMapper;
/** /**
* 中心端角色新增修改 * 角色下拉框查询接口
* @param centerRoleDto
* @return * @return
*/ */
@Override @Override
public ApiResponse editRoles(CenterRoleDto centerRoleDto) { public ApiResponse queryRole() {
Long roleId = centerRoleDto.getId(); List<CenterRolePO> list =roleMapper.selectAll();
if(null == roleId){//新增 return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT,list);
CenterRolePO crp = new CenterRolePO();
crp.setId(SnowFlakeUtil.nextId());
crp.setRName(centerRoleDto.getRName());
crp.setCreateUserId(RequestUtils.getUserId());
crp.setCreatTime(LocalDateTime.now());
crp.setUpdateUserId(RequestUtils.getUserId());
crp.setUpdateTime(LocalDateTime.now());
crp.setIsEnable(centerRoleDto.getIsEnable());
int i = centerRoleMapper.insert(crp);
if (i<0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}else{
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
}
}else{//修改
CenterRolePO crp = new CenterRolePO();
crp.setId(centerRoleDto.getId());
crp.setRName(centerRoleDto.getRName());
crp.setUpdateUserId(RequestUtils.getUserId());
crp.setUpdateTime(LocalDateTime.now());
crp.setIsEnable(centerRoleDto.getIsEnable());
int i = centerRoleMapper.updateRoleById(crp);
if (i<0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}else{
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
}
}
} }
/**
* 中心端角色列表查询
* @param
* @return
*/
@Override @Override
public List<CenterRoleVO> queryRolesList(QueryRolesParam param) { public List<RoleListVo> queryRoleList(QueryRoleListParam param) {
QueryRolesDto dto = BeanTransferUtils.transfer(param, QueryRolesDto.class); QueryRoleListDto userDto = BeanTransferUtils.transfer(param, QueryRoleListDto.class);
List<CenterRoleVO> result = centerRoleMapper.queryRolesList(dto); log.info("==========角色列表查询接口相关参数===============>"+userDto);
return result; List<RoleListVo> roleListVos = roleMapper.selectByName(userDto);
return roleListVos;
} }
/** /**
* 中心端角色删除 * 角色启用禁用
* @param * @param param
* @return * @return
*/ */
@Override @Override
public ApiResponse deleteRoles(Long[] ids) { public ApiResponse switchStatus(SwitchStatusRoleParam param) {
int result = centerRoleMapper.deleteRoles(ids); SwitchStatusRoleDto roleDto = BeanTransferUtils.transfer(param, SwitchStatusRoleDto.class);
if (result<0) { log.info("=========================>角色启动禁用相关参数"+param);
CenterRolePO userPO = new CenterRolePO();
userPO.setId(roleDto.getId());
userPO.setIsEnable(roleDto.getIsEnable());
int i = roleMapper.updateById(userPO);
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT); return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}else{
return new ApiResponse(ApiResponse.SUCCESS, ApiResponse.SUCCESS_TEXT);
}
} }
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
/**
* 中心端用户对应角色查询
* @param
* @return
*/
@Override
public ApiResponse queryRolesByUser() {
Long userId = RequestUtils.getUserId();
List<CenterRoleVO> result = centerRoleMapper.queryRolesByUser(userId);
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT,result);
} }
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterUserRoleServiceImpl.java 0 → 100644
package org.nafmii.admin.user.service.impl;
import org.nafmii.admin.user.entity.CenterUserRolePO;
import org.nafmii.admin.user.dao.CenterUserRoleMapper;
import org.nafmii.admin.user.service.ICenterUserRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中心端用户角色关系表 服务实现类
* </p>
*
* @author zjh
* @since 2021-05-12
*/
@Service
public class CenterUserRoleServiceImpl extends ServiceImpl<CenterUserRoleMapper, CenterUserRolePO> implements ICenterUserRoleService {
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterUserServiceImpl.java
package org.nafmii.admin.user.service.impl; package org.nafmii.admin.user.service.impl;
import cn.hutool.crypto.digest.DigestUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nafmii.admin.user.dao.CenterUserMapper; import org.nafmii.admin.user.dao.CenterUserMapper;
import org.nafmii.admin.user.dao.CenterUserRoleMapper;
import org.nafmii.admin.user.dto.AddOrUpdateUserDto;
import org.nafmii.admin.user.dto.LoginDto;
import org.nafmii.admin.user.dto.QueryUsersDto; import org.nafmii.admin.user.dto.QueryUsersDto;
import org.nafmii.admin.user.dto.SwitchStatusDto;
import org.nafmii.admin.user.entity.CenterUserPO;
import org.nafmii.admin.user.entity.CenterUserRolePO;
import org.nafmii.admin.user.param.AddOrUpdateUserParam;
import org.nafmii.admin.user.param.LoginParam; import org.nafmii.admin.user.param.LoginParam;
import org.nafmii.admin.user.param.QueryUsersParam; import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.param.SwitchStatusParam;
import org.nafmii.admin.user.service.ICenterUserService; import org.nafmii.admin.user.service.ICenterUserService;
import org.nafmii.admin.user.vo.CenterUserAndRoleVo;
import org.nafmii.admin.user.vo.CenterUserVO; import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.constant.MessageEnum;
import org.nafmii.common.constant.UserEnum;
import org.nafmii.common.param.BeanTransferUtils; import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.nafmii.common.utils.RequestUtils;
import org.nafmii.common.utils.SnowFlakeUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
...@@ -28,30 +43,147 @@ public class CenterUserServiceImpl implements ICenterUserService { ...@@ -28,30 +43,147 @@ public class CenterUserServiceImpl implements ICenterUserService {
@Resource @Resource
private CenterUserMapper centerUserMapper; private CenterUserMapper centerUserMapper;
@Resource
private CenterUserRoleMapper userRoleMapper;
/**
* 新建或编辑用户接口
* @param param
* @return
*/
@Override
public ApiResponse addOrUpdateUser(AddOrUpdateUserParam param) {
AddOrUpdateUserDto userDto = BeanTransferUtils.transfer(param, AddOrUpdateUserDto.class);
log.info("===============中心端用户新建或编辑接口参数======》{}",userDto);
//=====================用户参数赋值====================开始
CenterUserPO userPO = new CenterUserPO();
userPO.setCnName(userDto.getCnName());
userPO.setUpdateTime(LocalDateTime.now());
userPO.setUpdateUserId(RequestUtils.getUserId());
userPO.setEnName(userDto.getEnNAme());
userPO.setLoginName(userDto.getLoginName());
userPO.setLoginPwd(DigestUtil.md5Hex(userDto.getLoginPwd().getBytes()));
userPO.setPhone(userDto.getPhone());
userPO.setIsEnable(userDto.getIsEnable());
//=====================用户参数赋值====================结束
//判断新增功能还是编辑功能
if (null != param.getId()){
userPO.setId(userDto.getId());
int i = centerUserMapper.updateById(userPO);
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
}else{
userPO.setId(SnowFlakeUtil.nextId());
userPO.setCreateTime(LocalDateTime.now());
userPO.setCreateUserId(RequestUtils.getUserId());
int i = centerUserMapper.insert(userPO);
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
}
log.info("============================用户相关实体赋值数据"+userPO);
//用户操作完后开始同步角色相关数据插入=======================开始
//通过用户id查询相对应的角色数据集合
List<CenterUserRolePO> rolePOS = userRoleMapper.selectByUserId(userPO.getId());
log.info("============================角色用户中间表相关用户数据rolePOS"+rolePOS);
//将该用户全部变为无效用户
if (rolePOS.size() > 0){
for (CenterUserRolePO po:rolePOS) {
po.setIsEnable(UserEnum.NOTENABLE.getCode());
int i = userRoleMapper.updateById(po);
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
}
}
//插入数据
CenterUserRolePO userRolePO = new CenterUserRolePO();
userRolePO.setRoleId(userDto.getRoleId());
userRolePO.setUserId(RequestUtils.getUserId());
userRolePO.setIsEnable(UserEnum.ENABLE.getCode());
userRolePO.setId(SnowFlakeUtil.nextId());
log.info("============================角色用户中间表相关参数对象》userRolePO"+userRolePO);
int i = userRoleMapper.insert(userRolePO);
//用户操作完后开始同步角色相关数据插入=======================结束
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
/**
* 删除接口
* @param param
* @return
*/
@Override
public ApiResponse deleteUser(SwitchStatusParam param) {
SwitchStatusDto userDto = BeanTransferUtils.transfer(param, SwitchStatusDto.class);
log.info("=========================>用户删除相关参数"+param);
CenterUserPO userPO = new CenterUserPO();
userPO.setId(userDto.getId());
userPO.setDelFlag(UserEnum.DELETE.getCode());
int i = centerUserMapper.updateById(userPO);
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
}
/**
* 用户列表查询接口
* @param param
* @return
*/
@Override
public List<CenterUserAndRoleVo> queryUser(QueryUsersParam param) {
QueryUsersDto userDto = BeanTransferUtils.transfer(param, QueryUsersDto.class);
log.info("=========用户列表相关参数==========>userDto");
List<CenterUserAndRoleVo> userAndRoleVos = centerUserMapper.selectUserAndRole(userDto);
return userAndRoleVos;
}
/**
* 用户启动禁用接口
* @param param
* @return
*/
@Override
public ApiResponse switchStatus(SwitchStatusParam param) {
SwitchStatusDto userDto = BeanTransferUtils.transfer(param, SwitchStatusDto.class);
log.info("=========================>用户启动禁用相关参数"+param);
CenterUserPO userPO = new CenterUserPO();
userPO.setId(userDto.getId());
userPO.setIsEnable(userDto.getIsEnable());
int i = centerUserMapper.updateById(userPO);
if (i < 0){
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
}
/** /**
* 中心端用户登陆 * 中心端用户登陆
* @param param * @param param
* @return * @return
*/ */
@Override @Override
public ApiResponse<CenterUserVO> userLogin(LoginParam param) { public ApiResponse userLogin(LoginParam param) {
log.info("===============中心端用户登录请求参数======》{}",param); if (param.getLoginPwd().isEmpty() || param.getLoginName().isEmpty()){
CenterUserVO userVo = new CenterUserVO(); return new ApiResponse(ApiResponse.FAIL, MessageEnum.FAIR_WEBLOGIN.getRemarks());
}
LoginDto loginDto = BeanTransferUtils.transfer(param, LoginDto.class);
log.info("===============中心端用户登录请求参数======》{}",loginDto);
//账号密码登陆 //账号密码登陆
String phone = param.getPhone(); CenterUserVO userVo = centerUserMapper.selectUserByPhone(loginDto);
userVo = centerUserMapper.selectUserByPhone(phone); log.info("====================中心端登录时返回的数据=============userVo=="+userVo);
if (null == userVo){ if (null == userVo){
return new ApiResponse(ApiResponse.FAIL,"该用户未注册，请先注册！"); return new ApiResponse(ApiResponse.FAIL,MessageEnum.FAIR_PWD_NAME.getRemarks());
} }
if(!param.getLoginPwd().equals(userVo.getLoginPwd())){ if (userVo.getIsEnable().equals(UserEnum.NOTENABLE.getCode())){
return new ApiResponse(ApiResponse.FAIL,"用户名或密码错误！"); return new ApiResponse(ApiResponse.FAIL,MessageEnum.FAIR_USERENABLE.getRemarks());
} }
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT,userVo); return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT,userVo);
} }
@Override
public List<CenterUserVO> queryUserList(QueryUsersParam param) {
QueryUsersDto dto = BeanTransferUtils.transfer(param,QueryUsersDto.class);
return centerUserMapper.queryUserList(dto);
}
} }
nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CneterRoleMenuServiceImpl.java 0 → 100644
package org.nafmii.admin.user.service.impl;
import org.nafmii.admin.user.entity.CneterRoleMenuPO;
import org.nafmii.admin.user.dao.CneterRoleMenuMapper;
import org.nafmii.admin.user.service.ICneterRoleMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中心端-角色菜单关系表 服务实现类
* </p>
*
* @author zjh
* @since 2021-05-12
*/
@Service
public class CneterRoleMenuServiceImpl extends ServiceImpl<CneterRoleMenuMapper, CneterRoleMenuPO> implements ICneterRoleMenuService {
}
nafmii-admin/src/main/java/org/nafmii/admin/user/vo/CenterUserAndRoleVo.java 0 → 100644
package org.nafmii.admin.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 16:23
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("用户列表返回报文")
public class CenterUserAndRoleVo {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "登录用户名")
private String loginName;
@ApiModelProperty(value = "登录密码")
private String loginPwd;
@ApiModelProperty(value = "中文姓名")
private String cnName;
@ApiModelProperty(value = "英文姓名")
private String enName;
@ApiModelProperty(value = "移动电话")
private String phone;
@ApiModelProperty(value = "固定电话")
private String telphone;
@ApiModelProperty(value = "0 男 1 女")
private String sex;
@ApiModelProperty(value = "邮箱地址")
private String email;
@ApiModelProperty(value = "创建人")
private Long createUserId;
@ApiModelProperty(value = "修改人")
private Long updateUserId;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "0 有效 1 无效")
private String isEnable;
@ApiModelProperty(value = "角色名称")
private String rName;
@ApiModelProperty(value = "角色id")
private String roleId;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/vo/RoleListVo.java 0 → 100644
package org.nafmii.admin.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/5/12 17:44
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("角色返回列表报文")
public class RoleListVo {
@ApiModelProperty("角色主键id")
private Long roleId;
@ApiModelProperty("角色名称")
private String roleName;
@ApiModelProperty("启用禁用 0 启用 1禁用")
private String isEnable;
@ApiModelProperty("用户id")
private String createUserId;
}
nafmii-admin/src/main/resources/mapper/CenterRoleMapper.xml
...@@ -11,73 +11,29 @@ ...@@ -11,73 +11,29 @@
<result column="IS_ENABLE" property="isEnable" /> <result column="IS_ENABLE" property="isEnable" />
<result column="CREATE_USER_ID" property="createUserId" /> <result column="CREATE_USER_ID" property="createUserId" />
<result column="UPDATE_USER_ID" property="updateUserId" /> <result column="UPDATE_USER_ID" property="updateUserId" />
<result column="DEL_FLAG" property="delFlag" />
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID, R_NAME, CREAT_TIME, UPDATE_TIME, IS_ENABLE, CREATE_USER_ID, UPDATE_USER_ID ID, R_NAME, CREAT_TIME, UPDATE_TIME, IS_ENABLE, CREATE_USER_ID, UPDATE_USER_ID ,DEL_FLAG
</sql> </sql>
<!-- 修改中心端角色 --> <select id="selectAll" resultMap="BaseResultMap">
<update id="updateRoleById" parameterType="map" > select
update CENTER_ROLE <include refid="Base_Column_List"></include>
<set > from CENTER_ROLE
<if test="rName != null" > where IS_ENABLE = 0 and DEL_FLAG = 0
R_NAME = #{rName,jdbcType=VARCHAR},
</if>
<if test="updateTime != null" >
UPDATE_TIME = #{updateTime,jdbcType=DATE},
</if>
<if test="isEnable != null" >
IS_ENABLE = #{isEnable,jdbcType=VARCHAR},
</if>
<if test="updateUserId != null" >
UPDATE_USER_ID = #{updateUserId,jdbcType=BIGINT},
</if>
</set>
where ID = #{id,jdbcType=VARCHAR}
</update>
<!-- 查询中心端角色列表 -->
<select id="queryRolesList" parameterType="org.nafmii.admin.user.dto.QueryRolesDto"
resultType="org.nafmii.admin.user.vo.CenterRoleVO">
SELECT
ID as id, R_NAME as rName, CREAT_TIME as creatTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable,
CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId
FROM
CENTER_ROLE
<where>
<if test="startCreateTime != null and endCreateTime != null">
DATE_FORMAT(CREAT_TIME,'%Y-%m-%d') BETWEEN #{startCreateTime} and #{endCreateTime}
</if>
</where>
</select> </select>
<select id="selectByName" parameterType="org.nafmii.admin.user.dto.QueryRoleListDto" resultType="org.nafmii.admin.user.vo.RoleListVo">
<!-- 删除中心端角色 --> select
<update id="deleteRoles"> ID as roleID,
update R_NAME as roleName,
CENTER_ROLE CREATE_USER_ID as createUserId,
set IS_ENABLE = "1" IS_ENABLE as isEnable
where ID IN from CENTER_ROLE
<foreach collection="array" item="id" open="(" separator="," close=")"> where DEL_FLAG = 0
#{id} <if test="roleName != null">
</foreach> and R_NAME like CONCAT('%',#{roleName},'%')
</update> </if>
<!-- 中心端用户对应角色查询 -->
<select id="queryRolesByUser" parameterType="map" resultType="org.nafmii.admin.user.vo.CenterRoleVO">
SELECT
cr.ID as id,
cr.R_NAME as rName,
cr.CREAT_TIME as creatTime,
cr.UPDATE_TIME as updateTime,
cr.IS_ENABLE as isEnable,
cr.CREATE_USER_ID as createUserId,
cr.UPDATE_USER_ID as updateUserId
FROM
CENTER_ROLE cr
INNER JOIN CENTER_USER_ROLE cur ON cur.role_id = cr.id
INNER JOIN CENTER_USER cu ON cur.user_id = cu.id
WHERE
cu.id = #{userid,jdbcType=BIGINT}
</select> </select>
</mapper> </mapper>
nafmii-admin/src/main/resources/mapper/CenterUserMapper.xml
...@@ -18,24 +18,50 @@ ...@@ -18,24 +18,50 @@
<result column="CREATE_TIME" property="createTime" /> <result column="CREATE_TIME" property="createTime" />
<result column="UPDATE_TIME" property="updateTime" /> <result column="UPDATE_TIME" property="updateTime" />
<result column="IS_ENABLE" property="isEnable" /> <result column="IS_ENABLE" property="isEnable" />
<result column="DEL_FLAG" property="delFlag" />
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID, LOGIN_NAME, LOGIN_PWD, CN_NAME, EN_NAME, PHONE, TELPHONE, SEX, EMAIL, CREATE_USER_ID, UPDATE_USER_ID, CREATE_TIME, UPDATE_TIME, IS_ENABLE ID, LOGIN_NAME, LOGIN_PWD, CN_NAME, EN_NAME, PHONE, TELPHONE, SEX, EMAIL, CREATE_USER_ID, UPDATE_USER_ID, CREATE_TIME, UPDATE_TIME, IS_ENABLE, DEL_FLAG
</sql> </sql>
<!-- 根据登录人账号（手机号）查询用户信息 -->
<select id="selectUserByPhone" parameterType="map" resultType="org.nafmii.admin.user.vo.CenterUserVO"> <select id="selectUserByPhone" parameterType="org.nafmii.admin.user.dto.LoginDto" resultType="org.nafmii.admin.user.vo.CenterUserVO">
select select
ID as id, LOGIN_NAME as loginName, LOGIN_PWD as loginPwd, CN_NAME as cnName, EN_NAME as enName, PHONE as phone, ID as id, LOGIN_NAME as loginName, LOGIN_PWD as loginPwd, CN_NAME as cnName, EN_NAME as enName, PHONE as phone,
TELPHONE as telphone, SEX as sex, EMAIL as email, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId, TELPHONE as telphone, SEX as sex, EMAIL as email, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId,
CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from CENTER_USER from CENTER_USER
where IS_ENABLE = 0 where 1 = 1
<if test="phone !=null"> <if test="loginName !=null">
and PHONE =#{phone} and LOGIN_NAME =#{loginName}
</if>
<if test="loginPwd !=null">
and LOGIN_PWD =#{loginPwd}
</if> </if>
</select> </select>
<select id="selectUserAndRole" parameterType="org.nafmii.admin.user.dto.QueryUsersDto" resultType="org.nafmii.admin.user.vo.CenterUserAndRoleVo">
select
cur.ID as id,
cu.LOGIN_NAME as loginName,
cr.R_NAME as rName,
cr.ID as roleId,
cu.PHONE as phone,
cu.IS_ENABLE as isEnable
from CENTER_USER cu
left join CENTER_USER_ROLE cur
on cu.ID = cur.USER_ID
left join CENTER_ROLE cr
on cur.ROLE_ID = cr.ID
where cu.DEL_FLAG = 0
<if test="loginName != null">
cu.LOGIN_NAME like CONCAT('%',#{loginName},'%')
</if>
<if test="roleId != null">
cr.ID = #{roleId}
</if>
</select>
<select id="queryUserList" parameterType="org.nafmii.admin.user.dto.QueryUsersDto" <select id="queryUserList" parameterType="org.nafmii.admin.user.dto.QueryUsersDto"
resultType="org.nafmii.admin.user.vo.CenterUserVO"> resultType="org.nafmii.admin.user.vo.CenterUserVO">
SELECT SELECT
......
nafmii-admin/src/main/resources/mapper/CenterUserRoleMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nafmii.admin.user.dao.CenterUserRoleMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterUserRolePO">
<id column="ID" property="id" />
<result column="USER_ID" property="userId" />
<result column="ROLE_ID" property="roleId" />
<result column="IS_ENABLE" property="isEnable" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
ID, USER_ID, ROLE_ID,IS_ENABLE
</sql>
<select id="selectByUserId" parameterType="map" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
from CENTER_USER_ROLE
where IS_ENABLE = 0
and USER_ID =#{id}
</select>
</mapper>
nafmii-admin/src/main/resources/mapper/CneterRoleMenuMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nafmii.admin.user.dao.CneterRoleMenuMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CneterRoleMenuPO">
<id column="ID" property="id" />
<result column="ROLE_ID" property="roleId" />
<result column="MENU_ID" property="menuId" />
<result column="IS_ENABLE" property="isEnable" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
ID, ROLE_ID, MENU_ID, IS_ENABLE
</sql>
</mapper>
nafmii-common/src/main/java/org/nafmii/common/constant/MessageEnum.java
...@@ -23,6 +23,9 @@ public enum MessageEnum { ...@@ -23,6 +23,9 @@ public enum MessageEnum {
CODE_ERROR(-114L, "验证码错误或失效！"), CODE_ERROR(-114L, "验证码错误或失效！"),
EXCEL_ERROR(-115L, "导入模板列数不匹配！"), EXCEL_ERROR(-115L, "导入模板列数不匹配！"),
FAIR_PASSWORD(-116L, "密码有误！"), FAIR_PASSWORD(-116L, "密码有误！"),
FAIR_WEBLOGIN(-117L, "账号或密码为空！"),
FAIR_USERENABLE(-118L, "该用户无效！"),
FAIR_PWD_NAME(-118L, "账号或密码错误！"),
; ;
private Long code; private Long code;
......
nafmii-common/src/main/java/org/nafmii/common/constant/UserEnum.java
...@@ -10,6 +10,10 @@ package org.nafmii.common.constant; ...@@ -10,6 +10,10 @@ package org.nafmii.common.constant;
*/ */
public enum UserEnum{ public enum UserEnum{
/** /**
* 用户删除
*/
DELETE("1","删除"),
/**
* 是否开启人脸识别登录 0 未开启 1 已开启 * 是否开启人脸识别登录 0 未开启 1 已开启
*/ */
FACE("1", "已开启"), FACE("1", "已开启"),
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!