From 1b8098b7f79b66a80e5ca49d8765606cb5fa0408 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 30 十一月 2023 19:11:00 +0800
Subject: [PATCH] 操作日志完善
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
index a71e215..9bfdd3c 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.user.entity.User;
import com.vci.ubcs.system.user.excel.UserExcel;
import com.vci.ubcs.system.user.excel.UserImporter;
@@ -31,6 +32,7 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import com.vci.ubcs.common.cache.CacheNames;
+import org.apache.ibatis.annotations.Param;
import org.hibernate.validator.internal.util.logging.Log;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -74,6 +76,7 @@
private final IUserService userService;
private final BladeRedis bladeRedis;
+ private final NacosConfigCache nacosConfigCache;
/**
* 鏌ヨ鍗曟潯
@@ -122,7 +125,7 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> list(@ApiIgnore @RequestParam Map<String, Object> user, Query query, BladeUser bladeUser) {
QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
- IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+ IPage<User> pages = userService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -138,7 +141,7 @@
@ApiOperation(value = "鍒楄〃", notes = "浼犲叆account鍜宺ealName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -188,11 +191,20 @@
*/
@PostMapping("/grant")
@ApiOperationSupport(order = 7)
- @ApiOperation(value = "鏉冮檺璁剧疆", notes = "浼犲叆roleId闆嗗悎浠ュ強menuId闆嗗悎")
+ @ApiOperation(value = "鏉冮檺璁剧疆", notes = "浼犲叆userIds闆嗗悎浠ュ強roleIds闆嗗悎")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R grant(@ApiParam(value = "userId闆嗗悎", required = true) @RequestParam String userIds,
@ApiParam(value = "roleId闆嗗悎", required = true) @RequestParam String roleIds) {
- boolean temp = userService.grant(userIds, roleIds);
+ boolean temp = false;
+ try {
+ temp = userService.grant(userIds, roleIds);
+ // 鎻掑叆鎺堟潈鏃ュ織
+ userService.grantLog(UserWrapper.build().entityVO(userService.getById(userIds)).toString(),false);
+ }catch (Exception e){
+ // 鎻掑叆鎺堟潈鏃ュ織
+ userService.grantLog(e.getMessage(),true);
+ throw e;
+ }
return R.status(temp);
}
@@ -283,7 +295,6 @@
ExcelUtil.export(response, "鐢ㄦ埛鏁版嵁妯℃澘", "鐢ㄦ埛鏁版嵁琛�", list, UserExcel.class);
}
-
/**
* 绗笁鏂规敞鍐岀敤鎴�
*/
@@ -293,7 +304,6 @@
public R registerGuest(User user, Long oauthId) {
return R.status(userService.registerGuest(user, oauthId));
}
-
/**
* 閰嶇疆鐢ㄦ埛骞冲彴淇℃伅
@@ -349,7 +359,7 @@
}
/**
- * 鐢ㄦ埛瑙ｉ攣
+ * 妫�鏌ョ敤鎴锋槸鍚﹀埌浜嗘彁閱掔敤鎴蜂慨鏀瑰瘑鐮佹垨鑰呭瘑鐮佽繃鏈熺殑鏃堕棿
*/
@PostMapping("/check-renexpr")
@ApiOperationSupport(order = 20)
@@ -360,6 +370,33 @@
return R.data(res);
}
+ /**
+ * 鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃
+ * @param user 鐢ㄦ埛鏌ヨ鐨勭敤鎴蜂俊鎭紝濡傜鎴蜂俊鎭紝閫氬父涓鸿嚜鍔ㄦ敞鍏ワ紝鍓嶇鍙�夋嫨涓嶄紶
+ * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤
+ * @return
+ */
+ @GetMapping("/getByRoleUserList")
+ @ApiOperationSupport(order = 21)
+ @ApiOperation(value = "鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃", notes = "浼犲叆roleName")
+ public R<List<Map<String,String>>> getByRoleUserList(BladeUser user,@Valid @RequestParam String roleName){
+ return R.data(userService.getByRoleUserList(user,roleName));
+ }
+ /**
+ * 淇敼鐢ㄦ埛鐘舵�� 鍋滅敤/鍚敤
+ * @param userIds userId闆嗗悎
+ * @param status 鍋滅敤/鍚敤; true:鍚敤,false:鍋滅敤
+ * @return
+ */
+ @PostMapping("/updateUserStatus")
+ @ApiOperationSupport(order = 21)
+ @ApiOperation(value = "鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃", notes = "浼犲叆userId闆嗗悎")
+ public R<Boolean> updateUserStatus(@Valid @RequestParam("userIds") String userIds,boolean status){
+ if (StringUtil.isBlank(userIds)) {
+ return R.fail("璇疯嚦灏戦�夋嫨涓�涓敤鎴�");
+ }
+ return R.status(userService.updateUserStatus(userIds,status));
+ }
}
--
Gitblit v1.9.3