From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 08:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 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 c8dcc52..d66763d 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
@@ -2,24 +2,19 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.DelayTask;
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 java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-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(Long userId);
@@ -27,18 +22,8 @@
@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);
@@ -72,14 +57,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
@@ -95,4 +72,15 @@
@PostMapping("/user/queryUserByUserName")
R<SysUser> queryUserByUserName(@RequestBody String userName);
+ /**
+ * 延时任务控制
+ */
+ @PostMapping("/config/getDelayTask")
+ public R<DelayTask> getDelayTask(@RequestBody String key);
+
+ @PostMapping("/config/addDelayTask")
+ public R<?> addDelayTask(@RequestBody DelayTask delayTask);
+
+ @PostMapping("/config/deleteDelayTask")
+ public R<?> deleteDelayTask(@RequestBody String key);
}
--
Gitblit v1.7.1