feat:用户接口开发v1
This commit is contained in:
@@ -54,6 +54,7 @@ public class AuthorizationServerConfig {
|
||||
.authorizeRequests(authorizeRequests -> authorizeRequests
|
||||
.antMatchers("/public/**").permitAll()
|
||||
.antMatchers("/open/**").permitAll()
|
||||
.antMatchers("/private/**").permitAll()
|
||||
.anyRequest().authenticated()
|
||||
)
|
||||
.sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.xiang.xservice.auth.service.convert;
|
||||
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.resp.UserResp;
|
||||
import com.xiang.xservice.auth.service.entity.XUser;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface XUserConvert {
|
||||
XUserConvert INSTANCE = Mappers.getMapper(XUserConvert.class);
|
||||
|
||||
XUser toDO (UserQueryRequest request);
|
||||
XUser toDO (UserAddRequest request);
|
||||
XUser toDO (UserUpdateRequest request);
|
||||
|
||||
List<UserResp> toRespList(List<XUser> list);
|
||||
|
||||
UserResp toResp(XUser user);
|
||||
}
|
||||
@@ -2,14 +2,21 @@ package com.xiang.xservice.auth.service.repository.mapper;
|
||||
|
||||
import com.xiang.xservice.auth.service.entity.XUser;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Repository
|
||||
@Mapper
|
||||
public interface XUserMapper {
|
||||
|
||||
/**
|
||||
* 根据用户名查询用户
|
||||
* @param username
|
||||
* @return
|
||||
*/
|
||||
XUser selectByUsername(String username);
|
||||
|
||||
/**
|
||||
@@ -19,5 +26,40 @@ public interface XUserMapper {
|
||||
*/
|
||||
int insert(XUser user);
|
||||
|
||||
/**
|
||||
* 批量插入
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
int insertBatch(List<XUser> list);
|
||||
|
||||
/**
|
||||
* 查询用户列表
|
||||
* @param user
|
||||
* @return
|
||||
*/
|
||||
List<XUser> getUserList(XUser user);
|
||||
|
||||
/**
|
||||
* 查询用户详情
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
XUser getUserById(Long id);
|
||||
|
||||
/**
|
||||
* 编辑用户
|
||||
* @param user
|
||||
* @return
|
||||
*/
|
||||
int update(XUser user);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
* @param ids
|
||||
* @param time
|
||||
* @param operator
|
||||
* @return
|
||||
*/
|
||||
int deleteBatch(@Param("ids") List<Long> ids, @Param("time") LocalDateTime time, @Param("operator") String operator);
|
||||
}
|
||||
|
||||
@@ -2,10 +2,17 @@ package com.xiang.xservice.auth.service.service;
|
||||
|
||||
import com.xiang.xservice.auth.api.dto.req.LoginRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserRoleUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.resp.LoginResp;
|
||||
import com.xiang.xservice.auth.api.dto.resp.RegisterResp;
|
||||
import com.xiang.xservice.auth.api.dto.resp.UserResp;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface XUserService {
|
||||
|
||||
LoginResp login(LoginRequest request);
|
||||
@@ -13,4 +20,18 @@ public interface XUserService {
|
||||
UserResp getUserByUsername(String username);
|
||||
|
||||
RegisterResp userRegister(RegisterRequest request);
|
||||
|
||||
List<UserResp> getUserList(UserQueryRequest request);
|
||||
|
||||
UserResp getUserInfo(Long id);
|
||||
|
||||
Boolean addUser(UserAddRequest request);
|
||||
|
||||
Boolean updateUser(UserUpdateRequest request);
|
||||
|
||||
Boolean delUser(List<Long> ids);
|
||||
|
||||
Boolean setUserDept(UserDeptUpdateRequest request);
|
||||
|
||||
Boolean setUserRole(UserRoleUpdateRequest request);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
package com.xiang.xservice.auth.service.service.impl;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.xiang.xservice.auth.api.code.UserErrorCode;
|
||||
import com.xiang.xservice.auth.api.dto.req.LoginRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserRoleUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
|
||||
import com.xiang.xservice.auth.api.dto.resp.LoginResp;
|
||||
import com.xiang.xservice.auth.api.dto.resp.RegisterResp;
|
||||
import com.xiang.xservice.auth.api.dto.resp.UserResp;
|
||||
import com.xiang.xservice.auth.service.convert.XUserConvert;
|
||||
import com.xiang.xservice.auth.service.entity.XUser;
|
||||
import com.xiang.xservice.auth.service.enums.UserStatusEnum;
|
||||
import com.xiang.xservice.auth.service.repository.mapper.XUserMapper;
|
||||
@@ -14,6 +21,7 @@ import com.xiang.xservice.basic.enums.DelStatusEnum;
|
||||
import com.xiang.xservice.basic.exception.BusinessException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.security.authentication.AuthenticationManager;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.core.Authentication;
|
||||
@@ -23,10 +31,12 @@ import org.springframework.security.oauth2.jwt.JwtClaimsSet;
|
||||
import org.springframework.security.oauth2.jwt.JwtEncoder;
|
||||
import org.springframework.security.oauth2.jwt.JwtEncoderParameters;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Slf4j
|
||||
@@ -38,6 +48,7 @@ public class XUserServiceImpl implements XUserService {
|
||||
private final XUserMapper userMapper;
|
||||
private final AuthenticationManager authenticationManager;
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
private final XUserConvert userConvert;
|
||||
|
||||
@Override
|
||||
public LoginResp login(LoginRequest request) {
|
||||
@@ -122,4 +133,55 @@ public class XUserServiceImpl implements XUserService {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UserResp> getUserList(UserQueryRequest request) {
|
||||
List<XUser> userList = userMapper.getUserList(userConvert.toDO(request));
|
||||
if (CollectionUtils.isEmpty(userList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return userConvert.toRespList(userList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserResp getUserInfo(Long id) {
|
||||
XUser user = userMapper.getUserById(id);
|
||||
return userConvert.toResp(user);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean addUser(UserAddRequest request) {
|
||||
XUser user = userConvert.toDO(request);
|
||||
user.setCreateBy(request.getOperator());
|
||||
user.setCreateTime(request.getDateTime());
|
||||
user.setUpdateBy(request.getOperator());
|
||||
user.setUpdateTime(request.getDateTime());
|
||||
return userMapper.insert(user) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateUser(UserUpdateRequest request) {
|
||||
XUser user = userConvert.toDO(request);
|
||||
user.setCreateBy(request.getOperator());
|
||||
user.setCreateTime(request.getDateTime());
|
||||
user.setUpdateBy(request.getOperator());
|
||||
user.setUpdateTime(request.getDateTime());
|
||||
return userMapper.update(user) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean delUser(List<Long> ids) {
|
||||
return userMapper.deleteBatch(ids, LocalDateTime.now(), "System") > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean setUserDept(UserDeptUpdateRequest request) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean setUserRole(UserRoleUpdateRequest request) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,6 +160,12 @@
|
||||
</set>
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
<update id="deleteBatch">
|
||||
update x_user set del_flag = 0, update_time = #{time}, update_by = #{operator} where id in
|
||||
<foreach collection="ids" item="id" open="(" close=")" separator=",">
|
||||
#{id}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
<select id="selectByUsername" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/>
|
||||
@@ -167,4 +173,54 @@
|
||||
where username = #{username} and del_flag = 0 and status = 1
|
||||
</select>
|
||||
|
||||
<select id="getUserList" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/>
|
||||
from x_user
|
||||
<trim prefix="AND">
|
||||
<where>
|
||||
<if test="name != null and name != ''">
|
||||
AND name LIKE CONCAT('%', #{name}, '%')
|
||||
</if>
|
||||
<if test="username != null and username != ''">
|
||||
AND username = #{username}
|
||||
</if>
|
||||
<if test="email != null and email != ''">
|
||||
AND email = #{email}
|
||||
</if>
|
||||
<if test="phone != null and phone != ''">
|
||||
AND phone = #{phone}
|
||||
</if>
|
||||
<if test="status != null">
|
||||
AND status = #{status}
|
||||
</if>
|
||||
<if test="delFlag != null">
|
||||
AND del_flag = #{delFlag}
|
||||
</if>
|
||||
<if test="loginIp != null and loginIp != ''">
|
||||
AND login_ip = #{loginIp}
|
||||
</if>
|
||||
<if test="loginDate != null">
|
||||
AND login_date = #{loginDate}
|
||||
</if>
|
||||
<if test="createBy != null and createBy != ''">
|
||||
AND create_by = #{createBy}
|
||||
</if>
|
||||
<if test="updateBy != null and updateBy != ''">
|
||||
AND update_by = #{updateBy}
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
AND create_time >= #{createTime}
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
AND update_time <= #{updateTime}
|
||||
</if>
|
||||
</where>
|
||||
</trim>
|
||||
</select>
|
||||
<select id="getUserById" resultMap="BaseResultMap">
|
||||
select <include refid="Base_Column_List"/>
|
||||
from x_user
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user