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 b8f2fd1..812cef4 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 @@ -2,6 +2,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.GetSingleUserRequest; +import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest; 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; @@ -32,6 +33,9 @@ public class UserController { return userFacade.createUser(userRequest); } + @ApiOperation(value="编辑用户信息",notes = "") + @PutMapping + public BaseResult editUser(@RequestBody UserModiRequest userModiRequest){ return userFacade.modifyUser(userModiRequest);} @ApiOperation(value = "发布用户信息", notes = "") @RequestMapping(value = "/publish", method = RequestMethod.POST) public ElectromagneticResult publishUser(@RequestBody UserPublishRequest userPublishRequest) { 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 03cf676..cf5ced7 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 @@ -12,6 +12,13 @@ public interface UserRepository { */ int insert(User user); + /** + * 用户编辑 + * @param user + * @return + */ + int modify(User user); + /** * 用户发布 * @param userIds 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 d160845..f9c4754 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 @@ -14,6 +14,13 @@ public interface UserService { */ Boolean createUser(User user); + /** + * 编辑用户 + * @param user + * @return + */ + Boolean modifyUser(User user); + /** * 用户发布 * @param userIds 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 abb9bc5..2a78977 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 @@ -31,6 +31,17 @@ public class UserServiceImpl implements UserService { return userRepository.insert(user)>0; } + /** + * 编辑用户 + * + * @param user + * @return + */ + @Override + public Boolean modifyUser(User user) { + return userRepository.modify(user)>0; + } + /** * 通过工号查询用户 * @param workNumber 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 02b227c..ebe71a8 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,6 +1,7 @@ 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.UserModiRequest; 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; @@ -24,6 +25,14 @@ public interface UserFacade { */ BaseResult createUser(UserRequest userRequest); + /** + * 编辑用户信息 + * @param userModiRequest + * @return + */ + BaseResult modifyUser(UserModiRequest userModiRequest); + + /** * 发布用户 * @param userPublishRequest diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java new file mode 100644 index 0000000..375df77 --- /dev/null +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java @@ -0,0 +1,72 @@ +package com.electromagnetic.industry.software.data.manage.request.user; + +import cn.hutool.core.date.DateTime; +import electromagnetic.data.framework.share.model.BaseRequest; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +@Data +public class UserModiRequest extends BaseRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户Id + */ + private String userId; + + /** + * 用户姓名 + */ + private String userName; + + + + /** + * 工号 + */ + private String workNumber; + + /** + * 手机号 + */ + private String mobile; + + /** + * 所属部门 + */ + private String userDept; + + /** + * 职称 + */ + private String userTitle; + + /** + * 入职日期 + */ + private DateTime joinTime; + + /** + * 工作状态 + */ + private String userStatus; + + /** + * 实习截止日期 + */ + private Date internshipEndDate; + + /** + * 创建者 + */ + private String modifier; + + /** + * 创建者姓名 + */ + private String modifierName; +} 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 8b3621a..ed74fed 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 @@ -14,6 +14,13 @@ public interface UserMapper { */ int insert(User user); + /** + * 编辑 + * @param user + * @return + */ + int modify(User user); + /** * 发布 * @param userIds 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 34f3ae4..0729eb2 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 @@ -28,6 +28,17 @@ public class UserRepositoryImpl implements UserRepository { return userMapper.insert(user); } + /** + * 用户编辑 + * + * @param user + * @return + */ + @Override + public int modify(User user) { + return userMapper.modify(user); + } + /** * 用户发布 * diff --git a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml index 70cbc02..4b32137 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml @@ -68,6 +68,24 @@ 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} + + update 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 aa1945c..ab1d8cf 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 @@ -12,6 +12,7 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.use 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.UserModiRequest; 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; @@ -76,6 +77,22 @@ public class UserFacadeImpl implements UserFacade { 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)); + } + /** * 发布用户信息 * @param userPublishRequest 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 09be1b4..f6c3d9b 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 @@ -5,6 +5,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.GetSingleUserRequest; +import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest; 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; @@ -51,4 +52,11 @@ public interface UserMappers { * @return */ SingleUserResponse getSingleUserToResponse(User user); + /** + * 编辑用户Reduest转用户模型 + * @param userModiRequest + * @return + */ + User getUserModiRequestToModel(UserModiRequest userModiRequest); + } \ No newline at end of file