Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-02 4c6d6ff48364eb56a7d61ca0877fd98f1ff9b447

 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,14 @@
     */
    @PostMapping("/user/resetPassword")
    R resetPassword(@RequestBody SysUser user);
    
    
    /**
     * 新增加门店员工账号数据
     * @param user
     * @return
     */
    @PostMapping("/user/saveShopUser")
    R saveShopUser(@RequestBody SysUser user);
    
}