From d7d6f86630ee5aefcfa1486b753a94394809fc65 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 20:28:53 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/UserSiteClient.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/UserSiteClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/UserSiteClient.java
index 4cd3910..cd9ba7b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/UserSiteClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/UserSiteClient.java
@@ -6,10 +6,7 @@
import com.ruoyi.other.api.factory.UserSiteFallbackFactory;
import org.apache.ibatis.annotations.Delete;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -26,8 +23,8 @@
* @param userId
* @return
*/
- @GetMapping("/t-user-site/getSiteIds")
- R<List<Integer>> getSiteIds(Long userId);
+ @PostMapping("/t-user-site/getSiteIds/{userId}")
+ R<List<Integer>> getSiteIds(@PathVariable("userId") Long userId);
/**
@@ -35,8 +32,8 @@
* @param userSite
* @return
*/
- @PostMapping("/t-user-site/getSiteIds")
- R addUserSite(List<TUserSite> userSite);
+ @PostMapping("/t-user-site/addUserSite")
+ R addUserSite(@RequestBody List<TUserSite> userSite);
/**
@@ -44,6 +41,6 @@
* @param userId
* @return
*/
- @DeleteMapping("/t-user-site/delUserSite")
- R delUserSite(Long userId);
+ @DeleteMapping("/t-user-site/delUserSite/{userId}")
+ R delUserSite(@PathVariable("userId") Long userId);
}
--
Gitblit v1.7.1