From 43a322430e7e6dcea64242bec6918037da160986 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 04 十二月 2023 10:50:23 +0800
Subject: [PATCH] 分转元
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index edae61d..a29a688 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -1,5 +1,6 @@
package com.consum.base.controller;
+import cn.hutool.core.util.ReflectUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.context.AnalysisContext;
@@ -13,19 +14,17 @@
import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.pojo.response.FinSysTenantVO;
import com.consum.base.pojo.response.UserVO;
-import com.consum.base.service.FinSysTenantDepartmentServiceImpl;
+import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.ArgumentsConstants;
-import com.iplatform.base.service.DeptServiceImpl;
import com.iplatform.base.service.RoleServiceImpl;
import com.iplatform.base.service.UserServiceImpl;
import com.iplatform.base.util.PlatformRSAUtils;
import com.iplatform.core.util.AESUtils;
-import com.iplatform.model.po.S_config;
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
import com.iplatform.model.po.S_user_core;
@@ -79,14 +78,13 @@
private UserServiceImpl userService;
- private DeptServiceImpl deptService;
private FinSysTenantServiceImpl finSysTenantService;
private RoleServiceImpl roleService;
@Autowired
- private FinSysTenantDepartmentServiceImpl finSysTenantDepartmentService;
+ private FinSysTenantDepartmentService finSysTenantDepartmentService;
@Autowired
@@ -94,7 +92,6 @@
this.userService = userService;
}
- private S_config sConfig;
@Autowired
public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService, FinSysTenantUserServiceImpl finSysTenantUserService,
@@ -174,8 +171,10 @@
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- fieldDatas.setAccessible(true);
- fieldDatas.set(pager, resultList);
+// fieldDatas.setAccessible(true);
+// fieldDatas.set(pager, resultList);
+ ReflectUtil.setFieldValue(pager, fieldDatas, resultList);
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -227,11 +226,11 @@
user.setSysUserId(NumberGenerator.getLongSequenceNumber());
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
- String pwdPhone = "";
+ String encPhone = "";
if (user.getUserPhone() != null) {
- pwdPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
}
- user.setUserPhone(pwdPhone);
+ user.setUserPhone(encPhone);
//鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
user.setSysDeptId(3L); //瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
this.finSysTenantUserService.insert(user);
@@ -245,7 +244,7 @@
userCore.setNick_name(user.getUserName());
//鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
userCore.setUser_type(2);
- userCore.setPhonenumber(pwdPhone);
+ userCore.setPhonenumber(encPhone);
userCore.setSex(user.getSex().toString());
//鍒濆鍖栧瘑鐮� 123456
String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
@@ -427,8 +426,8 @@
user.setRemark("鎵归噺瀵煎叆");
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
- String pwdPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
- user.setUserPhone(pwdPhone);
+ String encPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
+ user.setUserPhone(encPhone);
user.setIsDelete(1);
//鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
@@ -551,11 +550,11 @@
return ResponseValue.error("鍙傛暟涓虹┖");
}
String key = PlatformRSAUtils.AES_KEY;
- String pwdPhone = "";
+ String encPhone = "";
if (user.getUserPhone() != null) {
- pwdPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
}
- user.setUserPhone(pwdPhone);
+ user.setUserPhone(encPhone);
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
finSysTenantUserService.update(user);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
@@ -786,10 +785,10 @@
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
String userPhone = user.getUserPhone();
- String pwdPhone = "";
+ String encPhone = "";
if (userPhone != null) {
- pwdPhone = AESUtils.encryptStrAES(userPhone, key);
- user.setUserPhone(pwdPhone);
+ encPhone = AESUtils.encryptStrAES(userPhone, key);
+ user.setUserPhone(encPhone);
}
this.finSysTenantUserService.insert(user);
@@ -883,12 +882,12 @@
updUser.setEmail(user.getEmail());
updUser.setUserName(user.getUserName());
updUser.setSex(user.getSex());
- String pwdPhone = "";
+ String encPhone = "";
if (user.getUserPhone() != null) {
String key = PlatformRSAUtils.AES_KEY;
- pwdPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
}
- updUser.setUserPhone(pwdPhone);
+ updUser.setUserPhone(encPhone);
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
finSysTenantUserService.update(updUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
--
Gitblit v1.9.1