From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 13c2481..aa9e609 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -6,10 +6,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -18,6 +15,8 @@
@PostMapping("/user/getSysUser")
R<SysUser> getSysUser(@RequestParam("userId")Long userId);
+ @PostMapping("/user/getSysUserAll")
+ R<List<SysUser>> getSysUserAll();
@PostMapping("/user/updateSysUser")
R<Boolean> updateSysUser(@RequestBody SysUser sysUser);
@@ -87,6 +86,12 @@
*/
@PostMapping("/user/addSysUser")
R<Long> addSysUser(@RequestBody SysUser user);
+ /**
+ * 新增加用户信息
+ * @param user
+ */
+ @PostMapping("/user/addSysUserSite")
+ R<Long> addSysUserSite(@RequestBody SysUser user);
/**
@@ -123,4 +128,13 @@
*/
@PostMapping("/user/delSysUserById")
R delSysUserById(@RequestParam("userId") Long userId);
+
+ /**
+ * 通过站点id查询用户
+ * @param siteId
+ * @return
+ */
+ @GetMapping("/user/queryUserBySiteId")
+ R<SysUser> queryUserBySiteId(@RequestParam("siteId")Integer siteId);
+
}
--
Gitblit v1.7.1