From 3947541ddf9d770a75f53a41f71ed076a69e1d61 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Thu, 22 Jan 2026 10:00:06 +0800
Subject: [PATCH] del-删除无用代码
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java
index 9e5c180..3721c0e 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java
@@ -26,6 +26,7 @@
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.sxkj.common.cache.CacheNames;
import org.springblade.core.cache.utils.CacheUtil;
@@ -40,13 +41,10 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.model.ResponseResult;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
+import org.sxkj.system.entity.UserInfo;
import org.sxkj.system.excel.UserExcel;
import org.sxkj.system.excel.UserImporter;
import org.sxkj.system.mapper.DeptMapper;
@@ -83,6 +81,7 @@
private final BladeLogger bladeLogger;
@Autowired
private DeptMapper deptMapper;
+
/**
* 查询单条
*/
@@ -102,11 +101,11 @@
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/info")
public R<UserVO> info(BladeUser user) {
- if(Objects.isNull(user)){
+ if (Objects.isNull(user)) {
return R.fail(401, "token失效了！");
}
User detail = userService.getById(user.getUserId());
- if(Objects.isNull(detail)){
+ if (Objects.isNull(detail)) {
return R.data(null);
}
return R.data(UserWrapper.build().entityVO(detail));
@@ -154,13 +153,45 @@
@ApiLog("用户信息新增或者修改")
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- Dept dept=deptMapper.selectById(user.getDeptId());
+ Dept dept = deptMapper.selectById(user.getDeptId());
user.setAreaCode(dept.getAreaCode());
bladeLogger.info("用户信息新增或者修改", user.toString());
return R.status(userService.submit(user));
}
/**
+ * 用户信息新增或者修改-对外
+ */
+ @PostMapping("/submitExternal")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "新增或修改用户", notes = "传入User,新增或修改用户")
+ @ApiLog("用户信息新增或者修改-对外")
+ public R submitExternal(@Valid @RequestBody User user) {
+ CacheUtil.clear(USER_CACHE);
+
+ boolean isRet = false;
+
+ UserInfo userInfo = userService.userInfo("000000", user.getAccount());
+ 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());
+ isRet = userService.updateUser(user);
+ } else {
+ Dept dept = deptMapper.selectById(1123598813738675201L);
+ user.setAreaCode(dept.getAreaCode());
+ user.setPassword("123456");
+ user.setDeptId(String.valueOf(dept.getId()));
+ user.setRoleId("2011678430358691842");
+ isRet = userService.submit(user);
+ bladeLogger.info("用户信息新增", user.toString());
+ }
+
+ return R.status(isRet);
+ }
+
+ /**
* 修改
*/
@PostMapping("/update")
--
Gitblit v1.9.3