From 1e2d3cdb0fc55d14389ea6b4519035a840790b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E7=92=9E=E8=87=BB?= <349044@gmail.com> Date: Tue, 19 Nov 2024 13:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/sqlmapper/UserMapper.xml | 2 +- .../service/facade/user/UserFacadeImpl.java | 4 +- .../manage/service/mappers/UserMappers.java | 4 +- .../service/mappers/UserMappersImpl.java | 86 +++++++++++++++---- 4 files changed, 76 insertions(+), 20 deletions(-) diff --git a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml index 73a99e4..cf08d30 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml @@ -98,7 +98,7 @@ - SELECT * FROM ed_users diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java index 9991352..d4114fb 100644 --- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java @@ -134,7 +134,9 @@ public class UserFacadeImpl implements UserFacade { @Override public ElectromagneticResult searchUser(SearchUserRequest searchUserRequest){ List userList = userService.searchUser(UserMappers.INSTANCE.getSearchKeywordsRequestToModel(searchUserRequest)); - UserSearchResponse userSearchResponse = UserMappers.INSTANCE.userListToResponse(userList); + List singleUserResponseList = UserMappers.INSTANCE.userListToResponseList(userList); + UserSearchResponse userSearchResponse = new UserSearchResponse(); + userSearchResponse.setUserList(singleUserResponseList); return ElectromagneticResultUtil.success(userSearchResponse); } diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java index 185e4e6..c327309 100644 --- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java +++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java @@ -56,11 +56,11 @@ public interface UserMappers { SearchKeywords getSearchKeywordsRequestToModel(SearchUserRequest searchUserRequest); /** - * 获取单条用户信息Request转用户模型 + * 获取用户列表转response列表 * @param users * @return */ - UserSearchResponse userListToResponse(List users); + List userListToResponseList(List users); /** * 编辑用户Request转用户模型 diff --git a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java index 6228e69..070b3b4 100644 --- a/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java +++ b/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java @@ -1,16 +1,21 @@ package com.electromagnetic.industry.software.data.manage.service.mappers; +import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.SearchKeywords; 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.request.user.GetSingleUserRequest; +import com.electromagnetic.industry.software.data.manage.request.user.SearchUserRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest; +import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; +import com.electromagnetic.industry.software.data.manage.request.user.UserWorkNumRequest; import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse; +import java.util.ArrayList; +import java.util.List; import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-11-15T16:08:08+0800", + date = "2024-11-19T13:26:03+0800", comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_141 (Oracle Corporation)" ) public class UserMappersImpl implements UserMappers { @@ -52,20 +57,6 @@ public class UserMappersImpl implements UserMappers { return userLoginInfo; } - @Override - public User getSingleUserRequestToModel(GetSingleUserRequest getSingleUserRequest) { - if ( getSingleUserRequest == null ) { - return null; - } - - User user = new User(); - - user.setUserId( getSingleUserRequest.getUserId() ); - user.setUserName( getSingleUserRequest.getUserName() ); - - return user; - } - @Override public SingleUserResponse getSingleUserToResponse(User user) { if ( user == null ) { @@ -97,4 +88,67 @@ public class UserMappersImpl implements UserMappers { return singleUserResponse; } + + @Override + public SearchKeywords getSearchKeywordsRequestToModel(SearchUserRequest searchUserRequest) { + if ( searchUserRequest == null ) { + return null; + } + + SearchKeywords searchKeywords = new SearchKeywords(); + + return searchKeywords; + } + + @Override + public List userListToResponseList(List users) { + if ( users == null ) { + return null; + } + + List list = new ArrayList( users.size() ); + for ( User user : users ) { + list.add( getSingleUserToResponse( user ) ); + } + + return list; + } + + @Override + public User getUserModiRequestToModel(UserModiRequest userModiRequest) { + if ( userModiRequest == null ) { + return null; + } + + User user = new User(); + + user.setUserId( userModiRequest.getUserId() ); + user.setUserName( userModiRequest.getUserName() ); + user.setWorkNumber( userModiRequest.getWorkNumber() ); + user.setMobile( userModiRequest.getMobile() ); + user.setUserDept( userModiRequest.getUserDept() ); + user.setUserTitle( userModiRequest.getUserTitle() ); + user.setJoinTime( userModiRequest.getJoinTime() ); + user.setUserStatus( userModiRequest.getUserStatus() ); + user.setInternshipEndDate( userModiRequest.getInternshipEndDate() ); + user.setModifier( userModiRequest.getModifier() ); + user.setModifierName( userModiRequest.getModifierName() ); + + return user; + } + + @Override + public User getUserWorkNumRequestToModel(UserWorkNumRequest userWorkNumRequest) { + if ( userWorkNumRequest == null ) { + return null; + } + + User user = new User(); + + user.setUserId( userWorkNumRequest.getUserId() ); + user.setUserName( userWorkNumRequest.getUserName() ); + user.setWorkNumber( userWorkNumRequest.getWorkNumber() ); + + return user; + } }