From 3c8f4a2fd4d826979ca233da9cd909321f9faded Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 10:14:34 +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/factory/SysUserFallbackFactory.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index d8d4994..4a1faf4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -4,7 +4,6 @@
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.api.model.*;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
@@ -14,11 +13,6 @@
@Override
public SysUserClient create(Throwable cause) {
return new SysUserClient(){
-
- @Override
- public R<List<CompanyUserListVo>> getSysUserFromCompanyId(CompanySysUserReq companySysUserReq) {
- return R.fail("公司获取关联已有账号失败:" + cause.getMessage());
- }
@Override
public R<SysUser> getSysUser(Long userId) {
@@ -31,23 +25,8 @@
}
@Override
- public R<List<Integer>> companySaveSysUser(CompanyAddSysUserDto dto) {
- return R.fail("添加用户失败:" + cause.getMessage());
- }
-
- @Override
- public R<List<Integer>> addTRepairSysUser(TRepairShopAddDto dto) {
- return R.fail("添加修理厂用户失败:" + cause.getMessage());
- }
-
- @Override
public R<List<SysUser>> getUserList(List<Integer> userIds) {
return R.fail("通过用户id集合查询用户失败:" + cause.getMessage());
- }
-
- @Override
- public R<List<CompanyUserListVo>> getSysUserFromCompanyIdOne(CompanySysUserReq companySysUserReq) {
- return R.fail("公司获取账号失败:" + cause.getMessage());
}
@Override
@@ -76,11 +55,6 @@
}
@Override
- public R<Boolean> addUserRole(List<SysUserRoleDTO> dtoList) {
- return R.fail("默认批量添加修理厂失败:" + cause.getMessage());
- }
-
- @Override
public R<SysUser> queryUserByPhone(String phone) {
return R.fail("通过手机号查询用户失败:" + cause.getMessage());
}
@@ -91,6 +65,11 @@
}
@Override
+ public R<SysUser> queryUserByUserNameAndRoleType(String userName, Integer roleType) {
+ return R.fail("通过账号和账号权限查询用户失败：" + cause.getMessage());
+ }
+
+ @Override
public R addSysUser(SysUser user) {
return R.fail("添加用户失败:" + cause.getMessage());
}
@@ -99,6 +78,21 @@
public R resetPassword(SysUser user) {
return R.fail("重置用户密码失败:" + cause.getMessage());
}
+
+ @Override
+ public R saveShopUser(SysUser user) {
+ return R.fail("新增加门店员工账号数据失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R delShopUser(Integer objectId, Integer roleType) {
+ return R.fail("删除门店管理员账号失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R delSysUserById(Long userId) {
+ return R.fail("根据id删除管理员账户失败：" + cause.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1