From 9eebb5e800cbbb8b837cc4dba198dd4716d3e30d Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 3 Aug 2023 16:53:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A8=E9=80=81=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docus/server/collection/dto/UserDto.java | 8 +++++++- .../server/collection/dto/UserModifyParam.java | 9 ++++++--- .../webservice/impl/UserServerImpl.java | 5 +++-- src/main/resources/mapper/PowerUserMapper.xml | 18 ++++++++++-------- .../webservice/impl/UserServerImplTest.java | 6 +----- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/docus/server/collection/dto/UserDto.java b/src/main/java/com/docus/server/collection/dto/UserDto.java index ef127af..e6b1979 100644 --- a/src/main/java/com/docus/server/collection/dto/UserDto.java +++ b/src/main/java/com/docus/server/collection/dto/UserDto.java @@ -1,6 +1,5 @@ package com.docus.server.collection.dto; -import lombok.Builder; import lombok.Data; /** @@ -56,6 +55,12 @@ public class UserDto { private String authorId; + + /** + * 用户手机号码 + */ + private String telephone; + /** * 转换用户修改对象 * @@ -70,6 +75,7 @@ public class UserDto { userModifyParam.setDeptId(this.deptId); userModifyParam.setAuthorName(this.authorName); userModifyParam.setAuthorId(this.authorId); + userModifyParam.setTelephone(this.telephone); return userModifyParam; } } diff --git a/src/main/java/com/docus/server/collection/dto/UserModifyParam.java b/src/main/java/com/docus/server/collection/dto/UserModifyParam.java index 33e244f..a4c656c 100644 --- a/src/main/java/com/docus/server/collection/dto/UserModifyParam.java +++ b/src/main/java/com/docus/server/collection/dto/UserModifyParam.java @@ -1,10 +1,7 @@ package com.docus.server.collection.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @author Fang Ruichuan * @date 2022-11-14 19:02 @@ -50,4 +47,10 @@ public class UserModifyParam { * 操作人ID */ private String authorId; + + + /** + * 用户手机号码 + */ + private String telephone; } diff --git a/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java index a407bdf..b93c72b 100644 --- a/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java +++ b/src/main/java/com/docus/server/collection/webservice/impl/UserServerImpl.java @@ -3,17 +3,16 @@ package com.docus.server.collection.webservice.impl; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; import com.docus.infrastructure.core.exception.BaseException; +import com.docus.server.collection.dto.UserDto; import com.docus.server.collection.service.IPowerUserService; import com.docus.server.collection.util.IdUtil; import com.docus.server.collection.util.XmlUtil; import com.docus.server.collection.webservice.IUserServer; -import com.docus.server.collection.dto.UserDto; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.w3c.dom.Node; import javax.annotation.Resource; -import javax.jws.WebService; import java.util.Date; /** @@ -73,6 +72,7 @@ public class UserServerImpl implements IUserServer { Node positionNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/POSI_NAME/@value"); Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); + Node telephoneNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/EMPL_TEL/@value"); UserDto userDto = new UserDto(); userDto.setDeptId(deptCodeNode.getNodeValue()); userDto.setReceiver(receiverNode.getNodeValue()); @@ -84,6 +84,7 @@ public class UserServerImpl implements IUserServer { userDto.setMessageId(msgIdNode.getNodeValue()); userDto.setAuthorName(authorNameNode.getNodeValue()); userDto.setRoleId(0L); + userDto.setTelephone(telephoneNode!=null?telephoneNode.getNodeValue():""); return userDto; } diff --git a/src/main/resources/mapper/PowerUserMapper.xml b/src/main/resources/mapper/PowerUserMapper.xml index d63a165..835a84e 100644 --- a/src/main/resources/mapper/PowerUserMapper.xml +++ b/src/main/resources/mapper/PowerUserMapper.xml @@ -14,17 +14,19 @@ `create_date`, `creater`, `update_date`, - `updater`) + `updater`, + `user_tel`) VALUES (#{user.userId},#{user.userName},#{user.name},#{user.userPwd},#{user.position},#{user.roleId} - ,#{user.deptId},now(),#{user.authorName},now(),#{user.authorName}) + ,#{user.deptId},now(),#{user.authorName},now(),#{user.authorName},#{user.telephone}) - update `docus_system`.`power_user` set - `updater`=#{user.authorName}, - `dept_id`=#{user.deptId}, - `user_position`=#{user.position}, - `name`=#{user.name}, - `update_date`=now() + update `docus_system`.`power_user` + set `updater`=#{user.authorName}, + `dept_id`=#{user.deptId}, + `user_position`=#{user.position}, + `user_tel`=#{user.telephone}, + `name`=#{user.name}, + `update_date`=now() where `user_id`=#{user.userId} diff --git a/src/test/java/com/docus/server/collection/webservice/impl/UserServerImplTest.java b/src/test/java/com/docus/server/collection/webservice/impl/UserServerImplTest.java index 4179d77..c38cad0 100644 --- a/src/test/java/com/docus/server/collection/webservice/impl/UserServerImplTest.java +++ b/src/test/java/com/docus/server/collection/webservice/impl/UserServerImplTest.java @@ -2,12 +2,8 @@ package com.docus.server.collection.webservice.impl; import com.docus.server.collection.dto.UserDto; import com.docus.server.collection.dto.UserModifyParam; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; import org.junit.Test; -import javax.xml.namespace.QName; - public class UserServerImplTest { String xml = "\n" + "\t\n" + @@ -88,7 +84,7 @@ public class UserServerImplTest { "\t\t\t\t\t\t\t\n" + "\t\t\t\t\t\t\t\n" + "\t\t\t\t\t\t\t\n" + - "\t\t\t\t\t\t\t\n" + + "\t\t\t\t\t\t\t\n" + "\t\t\t\t\t\t\t\n" + "\t\t\t\t\t\t\t\n" + "\t\t\t\t\t\t\t\n" +