From 8396cf5784636121dc407104f4f91d0724d56b6c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 06 Feb 2026 14:30:18 +0800
Subject: [PATCH] 新增机构和角色对外接口
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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 8b926d1..0ed4755 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
@@ -12,7 +12,6 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +25,6 @@
import org.sxkj.system.entity.User;
import org.sxkj.system.entity.UserInfo;
import org.sxkj.system.enums.DictEnum;
-import org.sxkj.system.mapper.UserMapper;
import org.sxkj.system.param.DeptAddParam;
import org.sxkj.system.service.IDeptService;
import org.sxkj.system.service.IRoleService;
@@ -57,17 +55,32 @@
private final BladeLogger bladeLogger;
/**
- * 新增或修改
+ * 新增或修改-对外
*/
@PostMapping("/submitDeptExternal")
- @ApiOperationSupport(order = 6)
+ @ApiOperationSupport(order = 1)
@ApiOperation(value = "机构新增或修改", notes = "传入dept")
@ApiLog("组织机构信息新增或修改")
public R submit(@Valid @RequestBody DeptAddParam dept) {
+ // 参数校验：确保关键字段不为空
+ if (dept.getId() == null) {
+ return R.fail("参数缺失：id 不能为空");
+ }
+ // 删除操作
+ if (dept.getId() != null && dept.getIsDeleted() == 1) {
+ deptService.removeDept(String.valueOf(dept.getId()));
+ CacheUtil.clear(SYS_CACHE); // 清理缓存
+ CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+ Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
+ .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
+ return R.data(kv);
+ }
+ // 新增操作
Dept deptEntity = Objects.requireNonNull(BeanUtil.copy(dept, Dept.class));
String times = OrderNumUtils.initOrderNum2(WordOrderConstant.ORG_CODE);
String deptCode = WordOrderConstant.ORG_PREFIX + times;
deptEntity.setDeptCode(deptCode);
+ deptEntity.setAreaCode(HeaderUtils.processAreaCode(dept.getAreaCode()));
deptEntity.setCreateTime(new Date());
deptEntity.setUpdateTime(new Date());
if (deptService.submit(deptEntity)) {
@@ -88,15 +101,25 @@
}
/**
- * 新增或修改
+ * 新增或修改-对外
*/
@PostMapping("/submitRoleExternal")
- @ApiOperationSupport(order = 5)
+ @ApiOperationSupport(order = 2)
@ApiOperation(value = "角色新增或修改", notes = "传入role")
@ApiLog("角色信息新增或修改")
public R submit(@Valid @RequestBody Role 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));
}
@@ -105,7 +128,7 @@
* 用户信息新增或者修改-对外
*/
@PostMapping("/submitUserExternal")
- @ApiOperationSupport(order = 5)
+ @ApiOperationSupport(order = 3)
@ApiOperation(value = "新增或修改用户", notes = "传入User,新增或修改用户")
@ApiLog("用户信息新增或者修改-对外")
public R submitExternal(@Valid @RequestBody User user) {
--
Gitblit v1.9.3