From 2c706a5d58e8315980ea92d6b82e0e4959bad8ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 17:44:40 +0800
Subject: [PATCH] 1.修改单据导出 2.修改物品信息导入
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 148 +++++++++++++++++++++++++-----------------------
1 files changed, 77 insertions(+), 71 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 868cd29..2bb2d93 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
@@ -18,7 +18,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -34,12 +33,13 @@
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.ImportUserParam;
+import com.consum.base.pojo.request.FinSysTenantUserParam;
import com.consum.base.pojo.response.DepartmentVO;
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.FinSysTenantDepartmentService;
-import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
@@ -82,7 +82,7 @@
private UserServiceImpl userService;
- private FinSysTenantServiceImpl finSysTenantService;
+ private FinSysTenantService finSysTenantService;
private RoleServiceImpl roleService;
@@ -95,7 +95,7 @@
}
@Autowired
- public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService,
+ public FinSysTenantUserController(FinSysTenantService finSysTenantService,
FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
this.finSysTenantUserService = finSysTenantUserService;
this.finSysTenantService = finSysTenantService;
@@ -206,68 +206,71 @@
@Transactional(rollbackFor = Exception.class)
public ResponseValue add() {
FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser formInventoryParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, formInventoryParam);
- user = formInventoryParam;
- if (user == null) {
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+
+ if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
- if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
- && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
+ if (finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) != null
+ && finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) > 0) {
return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
}
- if (user.getTenantId() == null || "".equals(user.getTenantId()) || new Integer(user.getTenantId()) == 0) {
+
+ if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
}
- if (user.getTenantCode() == null || "".equals(user.getTenantCode()) || new Integer(user.getTenantCode()) == 0) {
+
+ if (StringUtils.isEmpty(tenantUser.getTenantCode()) || "0".equals(tenantUser.getTenantCode())) {
return ResponseValue.error("娣诲姞鏃惰閫夋嫨鍖哄幙");
}
// 鎻掑叆绯荤粺鐢ㄦ埛
- user.setId(NumberGenerator.getLongSequenceNumber());
- user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- user.setCreateBy(this.getCurrentUser().getUser_name());
- user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- user.setUpdateBy(this.getCurrentUser().getUser_name());
+ tenantUser.setId(NumberGenerator.getLongSequenceNumber());
+ tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
+ tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
// user.setStatus(1);// 0绂佺敤 1鍚敤
- user.setIsDelete(0);
- user.setSysUserId(NumberGenerator.getLongSequenceNumber());
+ tenantUser.setIsDelete(0);
+ tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
String encPhone = "";
- if (user.getUserPhone() != null) {
- encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ if (tenantUser.getUserPhone() != null) {
+ encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
}
- user.setUserPhone(encPhone);
+ tenantUser.setUserPhone(encPhone);
// 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
- user.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
- this.finSysTenantUserService.insert(user);
+ // tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+ this.finSysTenantUserService.insert(tenantUser);
+
// 鎻掑叆骞冲彴鐢ㄦ埛
S_user_core userCore = new S_user_core();
- userCore.setId(user.getSysUserId());
+ userCore.setId(tenantUser.getSysUserId());
userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
- userCore.setOrg_id(user.getSysDeptId()); // 鏈烘瀯id
+ userCore.setOrg_id(tenantUser.getSysDeptId()); // 鏈烘瀯id
userCore.setOrg_id(1L);
- userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
- userCore.setNick_name(user.getUserName());
+ userCore.setUser_name(tenantUser.getUserCode()); // 鐢ㄦ埛璐﹀彿
+ userCore.setNick_name(tenantUser.getUserName());
// 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
userCore.setUser_type(2);
userCore.setPhonenumber(encPhone);
- userCore.setSex(user.getSex().toString());
+ userCore.setSex(tenantUser.getSex().toString());
// 鍒濆鍖栧瘑鐮� 123456
String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
userCore.setPassword(pws);
// 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
- if (user.getStatus() == 0) {
- user.setStatus(1);
+ if (tenantUser.getStatus() == 0) {
+ tenantUser.setStatus(1);
} else {
- user.setStatus(0);
+ tenantUser.setStatus(0);
}
- userCore.setStatus(user.getStatus());
+ userCore.setStatus(tenantUser.getStatus());
userCore.setDel_flag(0);
userCore.setCreate_by(this.getCurrentUser().getUser_name());
userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- userCore.setRemark(user.getRemark());
+ userCore.setRemark(tenantUser.getRemark());
userCore.setType(1);
userCore.setBind_client_id("0");
userCore.setBind_wechat(0);
@@ -291,7 +294,7 @@
// 灏戣鑹瞚d
List<Long> roleList = user.getRoleList(); // 鏈烘瀯id 澶氫釜
if (!CollectionUtils.isEmpty(roleList)) {
- Long sysUserId = user.getSysUserId(); // 鐢ㄦ埛id
+ Long sysUserId = tenantUser.getSysUserId(); // 鐢ㄦ埛id
this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
}
// this.getFinCustomerCache().remove();
@@ -485,21 +488,20 @@
@Transactional(rollbackFor = Exception.class)
public ResponseValue update() {
FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser formInventoryParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, formInventoryParam);
- user = formInventoryParam;
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
- if (user == null) {
+ if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
String key = PlatformRSAUtils.AES_KEY;
String encPhone = "";
- if (user.getUserPhone() != null) {
- encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ if (tenantUser.getUserPhone() != null) {
+ encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
}
- user.setUserPhone(encPhone);
+ tenantUser.setUserPhone(encPhone);
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
- finSysTenantUserService.update(user);
+ finSysTenantUserService.update(tenantUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
@@ -543,15 +545,14 @@
@PostMapping("/updateStatus")
@Transactional(rollbackFor = Exception.class)
public ResponseValue updateStatus() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser formInventoryParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, formInventoryParam);
- user = formInventoryParam;
- if (user == null) {
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+ if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER 搴旇鏄煡璇� 鐒跺悗鍙敼鐘舵��
- List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(user.getId()));
+ List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(tenantUser.getId()));
if (select == null || select.size() == 0) {
return ResponseValue.error("鐢ㄦ埛涓嶅瓨鍦�");
}
@@ -580,15 +581,20 @@
* @Date 2023/7/17 14:36
*/
@PostMapping("/defaultPassword")
- public ResponseValue defaultPassword(@RequestBody FinSysTenantUser finSysTenantUser) {
- if (finSysTenantUser == null) {
+ public ResponseValue defaultPassword() {
+ FinSysTenantUserParam user = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+ CommonUtil.copyProperties(user, tenantUser);
+ user = tenantUser;
+
+ if (Objects.isNull(user)) {
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
// 鍒濆鍖栧瘑鐮� 123456
String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 瀵嗘枃
// 1. 淇敼鐢ㄦ埛琛�
// 鐢ㄦ埛琛╥d
- Long sysUserId = finSysTenantUser.getSysUserId();
+ Long sysUserId = user.getSysUserId();
S_user_core userCore = new S_user_core();
userCore.setId(sysUserId);
userCore.setPassword(stringValue);
@@ -679,9 +685,9 @@
@PostMapping("/updRole")
public ResponseValue updRole() {
FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, finSysTenantParam);
- user = finSysTenantParam;
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+ user = tenantUser;
if (user == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
@@ -707,10 +713,10 @@
@PostMapping("/addSupplier")
@Transactional(rollbackFor = Exception.class)
public ResponseValue addSupplier() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, finSysTenantParam);
- user = finSysTenantParam;
+ FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser user = new FinSysTenantUser();
+ CommonUtil.copyProperties(userParam, user);
+
if (user == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
@@ -823,31 +829,31 @@
@PostMapping("/updatePerson")
@Transactional(rollbackFor = Exception.class)
public ResponseValue updatePerson() {
- FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
- FinSysTenantUser finSysTenantParam = new FinSysTenantUser();
- CommonUtil.copyProperties(user, finSysTenantParam);
- user = finSysTenantParam;
- if (user == null) {
+ FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUserParam tenantUser = new FinSysTenantUserParam();
+ CommonUtil.copyProperties(userParam, tenantUser);
+ userParam = tenantUser;
+ if (userParam == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
FinSysTenantUser sysInfo = getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- String avatar = user.getAvatar();
+ String avatar = userParam.getAvatar();
if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
return ResponseValue.error("澶村儚鏍煎紡涓嶅厑璁�");
}
FinSysTenantUser updUser = new FinSysTenantUser();
updUser.setId(sysInfo.getId());
- updUser.setAvatar(user.getAvatar());
- updUser.setEmail(user.getEmail());
- updUser.setUserName(user.getUserName());
- updUser.setSex(user.getSex());
+ updUser.setAvatar(userParam.getAvatar());
+ updUser.setEmail(userParam.getEmail());
+ updUser.setUserName(userParam.getUserName());
+ updUser.setSex(userParam.getSex());
String encPhone = "";
- if (user.getUserPhone() != null) {
+ if (userParam.getUserPhone() != null) {
String key = PlatformRSAUtils.AES_KEY;
- encPhone = AESUtils.encryptStrAES(user.getUserPhone(), key);
+ encPhone = AESUtils.encryptStrAES(userParam.getUserPhone(), key);
}
updUser.setUserPhone(encPhone);
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
--
Gitblit v1.9.1