Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit c6e31658 by 孙长庆
Options

中心端角色接口调整

1 parent 65fe01cd
Inline Side-by-side
Showing 9 changed files with 148 additions and 91 deletions
nafmii-admin/src/main/java/org/nafmii/admin/user/controller/CenterRoleController.java
package org.nafmii.admin.user.controller;
import com.github.pagehelper.PageHelper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nafmii.admin.user.dto.CenterRoleDto;
import org.nafmii.admin.user.param.QueryRolesParam;
import org.nafmii.admin.user.service.ICenterRoleService;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.param.PageResult;
import org.nafmii.common.response.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
* 中心端角色表 前端控制器
......@@ -21,39 +28,42 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/nafmii/admin/role")
@Api(tags = "3.0.0", description = "中心端角色接口")
public class CenterRoleController {
@Autowired
@Resource
private ICenterRoleService centerRoleService;
@ApiOperation( value = "中心端角色新增修改",notes = "中心端角色新增修改")
@PostMapping("/edit")
@ResponseBody
public ApiResponse editRoles (@RequestBody CenterRoleDto centerRoleDto){
ApiResponse<CenterUserVO> login = centerRoleService.editRoles(centerRoleDto);
return login;
public ApiResponse editRoles (@Validated @RequestBody CenterRoleDto centerRoleDto){
ApiResponse result = centerRoleService.editRoles(centerRoleDto);
return result;
}
@ApiOperation( value = "中心端角色查询",notes = "中心端角色查询")
@PostMapping("/query")
@ApiOperation( value = "中心端角色列表查询",notes = "中心端角色列表查询")
@PostMapping("/queryRolesList")
@ResponseBody
public ApiResponse queryRoles (){
ApiResponse<CenterUserVO> login = centerRoleService.queryRoles();
return login;
public ApiResponse<List<CenterRoleVO>> queryRolesList (@RequestBody @Validated QueryRolesParam param){
PageHelper.startPage(param.getPageNum(),param.getPageSize());
PageResult<CenterRoleVO> result =
BeanTransferUtils.toPagedResult(centerRoleService.queryRolesList(param),CenterRoleVO.class);
return new ApiResponse(result);
}
@ApiOperation( value = "中心端角色删除",notes = "中心端角色删除")
@PostMapping("/delete")
@ResponseBody
public ApiResponse deleteRoles(@RequestParam Long[] ids){
ApiResponse<CenterUserVO> login = centerRoleService.deleteRoles(ids);
return login;
ApiResponse result = centerRoleService.deleteRoles(ids);
return result;
}
@ApiOperation( value = "中心端用户对应角色查询",notes = "中心端用户对应角色查询")
@PostMapping("/queryUserRole")
@ResponseBody
public ApiResponse queryRolesByUser (@RequestParam Long userid){
ApiResponse<CenterUserVO> login = centerRoleService.queryRolesByUser(userid);
return login;
public ApiResponse queryRolesByUser (){
ApiResponse result = centerRoleService.queryRolesByUser();
return result;
}
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterRoleMapper.java
package org.nafmii.admin.user.dao;
import org.nafmii.admin.user.entity.CenterRolePO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.admin.user.dto.QueryRolesDto;
import org.nafmii.admin.user.entity.CenterRolePO;
import org.nafmii.admin.user.vo.CenterRoleVO;
import java.util.List;
......@@ -27,13 +28,14 @@ public interface CenterRoleMapper extends BaseMapper<CenterRolePO> {
/**
* @author:suncq
* @Function:中心端角色查询
* @Function:中心端角色列表查询
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
* @param dto
*/
List<CenterUserVO> queryRoles();
List<CenterRoleVO> queryRolesList(QueryRolesDto dto);
/**
* @author:suncq
......@@ -53,5 +55,5 @@ public interface CenterRoleMapper extends BaseMapper<CenterRolePO> {
* @version:
* @remark:
*/
List queryRolesByUser(Long userid);
List<CenterRoleVO> queryRolesByUser(Long userId);
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/CenterRoleDto.java
package org.nafmii.admin.user.dto;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
/**
* <p>
......@@ -21,10 +19,7 @@ import java.time.LocalDateTime;
@ApiModel("中心端新增修改角色参数对象")
public class CenterRoleDto extends Model {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "主键")
@TableId("ID")
private Long id;
@ApiModelProperty(value = "角色名称")
......@@ -40,5 +35,4 @@ public class CenterRoleDto extends Model {
@ApiModelProperty(value = "修改人")
private Long updateUserId;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/dto/QueryRolesDto.java 0 → 100644
package org.nafmii.admin.user.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.nafmii.common.param.PageQuery;
import java.time.LocalDate;
/**
* @author suncq
* @date 2021/4/28
*/
@Data
@ApiModel(value = "角色列表查询数据交互类型")
public class QueryRolesDto extends PageQuery {
@ApiModelProperty(value = "创建开始时间")
private LocalDate StartCreateTime;
@ApiModelProperty(value = "创建结束时间")
private LocalDate endCreateTime;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/QueryRolesParam.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;
import java.time.LocalDate;
/**
* @author suncq
* @date 2021/4/28
*/
@Data
@ApiModel(value="角色列表查询入参对象")
public class QueryRolesParam extends PageQuery {
@ApiModelProperty(value = "创建开始时间 yyyy-MM-dd")
private LocalDate startCreateTime;
@ApiModelProperty(value = "创建结束时间 yyyy-MM-dd")
private LocalDate endCreateTime;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterRoleService.java
package org.nafmii.admin.user.service;
import org.nafmii.admin.user.dto.CenterRoleDto;
import org.nafmii.admin.user.dto.LoginDto;
import org.nafmii.admin.user.entity.CenterRolePO;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.admin.user.param.QueryRolesParam;
import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.common.response.ApiResponse;
import java.util.List;
/**
* <p>
* 中心端角色表 服务类
......@@ -28,13 +28,13 @@ public interface ICenterRoleService{
/**
* @author:suncq
* @Function:中心端角色查询
* @Function:中心端角色列表查询
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
*/
ApiResponse queryRoles();
List<CenterRoleVO> queryRolesList(QueryRolesParam param);
/**
* @author:suncq
......@@ -54,5 +54,5 @@ public interface ICenterRoleService{
* @version:
* @remark:
*/
ApiResponse queryRolesByUser(Long userid);
ApiResponse queryRolesByUser();
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterRoleServiceImpl.java
package org.nafmii.admin.user.service.impl;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.StrUtil;
import org.nafmii.admin.user.dao.CenterRoleMapper;
import org.nafmii.admin.user.dao.CenterUserMapper;
import org.nafmii.admin.user.dto.CenterRoleDto;
import org.nafmii.admin.user.dto.QueryRolesDto;
import org.nafmii.admin.user.entity.CenterRolePO;
import org.nafmii.admin.user.param.QueryRolesParam;
import org.nafmii.admin.user.service.ICenterRoleService;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.exception.BusinessException;
import org.nafmii.admin.user.vo.CenterRoleVO;
import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.response.ApiResponse;
import org.nafmii.common.utils.RequestUtils;
import org.nafmii.common.utils.SnowFlakeUtil;
import org.springframework.stereotype.Service;
......@@ -37,70 +37,63 @@ public class CenterRoleServiceImpl implements ICenterRoleService {
*/
@Override
public ApiResponse editRoles(CenterRoleDto centerRoleDto) {
ApiResponse apiResponse =new ApiResponse();
Long roleId = centerRoleDto.getId();
if(null == roleId){//新增
CenterRolePO crp = new CenterRolePO();
crp.setId(SnowFlakeUtil.nextId());
crp.setRName(centerRoleDto.getRName());
crp.setCreateUserId(123l);
crp.setCreateUserId(RequestUtils.getUserId());
crp.setCreatTime(LocalDateTime.now());
crp.setUpdateUserId(123l);
crp.setUpdateUserId(RequestUtils.getUserId());
crp.setUpdateTime(LocalDateTime.now());
crp.setIsEnable(centerRoleDto.getIsEnable());
int i = centerRoleMapper.insert(crp);
if (i<0){
throw new BusinessException("新增失败，请稍后重试");
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}else{
apiResponse.setStatus(200);
apiResponse.setStatusText("新增成功");
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
}
}else{//修改
CenterRolePO crp = new CenterRolePO();
crp.setId(centerRoleDto.getId());
crp.setRName(centerRoleDto.getRName());
crp.setCreateUserId(123l);
crp.setCreatTime(LocalDateTime.now());
crp.setUpdateUserId(123l);
crp.setUpdateUserId(RequestUtils.getUserId());
crp.setUpdateTime(LocalDateTime.now());
crp.setIsEnable(centerRoleDto.getIsEnable());
int i = centerRoleMapper.updateRoleById(crp);
if (i<0){
throw new BusinessException("修改失败，请稍后重试");
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}else{
apiResponse.setStatus(200);
apiResponse.setStatusText("修改成功");
return new ApiResponse(ApiResponse.SUCCESS,ApiResponse.SUCCESS_TEXT);
}
}
return apiResponse;
}
/**
* 中心端角色查询
* 中心端角色列表查询
* @param
* @return
*/
@Override
public ApiResponse queryRoles() {
ApiResponse apiResponse =new ApiResponse();
List<CenterUserVO> result = centerRoleMapper.queryRoles();
apiResponse.setData(result);
apiResponse.setStatus(200);
apiResponse.setStatusText("查询成功");
return apiResponse;
public List<CenterRoleVO> queryRolesList(QueryRolesParam param) {
QueryRolesDto dto = BeanTransferUtils.transfer(param, QueryRolesDto.class);
List<CenterRoleVO> result = centerRoleMapper.queryRolesList(dto);
return result;
}
/**
* 中心端角色查询
* 中心端角色删除
* @param
* @return
*/
@Override
public ApiResponse deleteRoles(Long[] ids) {
ApiResponse apiResponse =new ApiResponse();
int result = centerRoleMapper.deleteRoles(ids);
apiResponse.setData(result);
apiResponse.setStatus(200);
apiResponse.setStatusText("删除成功");
return apiResponse;
if (result<0) {
return new ApiResponse(ApiResponse.FAIL,ApiResponse.FAIL_TEXT);
}else{
return new ApiResponse(ApiResponse.SUCCESS, ApiResponse.SUCCESS_TEXT);
}
}
/**
......@@ -109,12 +102,9 @@ public class CenterRoleServiceImpl implements ICenterRoleService {
* @return
*/
@Override
public ApiResponse queryRolesByUser(Long userid) {
ApiResponse apiResponse =new ApiResponse();
List result = centerRoleMapper.queryRolesByUser(userid);
apiResponse.setData(result);
apiResponse.setStatus(200);
apiResponse.setStatusText("查询成功");
return apiResponse;
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/vo/CenterRoleVO.java
package org.nafmii.admin.user.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
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;
import java.time.LocalDateTime;
/**
* <p>
......
nafmii-admin/src/main/resources/mapper/CenterRoleMapper.xml
......@@ -17,7 +17,7 @@
<sql id="Base_Column_List">
ID, R_NAME, CREAT_TIME, UPDATE_TIME, IS_ENABLE, CREATE_USER_ID, UPDATE_USER_ID
</sql>
<!-- 新增修改中心端角色 -->
<!-- 修改中心端角色 -->
<update id="updateRoleById" parameterType="map" >
update CENTER_ROLE
<set >
......@@ -37,25 +37,47 @@
where ID = #{id,jdbcType=VARCHAR}
</update>
<!-- 查询中心端角色 -->
<select id="queryRoles" 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
<!-- 查询中心端角色列表 -->
<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>
<!-- 删除中心端角色 -->
<delete id="deleteRoles">
delete
from CENTER_ROLE
<update id="deleteRoles">
update
CENTER_ROLE
set IS_ENABLE = "1"
where ID IN
<foreach collection="array" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</update>
<!-- 中心端用户对应角色查询 -->
<select id="queryRolesByUser" resultType="java.util.List">
<!-- TODO -->
<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>
</mapper>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!