From 2deeedc02474bff24a220894535d22fec843ed26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E7=8E=89=E7=A5=A5?= <xuyuxiang29@foxmail.com>
Date: Tue, 4 Oct 2022 22:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91C=E7=AB=AF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E5=A2=9E=E5=8A=A0=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BD=BF=E7=94=A8easy=20trans=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/user/entity/ClientUser.java       |  5 +-
 .../service/impl/ClientUserServiceImpl.java   | 80 +++----------------
 2 files changed, 16 insertions(+), 69 deletions(-)

diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/entity/ClientUser.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/entity/ClientUser.java
index 715ebcb8..37f91e95 100644
--- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/entity/ClientUser.java
+++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/entity/ClientUser.java
@@ -15,6 +15,9 @@ package vip.xiaonuo.client.modular.user.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,7 +35,7 @@ import java.util.Date;
 @Getter
 @Setter
 @TableName("CLIENT_USER")
-public class ClientUser extends CommonEntity {
+public class ClientUser extends CommonEntity implements TransPojo {
 
     /** id */
     @ApiModelProperty(value = "id", position = 1)
diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java
index cfd58a74..3813c217 100644
--- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fhs.trans.service.impl.TransService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.client.modular.relation.service.ClientRelationService;
@@ -57,6 +58,9 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     @Resource
     private DevConfigApi devConfigApi;
 
+    @Resource
+    private TransService transService;
+
     @Resource
     private ClientRelationService clientRelationService;
 
@@ -64,17 +68,8 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     public ClientLoginUser getUserById(String id) {
         ClientUser clientUser = this.getById(id);
         if(ObjectUtil.isNotEmpty(clientUser)) {
-            ClientLoginUser clientLoginUser = BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getPhone())) {
-                clientLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getPhone()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getIdCardNumber())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getIdCardNumber()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getEmergencyPhone())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getEmergencyPhone()));
-            }
-            return clientLoginUser;
+            transService.transOne(clientUser);
+            return BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
         }
         return null;
     }
@@ -83,17 +78,8 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     public ClientLoginUser getUserByAccount(String account) {
         ClientUser clientUser = this.getOne(new LambdaQueryWrapper<ClientUser>().eq(ClientUser::getAccount, account));
         if(ObjectUtil.isNotEmpty(clientUser)) {
-            ClientLoginUser clientLoginUser = BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getPhone())) {
-                clientLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getPhone()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getIdCardNumber())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getIdCardNumber()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getEmergencyPhone())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getEmergencyPhone()));
-            }
-            return clientLoginUser;
+            transService.transOne(clientUser);
+            return BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
         }
         return null;
     }
@@ -102,17 +88,8 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     public ClientLoginUser getUserByPhone(String phone) {
         ClientUser clientUser = this.getOne(new LambdaQueryWrapper<ClientUser>().eq(ClientUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(phone)));
         if(ObjectUtil.isNotEmpty(clientUser)) {
-            ClientLoginUser clientLoginUser = BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getPhone())) {
-                clientLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getPhone()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getIdCardNumber())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getIdCardNumber()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getEmergencyPhone())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getEmergencyPhone()));
-            }
-            return clientLoginUser;
+            transService.transOne(clientUser);
+            return BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
         }
         return null;
     }
@@ -121,17 +98,8 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     public ClientLoginUser getUserByEmail(String email) {
         ClientUser clientUser = this.getOne(new LambdaQueryWrapper<ClientUser>().eq(ClientUser::getEmail, email));
         if(ObjectUtil.isNotEmpty(clientUser)) {
-            ClientLoginUser clientLoginUser = BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getPhone())) {
-                clientLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getPhone()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getIdCardNumber())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getIdCardNumber()));
-            }
-            if(ObjectUtil.isNotEmpty(clientLoginUser.getEmergencyPhone())) {
-                clientLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(clientLoginUser.getEmergencyPhone()));
-            }
-            return clientLoginUser;
+            transService.transOne(clientUser);
+            return BeanUtil.copyProperties(clientUser, ClientLoginUser.class);
         }
         return null;
     }
@@ -157,18 +125,6 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     @Override
     public void add(ClientUserAddParam clientUserAddParam) {
         checkParam(clientUserAddParam);
-        // 设置手机号
-        if(ObjectUtil.isNotEmpty(clientUserAddParam.getPhone())) {
-            clientUserAddParam.setPhone(CommonCryptogramUtil.doSm4CbcEncrypt(clientUserAddParam.getPhone()));
-        }
-        // 设置证件号
-        if(ObjectUtil.isNotEmpty(clientUserAddParam.getIdCardNumber())) {
-            clientUserAddParam.setIdCardNumber(CommonCryptogramUtil.doSm4CbcEncrypt(clientUserAddParam.getIdCardNumber()));
-        }
-        // 设置紧急联系人电话
-        if(ObjectUtil.isNotEmpty(clientUserAddParam.getEmergencyPhone())) {
-            clientUserAddParam.setEmergencyPhone(CommonCryptogramUtil.doSm4CbcEncrypt(clientUserAddParam.getEmergencyPhone()));
-        }
         ClientUser clientUser = BeanUtil.toBean(clientUserAddParam, ClientUser.class);
         if(ObjectUtil.isEmpty(clientUser.getAvatar())) {
             // 设置默认头像
@@ -210,18 +166,6 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
     public void edit(ClientUserEditParam clientUserEditParam) {
         ClientUser clientUser = this.queryEntity(clientUserEditParam.getId());
         checkParam(clientUserEditParam);
-        // 设置手机号
-        if(ObjectUtil.isNotEmpty(clientUserEditParam.getPhone())) {
-            clientUserEditParam.setPhone(CommonCryptogramUtil.doSm4CbcEncrypt(clientUserEditParam.getPhone()));
-        }
-        // 设置证件号
-        if(ObjectUtil.isNotEmpty(clientUserEditParam.getIdCardNumber())) {
-            clientUserEditParam.setIdCardNumber(CommonCryptogramUtil.doSm4CbcEncrypt(clientUserEditParam.getIdCardNumber()));
-        }
-        // 设置紧急联系人电话
-        if(ObjectUtil.isNotEmpty(clientUserEditParam.getEmergencyPhone())) {
-            clientUserEditParam.setEmergencyPhone(CommonCryptogramUtil.doSm4CbcEncrypt(clientUserEditParam.getEmergencyPhone()));
-        }
         BeanUtil.copyProperties(clientUserEditParam, clientUser);
         this.updateById(clientUser);
     }