From ff453a4d5202a207f22f44e646f26a2ce7f3bc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E7=92=9E=E8=87=BB?= <349044@gmail.com>
Date: Thu, 21 Nov 2024 15:18:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=BC=A0=E5=8F=82=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/params/PublishParam.java             | 25 +++++++++++++++++++
 .../user/repository/UserRepository.java       |  5 ++--
 .../user/service/UserService.java             |  5 ++--
 .../user/service/impl/UserServiceImpl.java    |  5 ++--
 .../request/user/UserPublishRequest.java      | 10 ++++++++
 .../manage/repository/dao/UserMapper.java     |  5 ++--
 .../repository/impl/UserRepositoryImpl.java   |  7 +++---
 .../main/resources/sqlmapper/UserMapper.xml   |  6 +++--
 .../service/facade/user/UserFacadeImpl.java   |  4 ++-
 .../manage/service/mappers/UserMappers.java   |  9 +++++++
 .../service/mappers/UserMappersImpl.java      | 24 +++++++++++++++++-
 11 files changed, 90 insertions(+), 15 deletions(-)
 create mode 100644 domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/PublishParam.java

diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/PublishParam.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/PublishParam.java
new file mode 100644
index 0000000..f89535a
--- /dev/null
+++ b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/user/params/PublishParam.java
@@ -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;
+}
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 7f61690..5099e15 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
@@ -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 java.util.List;
@@ -22,10 +23,10 @@ public interface UserRepository {
 
     /**
      * 用户发布
-     * @param userIds
+     * @param publishParam
      * @return
      */
-    int publish(List<String> userIds);
+    int publish(PublishParam publishParam);
 
     /**
      * 通过工号查询用户
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 bddc728..34035ad 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
@@ -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;
 
@@ -23,10 +24,10 @@ public interface UserService {
 
     /**
      * 用户发布
-     * @param userIds
+     * @param publishParam
      * @return
      */
-    Boolean publishUser(List<String> userIds);
+    Boolean publishUser(PublishParam publishParam);
 
     /**
      * 通过工号查询用户
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 34592ef..bf0ebc3 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
@@ -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.repository.UserRepository;
@@ -67,11 +68,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; }
 
     /**
      * 获取单条用户信息
diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserPublishRequest.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserPublishRequest.java
index 77a182d..736d89f 100644
--- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserPublishRequest.java
+++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserPublishRequest.java
@@ -18,4 +18,14 @@ public class UserPublishRequest extends BaseRequest implements Serializable {
      * 用户编码
      */
     private List<String> userIds;
+
+    /**
+     * 编辑者
+     */
+    private String modifier;
+
+    /**
+     * 编辑者姓名
+     */
+    private String modifierName;
 }
\ No newline at end of file
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 180d05e..7920974 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
@@ -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 org.apache.ibatis.annotations.Mapper;
@@ -24,10 +25,10 @@ public interface UserMapper {
 
     /**
      * 发布
-     * @param userIds
+     * @param publishParam
      * @return
      */
-    int publish(List<String> userIds);
+    int publish(PublishParam publishParam);
 
     /**
      * 通过工号查询用户
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 81d328e..86e4b60 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
@@ -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.repository.UserRepository;
@@ -43,12 +44,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);
     }
 
     /**
diff --git a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml
index ccac3af..3d8e14f 100644
--- a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml
+++ b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml
@@ -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=")">
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 9e7efac..59a6f1c 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
@@ -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.service.TokenService;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.service.UserService;
@@ -93,7 +94,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));
     }
 
     /**
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 3393f1c..34e82eb 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
@@ -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.request.user.UserModiRequest;
@@ -45,6 +46,14 @@ public interface UserMappers {
      */
     SingleUserResponse getSingleUserToResponse(User user);
 
+
+    /**
+     * 用户发布request转用户发布参数模型
+     * @param userPublishRequest
+     * @return
+     */
+    PublishParam getUserPublishRequestToModel(UserPublishRequest userPublishRequest);
+
     /**
      * 获取单条用户信息Request转用户模型
      * @param searchUserRequest
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 b2f2e61..744f75d 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
@@ -2,11 +2,13 @@ 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.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;
@@ -16,7 +18,7 @@ import javax.annotation.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-11-20T10:52:53+0800",
+    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 {
@@ -90,6 +92,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 ) {
@@ -104,6 +124,8 @@ public class UserMappersImpl implements UserMappers {
         searchKeyWords.setGmtCreate( searchUserRequest.getGmtCreate() );
         searchKeyWords.setJoinTime( searchUserRequest.getJoinTime() );
         searchKeyWords.setInternEndDate( searchUserRequest.getInternEndDate() );
+        searchKeyWords.setPageIndex( searchUserRequest.getPageIndex() );
+        searchKeyWords.setPageSize( searchUserRequest.getPageSize() );
 
         return searchKeyWords;
     }