chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
石璞臻 2024-11-15 17:20:53 +08:00
parent 8ce88269b8 f352d7226a
commit d52b98b459
11 changed files with 171 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/user/UserController.java
View File

@ -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) {

7
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/repository/UserRepository.java
View File

@ -12,6 +12,13 @@ public interface UserRepository {
*/
int insert(User user);
/**
* 用户编辑
* @param user
* @return
*/
int modify(User user);
/**
* 用户发布
* @param userIds

7
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/UserService.java
View File

@ -14,6 +14,13 @@ public interface UserService {
*/
Boolean createUser(User user);
/**
* 编辑用户
* @param user
* @return
*/
Boolean modifyUser(User user);
/**
* 用户发布
* @param userIds

11
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/service/impl/UserServiceImpl.java
View File

@ -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

9
facade/src/main/java/com/electromagnetic/industry/software/data/manage/facade/user/UserFacade.java
View File

@ -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

72
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java Normal file
View File

@ -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;
}

7
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/dao/UserMapper.java
View File

@ -14,6 +14,13 @@ public interface UserMapper {
*/
int insert(User user);
/**
* 编辑
* @param user
* @return
*/
int modify(User user);
/**
* 发布
* @param userIds

11
infrastructure/repository/src/main/java/com/electromagnetic/industry/software/data/manage/repository/impl/UserRepositoryImpl.java
View File

@ -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);
}
/**
* 用户发布
*

18
infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml
View File

@ -68,6 +68,24 @@
1
)
</insert>
<update id="modify" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
update ed_users
<set>
<if test="userId != null and userId != ''">user_id = #{userId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="workNumber != null and workNumber != ''">work_number = #{workNumber},</if>
<if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
<if test="userDept != null and userDept != ''">user_dept = #{userDept},</if>
<if test="userTitle != null and userTitle != ''">user_title = #{userTitle},</if>
<if test="joinTime != null">join_time = #{joinTime},</if>
<if test="userStatus != null and userStatus != ''">user_status = #{userStatus},</if>
<if test="internshipEndDate != null">internship_end_date = #{internshipEndDate},</if>
<if test="modifier != null and modifier != ''">modifier = #{modifier},</if>
<if test="modifierName != null and modifierName != ''">modifier_name = #{modifierName},</if>
</set>
where id= #{id}
</update>
<update id="publish" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
update ed_users

17
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java
View File

@ -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<Boolean> modifyUser(UserModiRequest userModiRequest) {
// 将请求对象转换为模型对象
User user = UserMappers.INSTANCE.getUserModiRequestToModel(userModiRequest);
// 调用 UserService 的修改用户方法
Boolean success = userService.modifyUser(user);
//根据操作结果构建 BaseResult 对象并返回
return BaseResultUtil.success(userService.modifyUser(user));
}
/**
* 发布用户信息
* @param userPublishRequest

8
service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java
View File

@ -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);
}