From be7766b5f0dec84d537af9811e50f46ab3dfdb2a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 10:03:56 +0800
Subject: [PATCH] update 同步ruoyi
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index f40c659..8a65b69 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -26,12 +26,8 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -48,7 +44,6 @@
* @author Lion Li
*/
@Validated
-@Tag(name ="鐢ㄦ埛淇℃伅鎺у埗鍣�", description = "鐢ㄦ埛淇℃伅绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/user")
@@ -61,14 +56,15 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
- @Operation(summary = "鑾峰彇鐢ㄦ埛鍒楄〃")
@SaCheckPermission("system:user:list")
@GetMapping("/list")
public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
return userService.selectPageUserList(user, pageQuery);
}
- @Operation(summary = "瀵煎嚭鐢ㄦ埛鍒楄〃")
+ /**
+ * 瀵煎嚭鐢ㄦ埛鍒楄〃
+ */
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:user:export")
@PostMapping("/export")
@@ -86,19 +82,23 @@
ExcelUtil.exportExcel(listVo, "鐢ㄦ埛鏁版嵁", SysUserExportVo.class, response);
}
- @Operation(summary = "瀵煎叆鐢ㄦ埛鍒楄〃")
- @Parameters({
- @Parameter(name = "file", description = "瀵煎叆鏂囦欢", required = true),
- })
+ /**
+ * 瀵煎叆鏁版嵁
+ *
+ * @param file 瀵煎叆鏂囦欢
+ * @param updateSupport 鏄惁鏇存柊宸插瓨鍦ㄦ暟鎹�
+ */
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@SaCheckPermission("system:user:import")
- @PostMapping("/importData")
+ @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
return R.ok(result.getAnalysis());
}
- @Operation(summary = "涓嬭浇瀵煎叆妯℃澘")
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil.exportExcel(new ArrayList<>(), "鐢ㄦ埛鏁版嵁", SysUserImportVo.class, response);
@@ -106,11 +106,12 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
+ *
+ * @param userId 鐢ㄦ埛ID
*/
- @Operation(summary = "鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:user:query")
@GetMapping(value = {"/", "/{userId}"})
- public R<Map<String, Object>> getInfo(@Parameter(name = "鐢ㄦ埛ID") @PathVariable(value = "userId", required = false) Long userId) {
+ public R<Map<String, Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
userService.checkUserDataScope(userId);
Map<String, Object> ajax = new HashMap<>();
List<SysRole> roles = roleService.selectRoleAll();
@@ -128,7 +129,6 @@
/**
* 鏂板鐢ㄦ埛
*/
- @Operation(summary = "鏂板鐢ㄦ埛")
@SaCheckPermission("system:user:add")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -149,7 +149,6 @@
/**
* 淇敼鐢ㄦ埛
*/
- @Operation(summary = "淇敼鐢ㄦ埛")
@SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -168,12 +167,13 @@
/**
* 鍒犻櫎鐢ㄦ埛
+ *
+ * @param userIds 瑙掕壊ID涓�
*/
- @Operation(summary = "鍒犻櫎鐢ㄦ埛")
@SaCheckPermission("system:user:remove")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- public R<Void> remove(@Parameter(name = "瑙掕壊ID涓�") @PathVariable Long[] userIds) {
+ public R<Void> remove(@PathVariable Long[] userIds) {
if (ArrayUtil.contains(userIds, getUserId())) {
return R.fail("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
@@ -183,7 +183,6 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @Operation(summary = "閲嶇疆瀵嗙爜")
@SaCheckPermission("system:user:resetPwd")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
@@ -197,7 +196,6 @@
/**
* 鐘舵�佷慨鏀�
*/
- @Operation(summary = "鐘舵�佷慨鏀�")
@SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
@@ -209,11 +207,12 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛ID
*/
- @Operation(summary = "鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊")
@SaCheckPermission("system:user:query")
@GetMapping("/authRole/{userId}")
- public R<Map<String, Object>> authRole(@Parameter(name = "鐢ㄦ埛ID") @PathVariable("userId") Long userId) {
+ public R<Map<String, Object>> authRole(@PathVariable Long userId) {
SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
Map<String, Object> ajax = new HashMap<>();
@@ -224,12 +223,10 @@
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛Id
+ * @param roleIds 瑙掕壊ID涓�
*/
- @Operation(summary = "鐢ㄦ埛鎺堟潈瑙掕壊")
- @Parameters({
- @Parameter(name = "userId", description = "鐢ㄦ埛Id", in = ParameterIn.QUERY),
- @Parameter(name = "roleIds", description = "瑙掕壊ID涓�", in = ParameterIn.QUERY)
- })
@SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
--
Gitblit v1.9.3