From 35ad3067307e40b89d3ea8c131ac35c17f62ff1c Mon Sep 17 00:00:00 2001
From: 三个三 <2029364173@qq.com>
Date: 星期六, 17 六月 2023 23:13:02 +0800
Subject: [PATCH] Merge branch '5.X' of gitee.com:dromara/RuoYi-Vue-Plus into JustAuth
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SocialUserController.java | 84 +++++++++---------------------------------
1 files changed, 18 insertions(+), 66 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SocialUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SocialUserController.java
index 9199406..38cc14c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SocialUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SocialUserController.java
@@ -1,37 +1,29 @@
package org.dromara.system.controller.system;
-import java.util.List;
-
+import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.web.core.BaseController;
import org.dromara.system.domain.vo.SocialUserVo;
-import org.dromara.system.domain.bo.SocialUserBo;
import org.dromara.system.service.ISocialUserService;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* 绀句細鍖栧叧绯�
*
* @author thiszhc
- * @date 2023-06-12
+ * @date 2023-06-16
*/
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/system/socialUser")
+@RequestMapping("/system/social")
public class SocialUserController extends BaseController {
private final ISocialUserService socialUserService;
@@ -39,67 +31,27 @@
/**
* 鏌ヨ绀句細鍖栧叧绯诲垪琛�
*/
- @SaCheckPermission("system:user:list")
+// 杩欓噷鏀规垚鐢ㄦ埛榛樿鐨勩�傚彧鑳芥煡鐪嬭嚜宸辩殑鏉冮檺鏇村ソ鍝�
+// @SaCheckPermission("system:user:list")
@GetMapping("/list")
- public TableDataInfo<SocialUserVo> list(SocialUserBo bo, PageQuery pageQuery) {
- return socialUserService.queryPageList(bo, pageQuery);
+ public R<List<SocialUserVo>> list() {
+ return R.ok(socialUserService.queryList());
}
- /**
- * 瀵煎嚭绀句細鍖栧叧绯诲垪琛�
- */
- @SaCheckPermission("system:user:export")
- @Log(title = "绀句細鍖栧叧绯�", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(SocialUserBo bo, HttpServletResponse response) {
- List<SocialUserVo> list = socialUserService.queryList(bo);
- ExcelUtil.exportExcel(list, "绀句細鍖栧叧绯�", SocialUserVo.class, response);
- }
/**
* 鑾峰彇绀句細鍖栧叧绯昏缁嗕俊鎭�
*
* @param id 涓婚敭
*/
- @SaCheckPermission("system:user:query")
+// 杩欓噷鏀规垚鐢ㄦ埛榛樿鐨勩�傚彧鑳芥煡鐪嬭嚜宸辩殑鏉冮檺鏇村ソ鍝�
+// @SaCheckPermission("system:user:query")
@GetMapping("/{id}")
public R<SocialUserVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long id) {
+ @PathVariable String id) {
return R.ok(socialUserService.queryById(id));
}
- /**
- * 鏂板绀句細鍖栧叧绯�
- */
- @SaCheckPermission("system:user:add")
- @Log(title = "绀句細鍖栧叧绯�", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping()
- public R<Void> add(@Validated(AddGroup.class) @RequestBody SocialUserBo bo) {
- return toAjax(socialUserService.insertByBo(bo));
- }
- /**
- * 淇敼绀句細鍖栧叧绯�
- */
- @SaCheckPermission("system:user:edit")
- @Log(title = "绀句細鍖栧叧绯�", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping()
- public R<Void> edit(@Validated(EditGroup.class) @RequestBody SocialUserBo bo) {
- return toAjax(socialUserService.updateByBo(bo));
- }
- /**
- * 鍒犻櫎绀句細鍖栧叧绯�
- *
- * @param ids 涓婚敭涓�
- */
- @SaCheckPermission("system:user:remove")
- @Log(title = "绀句細鍖栧叧绯�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ids) {
- return toAjax(socialUserService.deleteWithValidByIds(List.of(ids), true));
- }
}
--
Gitblit v1.9.3