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

修改删除用户功能,解决冲突

This commit is contained in:
lizhanhao 2024-11-21 15:38:31 +08:00
parent 798a15d570 ff453a4d52
commit 05ff565097
11 changed files with 90 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/PublishParam.java Normal file
View File

@ -0,0 +1,25 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params;
import java.util.List;
import lombok.Data;
@Data
public class PublishParam {
private static final long serialVersionUID = 1L;
/**
* 用户编码
*/
private List<String> userIds;
/**
* 编辑者
*/
private String modifier;
/**
* 编辑者姓名
*/
private String modifierName;
}

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

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.repository;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -24,10 +25,10 @@ public interface UserRepository {
/**
* 用户发布
* @param userIds
* @param publishParam
* @return
*/
int publish(List<String> userIds);
int publish(PublishParam publishParam);
/**
* 通过工号查询用户

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

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -24,10 +25,10 @@ public interface UserService {
/**
* 用户发布
* @param userIds
* @param publishParam
* @return
*/
Boolean publishUser(List<String> userIds);
Boolean publishUser(PublishParam publishParam);
/**
* 通过工号查询用户

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

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.impl;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -68,11 +69,11 @@ public class UserServiceImpl implements UserService {
/**
* 用户发布
* @param userIds
* @param publishParam
* @return
*/
@Override
public Boolean publishUser(List<String> userIds) { return userRepository.publish(userIds)>0; }
public Boolean publishUser(PublishParam publishParam) { return userRepository.publish(publishParam)>0; }
/**
* 获取单条用户信息

10
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserPublishRequest.java
View File

@ -18,4 +18,14 @@ public class UserPublishRequest extends BaseRequest implements Serializable {
* 用户编码
*/
private List<String> userIds;
/**
* 编辑者
*/
private String modifier;
/**
* 编辑者姓名
*/
private String modifierName;
}

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

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.data.manage.repository.dao;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -25,10 +26,10 @@ public interface UserMapper {
/**
* 发布
* @param userIds
* @param publishParam
* @return
*/
int publish(List<String> userIds);
int publish(PublishParam publishParam);
/**
* 通过工号查询用户

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

@ -4,6 +4,7 @@
package com.electromagnetic.industry.software.data.manage.repository.impl;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -44,12 +45,12 @@ public class UserRepositoryImpl implements UserRepository {
/**
* 用户发布
*
* @param userIds
* @param publishParam
* @return
*/
@Override
public int publish(List<String> userIds) {
return userMapper.publish(userIds);
public int publish(PublishParam publishParam) {
return userMapper.publish(publishParam);
}
/**

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

@ -87,10 +87,12 @@
</update>
<update id="publish" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
<update id="publish" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam">
update ed_users
<trim prefix="SET" suffixOverrides=",">
is_published = 1
is_published = 1,
<if test="modifier != null and modifier != ''">modifier = #{modifier},</if>
<if test="modifierName != null and modifierName != ''">modifier_name = #{modifierName},</if>
</trim>
where user_id IN
<foreach collection="userIds" item="userId" open="(" separator="," close=")">

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

@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.data.manage.service.facade.user;
import com.electromagnetic.industry.software.data.manage.common.ElectromagneticErrorEnum;
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.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.TokenService;
@ -94,7 +95,8 @@ public class UserFacadeImpl implements UserFacade {
*/
@Override
public ElectromagneticResult<Boolean> publishUser(UserPublishRequest userPublishRequest){
return ElectromagneticResultUtil.success(userService.publishUser(userPublishRequest.getUserIds()));
PublishParam model = UserMappers.INSTANCE.getUserPublishRequestToModel(userPublishRequest);
return ElectromagneticResultUtil.success(userService.publishUser(model));
}
/**

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

@ -3,6 +3,7 @@
*/
package com.electromagnetic.industry.software.data.manage.service.mappers;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
@ -46,6 +47,14 @@ public interface UserMappers {
*/
SingleUserResponse getSingleUserToResponse(User user);
/**
* 用户发布request转用户发布参数模型
* @param userPublishRequest
* @return
*/
PublishParam getUserPublishRequestToModel(UserPublishRequest userPublishRequest);
/**
* 获取单条用户信息Request转用户模型
* @param searchUserRequest

25
service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java
View File

@ -2,12 +2,14 @@ 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.domain.boardservice.user.model.UserLoginInfo;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.PublishParam;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.SearchKeyWords;
import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.params.UserDeleteKeyWords;
import com.electromagnetic.industry.software.data.manage.request.user.SearchUserRequest;
import com.electromagnetic.industry.software.data.manage.request.user.UserDeleteRequest;
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.UserPublishRequest;
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;
@ -17,8 +19,9 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2024-11-21T15:23:57+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_321 (Oracle Corporation)"
date = "2024-11-21T15:15:54+0800",
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_271 (Oracle Corporation)"
)
public class UserMappersImpl implements UserMappers {
@ -93,6 +96,24 @@ public class UserMappersImpl implements UserMappers {
return singleUserResponse;
}
@Override
public PublishParam getUserPublishRequestToModel(UserPublishRequest userPublishRequest) {
if ( userPublishRequest == null ) {
return null;
}
PublishParam publishParam = new PublishParam();
List<String> list = userPublishRequest.getUserIds();
if ( list != null ) {
publishParam.setUserIds( new ArrayList<String>( list ) );
}
publishParam.setModifier( userPublishRequest.getModifier() );
publishParam.setModifierName( userPublishRequest.getModifierName() );
return publishParam;
}
@Override
public SearchKeyWords getSearchKeywordsRequestToModel(SearchUserRequest searchUserRequest) {
if ( searchUserRequest == null ) {