diff --git a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java index 918ed6a..849b14c 100644 --- a/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java +++ b/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java @@ -1,6 +1,7 @@ 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.UserModiRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import electromagnetic.data.framework.share.model.BaseResult; import electromagnetic.data.framework.share.model.ElectromagneticResult; @@ -22,4 +23,7 @@ public class UserController { return userFacade.createUser(userRequest); } + @ApiOperation(value="编辑用户信息",notes = "") + @PutMapping + public BaseResult editUser(@RequestBody UserModiRequest userModiRequest){ return userFacade.modifyUser(userModiRequest);} } diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java index eaf8b9e..9e00b45 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java @@ -10,4 +10,11 @@ public interface UserRepository { * @return */ int insert(User user); + + /** + * 用户编辑 + * @param user + * @return + */ + int modify(User user); } diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java index 3431c6e..6126603 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java @@ -10,4 +10,11 @@ public interface UserService { * @return */ Boolean createUser(User user); + + /** + * 编辑用户 + * @param user + * @return + */ + Boolean modifyUser(User user); } diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java index 8074adb..1521f93 100644 --- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java +++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java @@ -27,4 +27,15 @@ public class UserServiceImpl implements UserService { public Boolean createUser(User user) { return userRepository.insert(user)>0; } + + /** + * 编辑用户 + * + * @param user + * @return + */ + @Override + public Boolean modifyUser(User user) { + return userRepository.modify(user)>0; + } } diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java index 4fc3b20..5b6453b 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java @@ -1,5 +1,6 @@ package com.electromagnetic.industry.software.data.manage.facade.user; +import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import electromagnetic.data.framework.share.model.BaseResult; import electromagnetic.data.framework.share.model.ElectromagneticResult; @@ -13,4 +14,12 @@ public interface UserFacade { */ BaseResult createUser(UserRequest userRequest); + /** + * 编辑用户信息 + * @param userModiRequest + * @return + */ + BaseResult modifyUser(UserModiRequest userModiRequest); + + } diff --git a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java index c89b44a..86fa0d6 100644 --- a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java +++ b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java @@ -11,4 +11,11 @@ public interface UserMapper { * @return */ int insert(User user); + + /** + * 编辑 + * @param user + * @return + */ + int modify(User user); } \ No newline at end of file diff --git a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java index 59d4410..c9f6b00 100644 --- a/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java +++ b/infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java @@ -26,4 +26,15 @@ public class UserRepositoryImpl implements UserRepository { public int insert(User user) { return userMapper.insert(user); } + + /** + * 用户编辑 + * + * @param user + * @return + */ + @Override + public int modify(User user) { + return userMapper.modify(user); + } } \ No newline at end of file diff --git a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml index 9aec6ea..c2e931c 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml @@ -61,4 +61,22 @@ 1 ) + + update ed_users + + user_id = #{userId}, + user_name = #{userName}, + work_number = #{workNumber}, + mobile = #{mobile}, + user_dept = #{userDept}, + user_title = #{userTitle}, + join_time = #{joinTime}, + user_status = #{userStatus}, + internship_end_date = #{internshipEndDate}, + modifier = #{modifier}, + modifier_name = #{modifierName}, + + where id= #{id} + + \ No newline at end of file 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 33a58bb..1ad3098 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 @@ -4,6 +4,7 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.use 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.user.UserModiRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import com.electromagnetic.industry.software.data.manage.service.mappers.UserMappers; import electromagnetic.data.framework.share.id.IdWorker; @@ -32,4 +33,20 @@ public class UserFacadeImpl implements UserFacade { user.setIsPublished(UserConstant.DEFAULT_PUBLISH_STATUS); return BaseResultUtil.success(userService.createUser(user)); } + + /** + * 修改用户信息 + * @param userModiRequest + * @return + */ + @Override + public BaseResult modifyUser(UserModiRequest userModiRequest) { + // 将请求对象转换为模型对象 + User user = UserMappers.INSTANCE.getUserModiRequestToModel(userModiRequest); + // 调用 UserService 的修改用户方法 + Boolean success = userService.modifyUser(user); + + //根据操作结果构建 BaseResult 对象并返回 + return BaseResultUtil.success(userService.modifyUser(user)); + } } 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 11a915e..4cacd3f 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 @@ -4,6 +4,7 @@ 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.UserModiRequest; import com.electromagnetic.industry.software.data.manage.request.user.UserRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -25,4 +26,11 @@ public interface UserMappers { */ User getUserRequestToModel(UserRequest userRequest); + /** + * 编辑用户Reduest转用户模型 + * @param userModiRequest + * @return + */ + User getUserModiRequestToModel(UserModiRequest userModiRequest); + } \ No newline at end of file