From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 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 64de41c..7f566d9 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
@@ -5,18 +5,16 @@
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
-import com.ruoyi.system.api.model.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+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 javax.management.relation.Role;
import java.util.List;
@FeignClient(contextId = "sysUserClient", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = SysUserFallbackFactory.class)
public interface SysUserClient {
-
- @PostMapping("/user/getSysUserFromCompanyId")
- R<List<CompanyUserListVo>> getSysUserFromCompanyId(@RequestBody CompanySysUserReq companySysUserReq);
@PostMapping("/user/getSysUser")
R<SysUser> getSysUser(@RequestParam("userId")Long userId);
@@ -24,18 +22,9 @@
@PostMapping("/user/updateSysUser")
R<Boolean> updateSysUser(@RequestBody SysUser sysUser);
- @PostMapping("/user/companySaveSysUser")
- R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto);
-
- @PostMapping("/user/addTRepairSysUser")
- R<List<Integer>> addTRepairSysUser(@RequestBody TRepairShopAddDto dto);
-
@PostMapping("/user/getUserList")
R<List<SysUser>> getUserList(@RequestBody List<Integer> userIds);
-
- @PostMapping("/user/getSysUserFromCompanyIdOne")
- R<List<CompanyUserListVo>> getSysUserFromCompanyIdOne(@RequestBody CompanySysUserReq companySysUserReq);
@PostMapping("/user/isAdmin")
R<Integer> isAdmin(Long userId);
@@ -69,14 +58,6 @@
R<List<SysUser>> queryUserByPhoneList(@RequestBody List<String> phoneList);
/**
- * 默认批量添加修理厂
- * @param dtoList
- * @return
- */
- @PostMapping("/user/addUserRole")
- R<Boolean> addUserRole(@RequestBody List<SysUserRoleDTO> dtoList);
-
- /**
* 通过手机号查询用户
* @param phone
* @return
@@ -107,4 +88,24 @@
*/
@PostMapping("/user/resetPassword")
R resetPassword(@RequestBody SysUser user);
+
+
+ /**
+ * 新增加门店员工账号数据
+ * @param user
+ * @return
+ */
+ @PostMapping("/user/saveShopUser")
+ R<Long> saveShopUser(@RequestBody SysUser user);
+
+ /**
+ * 删除门店所有管理员账号
+ * @param objectId
+ * @param roleType
+ * @return
+ */
+ @PostMapping("/user/delShopUser")
+ R delShopUser(@RequestParam("objectId") Integer objectId, @RequestParam("roleType") Integer roleType);
+
+
}
--
Gitblit v1.7.1