From d95a0f020ea2e3e5b96880792f7b735ae6a8767d Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 07 十二月 2023 13:49:17 +0800
Subject: [PATCH] feat: 添加用户、角色 失败，
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 467 +++++++++++++++++++++++++++-------------------------------
1 files changed, 216 insertions(+), 251 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 f03df71..6a92d2c 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
@@ -2,31 +2,31 @@
import cn.hutool.core.util.ReflectUtil;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapperUtil;
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.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;
@@ -64,26 +64,21 @@
private UserServiceImpl userService;
- private DeptServiceImpl deptService;
-
private FinSysTenantServiceImpl finSysTenantService;
private RoleServiceImpl roleService;
@Autowired
- private FinSysTenantDepartmentServiceImpl finSysTenantDepartmentService;
-
+ private FinSysTenantDepartmentService finSysTenantDepartmentService;
@Autowired
public void setUserService(UserServiceImpl userService) {
this.userService = userService;
}
- private S_config sConfig;
-
@Autowired
- public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService, FinSysTenantUserServiceImpl finSysTenantUserService,
- RoleServiceImpl roleService) {
+ public FinSysTenantUserController(FinSysTenantServiceImpl finSysTenantService,
+ FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
this.finSysTenantUserService = finSysTenantUserService;
this.finSysTenantService = finSysTenantService;
this.roleService = roleService;
@@ -95,7 +90,11 @@
* @Date 2023/7/11 13:59
*/
@RequestMapping("/select/list")
- public ResponseValue allocatedList(FinSysTenantUserSearchParam param) {
+ public ResponseValue allocatedList() {
+ FinSysTenantUserSearchParam param = CommonUtil.getObjFromReq(FinSysTenantUserSearchParam.class);
+ FinSysTenantUserSearchParam param2 = new FinSysTenantUserSearchParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
if (param.getTenantCode() == 0) {
FinSysTenantUser user = new FinSysTenantUser();
Long id = this.getCurrentUser().getId();
@@ -141,7 +140,7 @@
finSysTenantUser.setRoleStr(roleStr);
}
- //寰幆鏌ヨ杩愮淮鍟唅d
+ // 寰幆鏌ヨ杩愮淮鍟唅d
if (finSysTenantUser.getSupplierId() != null) {
finSysTenantUser.setIsSupplier("鏄�");
} else {
@@ -159,16 +158,15 @@
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();
+ logger.error("鍒嗛〉鍒楄〃鏌ヨ澶辫触锛屽師鍥狅細" + e);
}
return ResponseValue.success(pager);
}
-
@ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ鐢ㄦ埛", notes = "鏍规嵁鏈烘瀯id鏌ヨ鐢ㄦ埛")
@ApiImplicitParam(name = "tenantId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
@@ -181,7 +179,6 @@
return ResponseValue.success(result);
}
-
/**
* @Description 鏂板
* @Author wh
@@ -189,65 +186,73 @@
*/
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public ResponseValue add(@RequestBody FinSysTenantUser user) {
- if (user == null) {
+ public ResponseValue add() {
+ FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+ 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());
- //user.setStatus(1);// 0绂佺敤 1鍚敤
- user.setIsDelete(0);
- user.setSysUserId(NumberGenerator.getLongSequenceNumber());
+ // 鎻掑叆绯荤粺鐢ㄦ埛
+ 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鍚敤
+ 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);
- //鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
- user.setSysDeptId(3L); //瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
- this.finSysTenantUserService.insert(user);
+ tenantUser.setUserPhone(encPhone);
+ // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
+ tenantUser.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+ this.finSysTenantUserService.insert(tenantUser);
+
// 鎻掑叆骞冲彴鐢ㄦ埛
S_user_core userCore = new S_user_core();
- userCore.setId(user.getSysUserId());
- userCore.setDept_id(3L); //閮ㄩ棬id锛岀洰鍓嶅啓姝�
- userCore.setOrg_id(user.getSysDeptId()); //鏈烘瀯id
+ userCore.setId(tenantUser.getSysUserId());
+ userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
+ userCore.setOrg_id(tenantUser.getSysDeptId()); // 鏈烘瀯id
userCore.setOrg_id(1L);
- userCore.setUser_name(user.getUserCode()); //鐢ㄦ埛璐﹀彿
- userCore.setNick_name(user.getUserName());
- //鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
+ userCore.setUser_name(tenantUser.getUserCode()); // 鐢ㄦ埛璐﹀彿
+ userCore.setNick_name(tenantUser.getUserName());
+ // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
userCore.setUser_type(2);
userCore.setPhonenumber(encPhone);
- userCore.setSex(user.getSex().toString());
- //鍒濆鍖栧瘑鐮� 123456
+ 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);
@@ -262,95 +267,20 @@
userCore.setIs_logoff(0);
userCore.setLogoff_time(0L);
userCore.setIs_sms(0);
- //绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
+ // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
userCore.setType(1);
- //鍟嗘埛id锛�0-骞冲彴
+ // 鍟嗘埛id锛�0-骞冲彴
userCore.setMer_id(0L);
this.userService.insert(userCore);
// 鎻掑叆骞冲彴鏈烘瀯
- //灏戣鑹瞚d
- List<Long> roleList = user.getRoleList(); //鏈烘瀯id 澶氫釜
+ // 灏戣鑹瞚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();
+ // this.getFinCustomerCache().remove();
return ResponseValue.success(1);
- }
-
-
- public static class ImportUserParam {
-
- @ExcelProperty("鐢ㄦ埛濮撳悕")
- private String userName;
- @ExcelProperty("鐢ㄦ埛缂栧彿")
- private String userCode;
- @ExcelProperty("鎵嬫満鍙�")
- private String userPhone;
- @ExcelProperty("鎬у埆(1鐢凤紝2濂�)")
- private Integer sex;
- @ExcelProperty("鐢靛瓙閭")
- private String email;
- @ExcelProperty("椤哄簭鍙�")
- private Long seq;
- @ExcelProperty("瑙掕壊鍚嶇О")
- private String roleName;
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getUserPhone() {
- return userPhone;
- }
-
- public void setUserPhone(String userPhone) {
- this.userPhone = userPhone;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public Long getSeq() {
- return seq;
- }
-
- public void setSeq(Long seq) {
- this.seq = seq;
- }
-
- public String getRoleName() {
- return roleName;
- }
-
- public void setRoleName(String roleName) {
- this.roleName = roleName;
- }
}
/**
@@ -359,7 +289,8 @@
* @Date 2023/10/12 15:56
*/
@PostMapping("/import")
- public ResponseValue importUser(@RequestParam String tenantId, @RequestParam String tenantCode, MultipartFile file) throws IOException {
+ public ResponseValue importUser(@RequestParam String tenantId, @RequestParam String tenantCode, MultipartFile file)
+ throws IOException {
String originalFilename = file.getOriginalFilename();
if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))) {
return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
@@ -379,11 +310,13 @@
EasyExcel.read(file.getInputStream(), ImportUserParam.class, new AnalysisEventListener<ImportUserParam>() {
@Override
public void invoke(ImportUserParam data, AnalysisContext context) {
- if (StringUtils.isEmpty(data.getUserName()) || StringUtils.isEmpty(data.getUserCode()) || StringUtils.isEmpty(data.getUserPhone())
- || null == data.getSex() || StringUtils.isEmpty(data.getEmail()) || null == data.getSeq() || StringUtils.isEmpty(data.getRoleName())) {
+ if (StringUtils.isEmpty(data.getUserName()) || StringUtils.isEmpty(data.getUserCode())
+ || StringUtils.isEmpty(data.getUserPhone()) || null == data.getSex()
+ || StringUtils.isEmpty(data.getEmail()) || null == data.getSeq()
+ || StringUtils.isEmpty(data.getRoleName())) {
throw new ImportUserParamVerifyException("鍗曞厓鏍间笉鑳戒负绌�!");
}
- //鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
+ // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
if (finSysTenantUserService.getByUserCode(data.getUserCode()) > 0) {
throw new ImportUserParamVerifyException("鍛樺伐缂栧彿涓虹┖鎴栧凡瀛樺湪!");
}
@@ -399,8 +332,9 @@
user.setSeq(data.getSeq());
user.setTenantId(tenantId);
user.setTenantCode(tenantCode);
- //璁剧疆瑙掕壊
- Optional<S_role> sRole = roles.stream().filter(role -> role.getRole_name().equals(data.getRoleName())).findFirst();
+ // 璁剧疆瑙掕壊
+ Optional<S_role> sRole =
+ roles.stream().filter(role -> role.getRole_name().equals(data.getRoleName())).findFirst();
user.setRoleList(Arrays.asList(sRole.orElse(new S_role()).getRole_id()));
user.setId(NumberGenerator.getLongSequenceNumber());
@@ -418,8 +352,8 @@
user.setUserPhone(encPhone);
user.setIsDelete(1);
- //鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
- user.setSysDeptId(3L); //瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
+ // 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
+ user.setSysDeptId(3L); // 瀵瑰簲骞冲彴鏈烘瀯id 榛樿涓哄钩鍙扮鐞�
finSysTenantUsers.add(user);
}
@@ -433,15 +367,17 @@
if (exception != null) {
// 濡傛灉鏄煇涓�涓崟鍏冩牸鐨勮浆鎹㈠紓甯� 鑳借幏鍙栧埌鍏蜂綋琛屽彿 灏佽鏃跺紓甯�
if (exception instanceof ExcelDataConvertException) {
- ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
- logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(), excelDataConvertException.getColumnIndex() + 1,
+ ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
+ logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
+ excelDataConvertException.getColumnIndex() + 1,
excelDataConvertException.getCellData().getStringValue());
- throw new IllegalStateException(
- "绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�" + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯革紝寮傚父鏁版嵁涓�:[ "
- + excelDataConvertException.getCellData().getStringValue() + " ]");
+ throw new IllegalStateException("绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�"
+ + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯革紝寮傚父鏁版嵁涓�:[ "
+ + excelDataConvertException.getCellData().getStringValue() + " ]");
}
if (exception instanceof ImportUserParamVerifyException) {
- throw new IllegalStateException("绗�" + context.readSheetHolder().getRowIndex() + "琛�, 瑙ｆ瀽閿欒:[ " + exception.getMessage() + " ]");
+ throw new IllegalStateException("绗�" + context.readSheetHolder().getRowIndex() + "琛�, 瑙ｆ瀽閿欒:[ "
+ + exception.getMessage() + " ]");
}
throw exception;
}
@@ -463,16 +399,16 @@
// 鎻掑叆骞冲彴鐢ㄦ埛
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
- userCore.setDept_id(3L); //閮ㄩ棬id锛岀洰鍓嶅啓姝�
- userCore.setOrg_id(user.getSysDeptId()); //鏈烘瀯id
+ userCore.setDept_id(3L); // 閮ㄩ棬id锛岀洰鍓嶅啓姝�
+ userCore.setOrg_id(user.getSysDeptId()); // 鏈烘瀯id
userCore.setOrg_id(1L);
- userCore.setUser_name(user.getUserCode()); //鐢ㄦ埛璐﹀彿
+ userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
userCore.setNick_name(user.getUserName());
- //鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
+ // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
userCore.setUser_type(2);
userCore.setPhonenumber(user.getUserPhone());
userCore.setSex(user.getSex().toString());
- //鍒濆鍖栧瘑鐮� 123456
+ // 鍒濆鍖栧瘑鐮� 123456
String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
userCore.setPassword(pws);
// 骞冲彴鐢ㄦ埛琛ㄥ拰绯荤粺鐢ㄦ埛 琛ㄧ姸鎬佺浉鍙�
@@ -500,17 +436,17 @@
userCore.setIs_logoff(0);
userCore.setLogoff_time(0L);
userCore.setIs_sms(0);
- //绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
+ // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
userCore.setType(1);
- //鍟嗘埛id锛�0-骞冲彴
+ // 鍟嗘埛id锛�0-骞冲彴
userCore.setMer_id(0L);
sUserCores.add(userCore);
}
- //淇濆瓨鐢ㄦ埛淇℃伅
+ // 淇濆瓨鐢ㄦ埛淇℃伅
this.finSysTenantUserService.insertBatch(finSysTenantUsers);
- //淇濆瓨骞冲彴鐢ㄦ埛淇℃伅
+ // 淇濆瓨骞冲彴鐢ㄦ埛淇℃伅
this.userService.insertBatch(sUserCores);
- //淇濆瓨瑙掕壊鏉冮檺淇℃伅
+ // 淇濆瓨瑙掕壊鏉冮檺淇℃伅
this.finSysTenantUserService.execInsertRoleUserList(finSysTenantUsers);
}
@@ -525,7 +461,6 @@
}
}
-
/**
* @Description 缂栬緫
* @Author wh
@@ -533,19 +468,23 @@
*/
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
- public ResponseValue update(@RequestBody FinSysTenantUser user) {
- if (user == null) {
+ public ResponseValue update() {
+ FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+
+ 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);
- // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
- finSysTenantUserService.update(user);
- // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
+ tenantUser.setUserPhone(encPhone);
+ // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
+ finSysTenantUserService.update(tenantUser);
+ // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
userCore.setUpdate_by(this.getCurrentUser().getUser_name());
@@ -565,11 +504,11 @@
// 鍔犲瘑鎵嬫満鍙�
userCore.setPhonenumber(user.getUserPhone());
this.userService.update(userCore);
- // 3. 鏇存柊瑙掕壊閰嶇疆 S_ROLE_USER
- // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
- List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); //宸叉湁鐨勬潈闄�
- List<Long> roleList = user.getRoleList(); //閫夋嫨鐨勬潈闄�
- //鍏堝垹闄ゅ啀娣诲姞
+ // 3. 鏇存柊瑙掕壊閰嶇疆 S_ROLE_USER
+ // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
+ List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 宸叉湁鐨勬潈闄�
+ List<Long> roleList = user.getRoleList(); // 閫夋嫨鐨勬潈闄�
+ // 鍏堝垹闄ゅ啀娣诲姞
if (list != null && list.size() > 0) {
finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
}
@@ -587,19 +526,22 @@
*/
@PostMapping("/updateStatus")
@Transactional(rollbackFor = Exception.class)
- public ResponseValue updateStatus(@RequestBody FinSysTenantUser user) {
- if (user == null) {
+ public ResponseValue updateStatus() {
+ 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()));
+ // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER 搴旇鏄煡璇� 鐒跺悗鍙敼鐘舵��
+ List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(tenantUser.getId()));
if (select == null || select.size() == 0) {
return ResponseValue.error("鐢ㄦ埛涓嶅瓨鍦�");
}
FinSysTenantUser finSysTenantUser = select.get(0);
finSysTenantUser.setStatus(user.getStatus());
finSysTenantUserService.update(finSysTenantUser);
- // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
+ // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
userCore.setUpdate_by(this.getCurrentUser().getUser_name());
@@ -621,15 +563,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
+ // 鍒濆鍖栧瘑鐮� 123456
String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 瀵嗘枃
// 1. 淇敼鐢ㄦ埛琛�
- //鐢ㄦ埛琛╥d
- Long sysUserId = finSysTenantUser.getSysUserId();
+ // 鐢ㄦ埛琛╥d
+ Long sysUserId = user.getSysUserId();
S_user_core userCore = new S_user_core();
userCore.setId(sysUserId);
userCore.setPassword(stringValue);
@@ -684,21 +631,23 @@
}
// 鏌ヨ 鐢ㄦ埛瑙掕壊 TODO 涓存椂瑙ｅ喅 灏嗘潵鏀鹃厤缃枃浠朵腑
- List<S_role> list = finSysTenantUserService.getByUserId(sysInfo.getSysUserId()); //宸叉湁鐨勬潈闄�
+ // 宸叉湁鐨勬潈闄�
+ List<S_role> list = finSysTenantUserService.getByUserId(sysInfo.getSysUserId());
for (S_role s_role : list) {
if (s_role.getRole_id() != null && s_role.getRole_id().equals(1690961420053L)) {
sysInfo.setKfStatus(1);
}
}
- // 鏌ヨ鐖剁被鐨刼rgcode 闇�瑕佸皢鑷繁鐨刼rg鍏堟煡鍑烘潵 鍐嶆牴鎹畃arentid 鏌ョ埗绫�
+ // 鏌ヨ鐖剁被鐨刼rgcode 闇�瑕佸皢鑷繁鐨刼rg鍏堟煡鍑烘潵 鍐嶆牴鎹畃arentid 鏌ョ埗绫�
String tenantId = sysInfo.getTenantId();
if (tenantId != null && !tenantId.equals("")) {
List<FinSysTenant> select = finSysTenantService.select(new FinSysTenant(Long.valueOf(tenantId)));
if (select != null && select.size() > 0) {
FinSysTenant finSysTenant = select.get(0);
if (finSysTenant != null && finSysTenant.getParentId() != null) {
- List<FinSysTenant> parents = finSysTenantService.select(new FinSysTenant(finSysTenant.getParentId()));
+ List<FinSysTenant> parents =
+ finSysTenantService.select(new FinSysTenant(finSysTenant.getParentId()));
if (parents != null && parents.size() > 0) {
sysInfo.setParentCode(parents.get(0).getCode());
}
@@ -710,22 +659,25 @@
return ResponseValue.success(sysInfo);
}
-
/**
* 鏇存柊瑙掕壊鏉冮檺
*
- * @param user
* @return
*/
@PostMapping("/updRole")
- public ResponseValue updRole(@RequestBody FinSysTenantUser user) {
+ public ResponseValue updRole() {
+ FinSysTenantUser user = CommonUtil.getObjFromReqBody(FinSysTenantUser.class);
+ FinSysTenantUser tenantUser = new FinSysTenantUser();
+ CommonUtil.copyProperties(user, tenantUser);
+ user = tenantUser;
+
if (user == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
- // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
- List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); //宸叉湁鐨勬潈闄�
- List<Long> roleList = user.getRoleList(); //閫夋嫨鐨勬潈闄�
- //鍏堝垹闄ゅ啀娣诲姞
+ // 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
+ List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 宸叉湁鐨勬潈闄�
+ List<Long> roleList = user.getRoleList(); // 閫夋嫨鐨勬潈闄�
+ // 鍏堝垹闄ゅ啀娣诲姞
if (list != null && list.size() > 0) {
finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
}
@@ -735,7 +687,6 @@
return ResponseValue.success(1);
}
-
/**
* @Description 鏂板
* @Author llb
@@ -743,7 +694,11 @@
*/
@PostMapping("/addSupplier")
@Transactional(rollbackFor = Exception.class)
- public ResponseValue addSupplier(@RequestBody FinSysTenantUser user) {
+ public ResponseValue addSupplier() {
+ FinSysTenantUserParam userParam = CommonUtil.getObjFromReqBody(FinSysTenantUserParam.class);
+ FinSysTenantUser user = new FinSysTenantUser();
+ CommonUtil.copyProperties(userParam, user);
+
if (user == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
@@ -752,12 +707,13 @@
if (depts == null || depts.size() == 0) {
return ResponseValue.error(roleName + "鐨勮鑹蹭笉瀛樺湪");
}
- //鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
- if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
+ // 鏍规嵁鍛樺伐缂栧彿鏌ヨ锛屽鏋滃瓨鍦ㄥ垯鎻愮ず
+ if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
+ && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
return ResponseValue.error("鍛樺伐缂栧彿閲嶅");
}
FinSysTenantUser sysInfo = this.getSysInfo();
- //鎻掑叆绯荤粺鐢ㄦ埛
+ // 鎻掑叆绯荤粺鐢ㄦ埛
user.setId(NumberGenerator.getLongSequenceNumber());
user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
user.setCreateBy(this.getCurrentUser().getUser_name());
@@ -769,7 +725,7 @@
user.setLv(sysInfo.getLv());
user.setTenantCode(sysInfo.getTenantCode());
user.setTenantId(sysInfo.getTenantId());
- user.setSysDeptId(2l); //杩愮淮绠＄悊
+ user.setSysDeptId(2l); // 杩愮淮绠＄悊
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
String userPhone = user.getUserPhone();
@@ -783,16 +739,16 @@
// 鎻掑叆骞冲彴鐢ㄦ埛
S_user_core userCore = new S_user_core();
userCore.setId(user.getSysUserId());
- userCore.setDept_id(depts.get(0).getId()); //閮ㄩ棬
+ userCore.setDept_id(depts.get(0).getId()); // 閮ㄩ棬
userCore.setOrg_id(1L);
- //userCore.setUser_name(); //鐢ㄦ埛璐﹀彿
- userCore.setUser_name(user.getUserCode()); //鐢ㄦ埛璐﹀彿
+ // userCore.setUser_name(); //鐢ㄦ埛璐﹀彿
+ userCore.setUser_name(user.getUserCode()); // 鐢ㄦ埛璐﹀彿
userCore.setNick_name(user.getUserName());
- //鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
+ // 鐢ㄦ埛绫诲瀷 鍏堥粯璁よ缃负2
userCore.setUser_type(2);
userCore.setPhonenumber(userPhone);
- //鍒濆鍖栧瘑鐮� 123456
+ // 鍒濆鍖栧瘑鐮� 123456
String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
userCore.setPassword(pws);
if (user.getStatus() == 0) {
@@ -818,67 +774,73 @@
userCore.setIs_logoff(0);
userCore.setLogoff_time(0L);
userCore.setIs_sms(0);
- //绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
+ // 绠＄悊鍛樼被鍨嬶細1= 骞冲彴瓒呯, 2=鍟嗘埛瓒呯, 3=绯荤粺绠＄悊鍛橈紝4=鍟嗘埛绠＄悊鍛�
userCore.setType(2);
- //鍟嗘埛id锛�0-骞冲彴
+ // 鍟嗘埛id锛�0-骞冲彴
userCore.setMer_id(0L);
this.userService.insert(userCore);
// 鎻掑叆骞冲彴鏈烘瀯
- //灏戣鑹瞚d
- List<Long> roleList = user.getRoleList(); //鏈烘瀯id 澶氫釜
- Long sysUserId = user.getSysUserId(); //鐢ㄦ埛id
+ // 灏戣鑹瞚d
+ List<Long> roleList = user.getRoleList(); // 鏈烘瀯id 澶氫釜
+ Long sysUserId = user.getSysUserId(); // 鐢ㄦ埛id
this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
return ResponseValue.success(1);
}
- private Set<String> picFormatArr = new HashSet<String>() {{
- add(".pjp");
- add(".svgz");
- add(".jxl");
- add(".jpeg");
- add(".ico");
- add(".avif");
- add(".tif");
- add(".gif");
- add(".jfif");
- add(".jpg");
- add(".svg");
- add(".png");
- add(".xbm");
- add(".pjpeg");
- add(".bmp");
- add(".webp");
- }};
+ private Set<String> picFormatArr = new HashSet<String>() {
+ {
+ add(".pjp");
+ add(".svgz");
+ add(".jxl");
+ add(".jpeg");
+ add(".ico");
+ add(".avif");
+ add(".tif");
+ add(".gif");
+ add(".jfif");
+ add(".jpg");
+ add(".svg");
+ add(".png");
+ add(".xbm");
+ add(".pjpeg");
+ add(".bmp");
+ add(".webp");
+ }
+ };
@PostMapping("/updatePerson")
@Transactional(rollbackFor = Exception.class)
- public ResponseValue updatePerson(@RequestBody FinSysTenantUser user) {
- if (user == null) {
+ public ResponseValue updatePerson() {
+ 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
+ // 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
finSysTenantUserService.update(updUser);
- // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
+ // 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
S_user_core userCore = new S_user_core();
userCore.setId(sysInfo.getSysUserId());
userCore.setUpdate_by(this.getCurrentUser().getUser_name());
@@ -897,11 +859,16 @@
* @Description 淇敼瀵嗙爜
*/
@PostMapping("/updatePassword")
- public ResponseValue updatePassword(@RequestBody FinSysTenantUserUpdParam param) {
+ public ResponseValue updatePassword() {
+ FinSysTenantUserUpdParam param = CommonUtil.getObjFromReqBody(FinSysTenantUserUpdParam.class);
+ FinSysTenantUserUpdParam finSysTenantParam = new FinSysTenantUserUpdParam();
+ CommonUtil.copyProperties(param, finSysTenantParam);
+ param = finSysTenantParam;
+
String oldMixPd = param.getOldMixPd();
String newMixPd = param.getNewMixPd();
String btnMixPd = param.getBtnMixPd();
- //鏍￠獙鍙傛暟
+ // 鏍￠獙鍙傛暟
if (StringUtils.isEmpty(oldMixPd) || StringUtils.isEmpty(newMixPd) || StringUtils.isEmpty(btnMixPd)) {
return ResponseValue.error("淇℃伅涓嶈兘涓虹┖锛�");
}
@@ -909,7 +876,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- //鏍￠獙淇╂杈撳叆鐨勫瘑鐮�
+ // 鏍￠獙淇╂杈撳叆鐨勫瘑鐮�
btnMixPd = PlatformRSAUtils.getRsaDecryptValue(btnMixPd, PlatformRSAUtils.PRIK);
newMixPd = PlatformRSAUtils.getRsaDecryptValue(newMixPd, PlatformRSAUtils.PRIK);
if (!newMixPd.equals(btnMixPd)) {
@@ -923,7 +890,7 @@
if (validatePasswordRule != null) {
return ResponseValue.error(validatePasswordRule);
}
- //鐢ㄦ埛琛╥d
+ // 鐢ㄦ埛琛╥d
Long sysUserId = sysInfo.getSysUserId();
S_user_core queryU = new S_user_core();
queryU.setId(sysUserId);
@@ -932,14 +899,14 @@
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
oldMixPd = PlatformRSAUtils.getRsaDecryptValue(oldMixPd, PlatformRSAUtils.PRIK);
- //鏍￠獙鑰佸瘑鐮�
+ // 鏍￠獙鑰佸瘑鐮�
if (!this.matchesPassword(oldMixPd, queryUserInfo.getPassword())) {
return ResponseValue.error("鏃у瘑鐮佽緭鍏ユ湁璇紒");
}
if (oldMixPd.equalsIgnoreCase(btnMixPd)) {
return ResponseValue.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚岋紒");
}
- //鏇存柊鏁版嵁搴�
+ // 鏇存柊鏁版嵁搴�
// 1. 淇敼鐢ㄦ埛琛�
queryU.setPassword(this.encryptPassword(btnMixPd));
queryU.setModify_pwd(1);
@@ -950,8 +917,7 @@
@ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬涓殑鐢ㄦ埛", notes = "鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬涓殑鐢ㄦ埛")
@ApiImplicitParams({
- @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
- })
+ @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")})
@GetMapping("/select/department")
public ResponseValue selectDepartment(Long agencyId) {
FinSysTenantVO finSysTenantVO = new FinSysTenantVO();
@@ -965,18 +931,18 @@
// 閮ㄩ棬
FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
finSysTenantDepartment.setTenantId(agencyId);
- List<FinSysTenantDepartment> tenantDepartmentList = finSysTenantDepartmentService.select(finSysTenantDepartment);
+ List<FinSysTenantDepartment> tenantDepartmentList =
+ finSysTenantDepartmentService.select(finSysTenantDepartment);
List<DepartmentVO> departmentVOList = Lists.newArrayList();
tenantDepartmentList.forEach(department -> {
DepartmentVO departmentVO = new DepartmentVO();
- //鐢ㄦ埛
+ // 鐢ㄦ埛
Long id = department.getId();
departmentVO.setId(id);
departmentVO.setName(department.getName());
departmentVO.setType("department");
- String sql = "SELECT SYS_USER_ID,USER_NAME FROM "
- + "fin_sys_tenant_user "
+ String sql = "SELECT SYS_USER_ID,USER_NAME FROM " + "fin_sys_tenant_user "
+ "WHERE SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
Map<String, Object> param = new HashMap<>();
param.put("deptId", id);
@@ -984,7 +950,7 @@
List<UserVO> userVOList = Lists.newArrayList();
select.forEach(user -> {
UserVO userVO = new UserVO();
- userVO.setId((Long) user.get("sysUserId"));
+ userVO.setId((Long)user.get("sysUserId"));
userVO.setName(user.get("userName").toString());
userVO.setType("user");
userVOList.add(userVO);
@@ -996,6 +962,5 @@
return ResponseValue.success(finSysTenantVO);
}
-
}
--
Gitblit v1.9.1