From ae8e8fd2aac82eaa55814bedbb11ed4062a48a2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 01 Jun 2026 11:17:31 +0800
Subject: [PATCH] refactor(user): 将用户保存方法替换为提交方法
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java
index 36af256..544472b 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java
@@ -107,28 +107,28 @@
}
/**
- * 新增或修改-对外
+ * 新增或修改-对外 后面沟通后不同步角色信息，先注释防止看不懂
*/
- @PostMapping("/submitRoleExternal")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "角色新增或修改", notes = "传入role")
- @ApiLog("角色信息新增或修改")
- public R submit(@Valid @RequestBody Role role) {
- log.info("角色信息修改-对外{}", JSON.toJSONString(role));
- // 参数校验：确保关键字段不为空
- if (role.getId() == null) {
- return R.fail("参数缺失：id 不能为空");
- }
- CacheUtil.clear(SYS_CACHE);
- CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
- // 删除操作
- if (role.getIsDeleted() != null && role.getIsDeleted() == 1) {
- roleService.removeRole(String.valueOf(role.getId()));
- return R.status(true);
- }
- // 新增操作
- return R.status(roleService.submit(role));
- }
+ // @PostMapping("/submitRoleExternal")
+ // @ApiOperationSupport(order = 2)
+ // @ApiOperation(value = "角色新增或修改", notes = "传入role")
+ // @ApiLog("角色信息新增或修改")
+ // public R submit(@Valid @RequestBody Role role) {
+ // log.info("角色信息修改-对外{}", JSON.toJSONString(role));
+ // // 参数校验：确保关键字段不为空
+ // if (role.getId() == null) {
+ // return R.fail("参数缺失：id 不能为空");
+ // }
+ // CacheUtil.clear(SYS_CACHE);
+ // CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+ // // 删除操作
+ // if (role.getIsDeleted() != null && role.getIsDeleted() == 1) {
+ // roleService.removeRole(String.valueOf(role.getId()));
+ // return R.status(true);
+ // }
+ // // 新增操作
+ // return R.status(roleService.submit(role));
+ // }
/**
@@ -148,8 +148,9 @@
if (userInfo != null && userInfo.getUser() != null) {
bladeLogger.info("用户信息修改", user.toString());
user.setId(userInfo.getUser().getId());
- user.setDeptId(userInfo.getUser().getDeptId());
- user.setRoleId(userInfo.getUser().getRoleId());
+ user.setDeptId(StringUtil.isBlank(user.getDeptId()) ? userInfo.getUser().getDeptId() : user.getDeptId());
+ user.setRoleId(StringUtil.isBlank(user.getRoleId()) ? userInfo.getUser().getRoleId() : user.getRoleId());
+ user.setIsDeleted(user.getIsDeleted());
isRet = userService.updateUser(user);
} else {
// 将String类型的deptId转换为Long类型
@@ -157,9 +158,9 @@
Dept dept = deptService.getById(deptIdLong);
user.setAreaCode(HeaderUtils.processAreaCode(dept.getAreaCode()));
user.setPassword(DigestUtil.encrypt("jadk@2026"));
- user.setDeptId(user.getDeptId() == null ? String.valueOf(dept.getId()) : user.getDeptId());
- user.setRoleId(user.getRoleId() == null ? "2011678430358691842" : user.getRoleId());
- isRet = userService.save(user);
+ user.setDeptId(StringUtil.isBlank(user.getDeptId()) ? String.valueOf(dept.getId()) : user.getDeptId());
+ user.setRoleId(StringUtil.isBlank(user.getRoleId()) ? "2011678430358691842" : user.getRoleId());
+ isRet = userService.submit(user);
bladeLogger.info("用户信息新增", user.toString());
}
--
Gitblit v1.9.3