Commit 939209e0 by ypenglv

新增工具类

1 parent b88cb5dc
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.LoginDto;
import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.service.ICenterUserService;
import org.nafmii.admin.user.vo.CenterUserVO;
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 java.util.List;
/**
* <p>
* 中心端-用户表 前端控制器
......@@ -31,5 +38,14 @@ public class CenterUserController {
ApiResponse<CenterUserVO> login = centerUserService.userLogin(loginDto);
return login;
}
@ApiOperation( value = "中心端用户列表",notes = "中心端用户列表")
@PostMapping("/queryUserList")
@ResponseBody
public ApiResponse<List<CenterUserVO>> queryUserList (@RequestBody @Validated QueryUsersParam param){
PageHelper.startPage(param.getPageNum(),param.getPageSize());
PageResult<CenterUserVO> result = BeanTransferUtils.toPagedResult(centerUserService.queryUserList(param),CenterUserVO.class);
return new ApiResponse(result);
}
}
......@@ -3,6 +3,7 @@ package org.nafmii.admin.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.nafmii.admin.user.dto.QueryUsersDto;
import org.nafmii.admin.user.entity.CenterUserPO;
import org.nafmii.admin.user.vo.CenterUserVO;
......@@ -27,4 +28,11 @@ public interface CenterUserMapper extends BaseMapper<CenterUserPO> {
* @remark:
*/
List<CenterUserVO> selectUserByPhone(@Param("phone") String phone);
/**
* 用户列表查询
* @param dto
* @return
*/
List<CenterUserVO> queryUserList(QueryUsersDto dto);
}
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 lvyp
* @date 2021/4/28
*/
@Data
@ApiModel(value = "用户列表查询数据交互类型")
public class QueryUsersDto extends PageQuery {
@ApiModelProperty(value = "创建开始时间")
private LocalDate StartCreateTime;
@ApiModelProperty(value = "创建结束时间")
private LocalDate endCreateTime;
}
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 javax.validation.constraints.Pattern;
import java.time.LocalDate;
/**
* @author lvyp
* @date 2021/4/28
*/
@Data
@ApiModel(value="用户列表查询入参对象")
public class QueryUsersParam extends PageQuery {
@ApiModelProperty(value = "创建开始时间 yyyy-MM-dd")
private LocalDate StartCreateTime;
@ApiModelProperty(value = "创建结束时间 yyyy-MM-dd")
private LocalDate endCreateTime;
}
package org.nafmii.admin.user.service;
import org.nafmii.admin.user.dto.LoginDto;
import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.response.ApiResponse;
import java.util.List;
/**
* <p>
* 中心端-用户表 服务类
......@@ -22,4 +25,5 @@ public interface ICenterUserService {
* @remark:
*/
ApiResponse<CenterUserVO> userLogin(LoginDto loginDto);
List<CenterUserVO> queryUserList(QueryUsersParam param);
}
......@@ -2,9 +2,12 @@ package org.nafmii.admin.user.service.impl;
import org.nafmii.admin.user.dao.CenterUserMapper;
import org.nafmii.admin.user.dto.LoginDto;
import org.nafmii.admin.user.dto.QueryUsersDto;
import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.service.ICenterUserService;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.exception.BusinessException;
import org.nafmii.common.param.BeanTransferUtils;
import org.nafmii.common.response.ApiResponse;
import org.springframework.stereotype.Service;
......@@ -50,4 +53,11 @@ public class CenterUserServiceImpl implements ICenterUserService {
}
return apiResponse;
}
@Override
public List<CenterUserVO> queryUserList(QueryUsersParam param) {
QueryUsersDto dto = BeanTransferUtils.transfer(param,QueryUsersDto.class);
return centerUserMapper.queryUserList(dto);
}
}
......@@ -35,5 +35,16 @@
and PHONE =#{phone}
</if>
</select>
<select id="queryUserList" parameterType="org.nafmii.admin.user.dto.QueryUsersDto"
resultType="org.nafmii.admin.user.vo.CenterUserVO">
SELECT
<include refid="Base_Column_List" />
FROM CENTER_USER CU
<where>
<if test="StartCreateTime != null and endCreateTime != null">
DATE_FORMAT(CU.CREATE_TIME,'%Y-%m-%d') BETWEEN #{StartCreateTime} and #{endCreateTime}
</if>
</where>
</select>
</mapper>
......@@ -9,6 +9,7 @@ import org.nafmii.app.user.vo.UserVO;
import org.nafmii.common.response.ApiResponse;
import org.nafmii.common.utils.RequestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
......@@ -45,7 +46,7 @@ public class UserController {
@ApiOperation( value = "app用户登陆接口(密码加验证码)",notes = "app用户登陆接口(密码加验证码)")
@PostMapping("/userLogin")
@ResponseBody
public ApiResponse<UserVO> login (@RequestBody LoginDto loginDto){
public ApiResponse<UserVO> login (@RequestBody @Validated LoginDto loginDto){
Long userId = RequestUtils.getUserId();
ApiResponse<UserVO> login = userService.userLogin(loginDto);
return login;
......
......@@ -2,6 +2,8 @@ package org.nafmii.common.param;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
/**
* @author by zhangbr
* @date 2020/6/24.
......@@ -9,8 +11,10 @@ import io.swagger.annotations.ApiModelProperty;
public class PageQuery {
@ApiModelProperty("当前页码")
@NotNull(message = "页码不能为空")
private Integer pageNum = 1;
@ApiModelProperty("每页显示条数,默认30")
@NotNull(message = "每页条数不能为空")
private Integer pageSize = 30;
@ApiModelProperty(value = "是否分页,默认:true")
private Boolean isPage = true;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!