Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit 9f712d1f by 孙长庆
Options

中心端用户接口调整

1 parent c6e31658
Inline Side-by-side
Showing 8 changed files with 79 additions and 44 deletions
nafmii-admin/src/main/java/org/nafmii/admin/user/controller/CenterUserController.java
......@@ -3,17 +3,17 @@ 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.LoginParam;
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 javax.annotation.Resource;
import java.util.List;
/**
......@@ -28,16 +28,17 @@ import java.util.List;
@RequestMapping("/nafmii/admin/user")
@Api(tags = "3.0.0", description = "中心端用户接口")
public class CenterUserController {
@Autowired
@Resource
private ICenterUserService centerUserService;
@ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆")
@PostMapping("/login")
@ResponseBody
public ApiResponse<CenterUserVO> login (@RequestBody LoginDto loginDto){
ApiResponse<CenterUserVO> login = centerUserService.userLogin(loginDto);
public ApiResponse<CenterUserVO> login (@Validated @RequestBody LoginParam param){
ApiResponse<CenterUserVO> login = centerUserService.userLogin(param);
return login;
}
@ApiOperation( value = "中心端用户列表",notes = "中心端用户列表")
@PostMapping("/queryUserList")
@ResponseBody
......
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterUserMapper.java
......@@ -27,12 +27,15 @@ public interface CenterUserMapper extends BaseMapper<CenterUserPO> {
* @version:
* @remark:
*/
List<CenterUserVO> selectUserByPhone(@Param("phone") String phone);
CenterUserVO selectUserByPhone(@Param("phone") String phone);
/**
* 用户列表查询
* @param dto
* @return
* @author:suncq
* @Function:用户列表查询
* @date 2021/4/28
* @ClassName:
* @version:
* @remark:
*/
List<CenterUserVO> queryUserList(QueryUsersDto dto);
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/LoginParam.java 0 → 100644
package org.nafmii.admin.user.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author:suncq
* @Function:TODO
* @date 2021/4/28
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("中心端用户登陆参数对象")
public class LoginParam {
@NotNull(message = "手机号或登录账号不能为空")
@ApiModelProperty("手机号/登录账号")
private String phone;
@ApiModelProperty("登陆密码")
@NotNull(message = "登陆密码不能为空")
private String loginPwd;
@NotNull(message = "登陆方式不能为空")
@ApiModelProperty("登陆方式0密码1验证码")
private String type;
}
nafmii-admin/src/main/java/org/nafmii/admin/user/param/QueryUsersParam.java
......@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.nafmii.common.param.PageQuery;
import javax.validation.constraints.Pattern;
import java.time.LocalDate;
/**
......@@ -16,7 +15,7 @@ import java.time.LocalDate;
@ApiModel(value="用户列表查询入参对象")
public class QueryUsersParam extends PageQuery {
@ApiModelProperty(value = "创建开始时间 yyyy-MM-dd")
private LocalDate StartCreateTime;
private LocalDate startCreateTime;
@ApiModelProperty(value = "创建结束时间 yyyy-MM-dd")
private LocalDate endCreateTime;
......
nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterUserService.java
package org.nafmii.admin.user.service;
import org.nafmii.admin.user.dto.LoginDto;
import org.nafmii.admin.user.param.LoginParam;
import org.nafmii.admin.user.param.QueryUsersParam;
import org.nafmii.admin.user.vo.CenterUserVO;
import org.nafmii.common.response.ApiResponse;
......@@ -24,6 +24,15 @@ public interface ICenterUserService {
* @version:
* @remark:
*/
ApiResponse<CenterUserVO> userLogin(LoginDto loginDto);
ApiResponse<CenterUserVO> userLogin(LoginParam param);
/**
* @author:suncq
* @Function:中心端用户列表查询
* @date 2021/4/27
* @ClassName:
* @version:
* @remark:
*/
List<CenterUserVO> queryUserList(QueryUsersParam param);
}
nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterUserServiceImpl.java
package org.nafmii.admin.user.service.impl;
import lombok.extern.slf4j.Slf4j;
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.LoginParam;
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;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -23,6 +22,7 @@ import java.util.List;
* @author suncq
* @since 2021-04-27
*/
@Slf4j
@Service
public class CenterUserServiceImpl implements ICenterUserService {
@Resource
......@@ -30,34 +30,28 @@ public class CenterUserServiceImpl implements ICenterUserService {
/**
* 中心端用户登陆
* @param loginDto
* @param param
* @return
*/
@Override
public ApiResponse<CenterUserVO> userLogin(LoginDto loginDto) {
ApiResponse apiResponse =new ApiResponse();
List<CenterUserVO> userVo = new ArrayList<>();
public ApiResponse<CenterUserVO> userLogin(LoginParam param) {
log.info("===============中心端用户登录请求参数======》{}",param);
CenterUserVO userVo = new CenterUserVO();
//账号密码登陆
String phone = loginDto.getPhone();
String phone = param.getPhone();
userVo = centerUserMapper.selectUserByPhone(phone);
if (userVo.isEmpty()){
throw new BusinessException("该用户未注册，请先注册！");
}else{
if(!loginDto.getLoginPwd().equals(userVo.get(0).getLoginPwd())){
throw new BusinessException("用户名或密码错误，请重新输入！");
}else{
apiResponse.setData(userVo);
apiResponse.setStatus(200);
apiResponse.setStatusText("登录成功！");
}
if (null == userVo){
return new ApiResponse(ApiResponse.FAIL,"该用户未注册，请先注册！");
}
return apiResponse;
if(!param.getLoginPwd().equals(userVo.getLoginPwd())){
return new ApiResponse(ApiResponse.FAIL,"用户名或密码错误！");
}
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/vo/CenterUserVO.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/CenterUserMapper.xml
......@@ -25,12 +25,13 @@
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
</sql>
<!-- 根据登录人账号（手机号）查询用户信息 -->
<select id="selectUserByPhone" parameterType="java.util.Map" resultType="org.nafmii.admin.user.vo.CenterUserVO">
<select id="selectUserByPhone" parameterType="map" resultType="org.nafmii.admin.user.vo.CenterUserVO">
select
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,
CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from CENTER_USER where IS_ENABLE = 0
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,
CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from CENTER_USER
where IS_ENABLE = 0
<if test="phone !=null">
and PHONE =#{phone}
</if>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!