Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit 1534ea2a by ypenglv
Options

Merge remote-tracking branch 'origin/dev' into dev

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