获取单条用户信息
This commit is contained in:
parent
c83a56c6de
commit
8ce88269b8
|
|
@ -1,9 +1,11 @@
|
|||
package com.electromagnetic.industry.software.data.manage.controller.user;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResult;
|
||||
import electromagnetic.data.framework.share.result.BaseResult;
|
||||
import electromagnetic.data.framework.share.result.LoginResult;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
|
@ -32,7 +34,16 @@ public class UserController {
|
|||
|
||||
@ApiOperation(value = "发布用户信息", notes = "")
|
||||
@RequestMapping(value = "/publish", method = RequestMethod.POST)
|
||||
public BaseResult<?> publishUser(@RequestBody UserPublishRequest userPublishRequest) {
|
||||
public ElectromagneticResult<?> publishUser(@RequestBody UserPublishRequest userPublishRequest) {
|
||||
return userFacade.publishUser(userPublishRequest);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取单条用户信息", notes = "")
|
||||
@RequestMapping(value = "/{userId}", method = RequestMethod.GET)
|
||||
public ElectromagneticResult<?> getSingleUser(@PathVariable String userId) {
|
||||
GetSingleUserRequest getSingleUserRequest = new GetSingleUserRequest();
|
||||
getSingleUserRequest.setUserId(userId);
|
||||
return userFacade.getSingleUser(getSingleUserRequest);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,4 +25,11 @@ public interface UserRepository {
|
|||
* @return
|
||||
*/
|
||||
User selectUserByWorkNumber(String workNumber);
|
||||
|
||||
/**
|
||||
* 通过用户编码查询用户
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
User getSingleUser(String userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,4 +35,11 @@ public interface UserService {
|
|||
* @return
|
||||
*/
|
||||
Boolean matchPassword(User user, String password);
|
||||
|
||||
/**
|
||||
* 获取单条用户信息
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
User getSingleUser(String userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,4 +60,12 @@ public class UserServiceImpl implements UserService {
|
|||
*/
|
||||
@Override
|
||||
public Boolean publishUser(List<String> userIds) { return userRepository.publish(userIds)>0; }
|
||||
|
||||
/**
|
||||
* 获取单条用户信息
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public User getSingleUser(String userId) { return userRepository.getSingleUser(userId); }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
package com.electromagnetic.industry.software.data.manage.facade.user;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResult;
|
||||
import electromagnetic.data.framework.share.result.BaseResult;
|
||||
import electromagnetic.data.framework.share.result.LoginResult;
|
||||
|
||||
|
|
@ -27,5 +29,12 @@ public interface UserFacade {
|
|||
* @param userPublishRequest
|
||||
* @return
|
||||
*/
|
||||
BaseResult<?> publishUser(UserPublishRequest userPublishRequest);
|
||||
ElectromagneticResult<?> publishUser(UserPublishRequest userPublishRequest);
|
||||
|
||||
/**
|
||||
* 通过用户编码获取单条用户信息
|
||||
* @param getSingleUserRequest
|
||||
* @return
|
||||
*/
|
||||
ElectromagneticResult<?> getSingleUser(GetSingleUserRequest getSingleUserRequest);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,4 +27,11 @@ public interface UserMapper {
|
|||
* @return
|
||||
*/
|
||||
User selectUserByWorkNumber(String workNumber);
|
||||
|
||||
/**
|
||||
* 通过用户编码查询用户
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
User getSingleUser(String userId);
|
||||
}
|
||||
|
|
@ -48,4 +48,14 @@ public class UserRepositoryImpl implements UserRepository {
|
|||
public User selectUserByWorkNumber(String workNumber) {
|
||||
return userMapper.selectUserByWorkNumber(workNumber);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过工号查询用户
|
||||
* @param userId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public User getSingleUser(String userId) {
|
||||
return userMapper.getSingleUser(userId);
|
||||
}
|
||||
}
|
||||
|
|
@ -84,4 +84,9 @@
|
|||
<include refid="selectUserVo" />
|
||||
where work_number = #{workNumber}
|
||||
</select>
|
||||
|
||||
<select id="getSingleUser" parameterType="String" resultMap="UserResultMap">
|
||||
<include refid="selectUserVo" />
|
||||
where user_id = #{userId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -1,16 +1,28 @@
|
|||
package com.electromagnetic.industry.software.data.manage.service.facade.user;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardDetial;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardPage;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.TokenService;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.util.UserConstant;
|
||||
import com.electromagnetic.industry.software.data.manage.facade.user.UserFacade;
|
||||
import com.electromagnetic.industry.software.data.manage.request.indicator.IndicatorCardRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardDetailReponse;
|
||||
import com.electromagnetic.industry.software.data.manage.response.indicator.IndicatorCardPageResponse;
|
||||
import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
|
||||
import com.electromagnetic.industry.software.data.manage.service.mappers.IndicatorCardMappers;
|
||||
import com.electromagnetic.industry.software.data.manage.service.mappers.UserMappers;
|
||||
import electromagnetic.data.framework.share.id.IdWorker;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResult;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
|
||||
import electromagnetic.data.framework.share.result.BaseResult;
|
||||
import electromagnetic.data.framework.share.result.LoginResult;
|
||||
import electromagnetic.data.framework.share.sign.AESUtils;
|
||||
|
|
@ -70,8 +82,33 @@ public class UserFacadeImpl implements UserFacade {
|
|||
* @return
|
||||
*/
|
||||
@Override
|
||||
public BaseResult<Boolean> publishUser(UserPublishRequest userPublishRequest){
|
||||
public ElectromagneticResult<Boolean> publishUser(UserPublishRequest userPublishRequest){
|
||||
List<String> userIds = userPublishRequest.getUserIds();
|
||||
return BaseResultUtil.success(userService.publishUser(userIds));
|
||||
return ElectromagneticResultUtil.success(userService.publishUser(userIds));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单条用户信息
|
||||
* @param getSingleUserRequest
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public ElectromagneticResult<SingleUserResponse> getSingleUser(GetSingleUserRequest getSingleUserRequest){
|
||||
//String userId = getSingleUserRequest.getUserId();
|
||||
//response
|
||||
//User user = new User();
|
||||
//user.setUserId(getSingleUserRequest.getUserId());
|
||||
User user = userService.getSingleUser(getSingleUserRequest.getUserId());
|
||||
SingleUserResponse singleUserResponse = UserMappers.INSTANCE.getSingleUserToResponse(user);
|
||||
return ElectromagneticResultUtil.success(singleUserResponse);
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public ElectromagneticResult<IndicatorCardDetailReponse> getIndicatorCardDetail(IndicatorCardRequest request) {
|
||||
// IndicatorCard card=new IndicatorCard();
|
||||
// card.setIndicatorCardNo(request.getIndicatorCardNo());
|
||||
// IndicatorCardDetial indicatorCardDetial=indicatorCardService.getIndicatorCardDetail(card);
|
||||
// IndicatorCardDetailReponse reponse=IndicatorCardMappers.INSTANCE.getIndicatorCardDetailToReponse(indicatorCardDetial);
|
||||
// return ElectromagneticResultUtil.success(reponse);
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@
|
|||
package com.electromagnetic.industry.software.data.manage.service.mappers;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserPublishRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
|
|
@ -34,4 +36,19 @@ public interface UserMappers {
|
|||
* @return
|
||||
*/
|
||||
UserLoginInfo getUserLoginRequestToModel(UserLoginRequest loginRequest);
|
||||
|
||||
|
||||
/**
|
||||
* 获取单条用户信息Request转用户模型
|
||||
* @param getSingleUserRequest
|
||||
* @return
|
||||
*/
|
||||
User getSingleUserRequestToModel(GetSingleUserRequest getSingleUserRequest);
|
||||
|
||||
/**
|
||||
* 获取单条用户信息Request转用户模型
|
||||
* @param user
|
||||
* @return
|
||||
*/
|
||||
SingleUserResponse getSingleUserToResponse(User user);
|
||||
}
|
||||
Loading…
Reference in New Issue