Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java

@@ -1,25 +1,25 @@
package com.ruoyi.system.api.feignClient;

import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.CustomConfig;
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.domain.WebsocketMessageDTO;
import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
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;
import org.springframework.web.bind.annotation.RequestHeader;

@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 +27,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,20 +62,15 @@
    R<List<SysUser>>  queryUserByPhoneList(@RequestBody List<String> phoneList);

    /**
     * 默认批量添加修理厂
     * @param dtoList
     * @return
     */
    @PostMapping("/user/addUserRole")
    R<Boolean>  addUserRole(@RequestBody List<SysUserRoleDTO> dtoList);

    /**
     * 通过手机号查询用户
     * @param phone
     * @return
     */
    @PostMapping("/user/queryUserByPhone")
    R<SysUser>  queryUserByPhone(@RequestBody String phone);

    @PostMapping("/user/queryUserByPhone1")
    R<SysUser>  queryUserByPhone1(@RequestBody String phone);

    /**
     * 通过账号查询用户
@@ -95,4 +80,36 @@
    @PostMapping("/user/queryUserByUserName")
    R<SysUser>  queryUserByUserName(@RequestBody String userName);

    /**
     * 延时任务控制
     */
    @PostMapping("/delay-task/getDelayTask")
    public R<DelayTask> getDelayTask(@RequestBody String key,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/delay-task/addDelayTask")
    public R<?> addDelayTask(@RequestBody DelayTask delayTask,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/delay-task/deleteDelayTask")
    public R<?> deleteDelayTask(@RequestBody String key,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @GetMapping("/custom-config/{configId}")
    R<CustomConfig>  getconfig(@PathVariable("configId") String configId);

    @PostMapping("/user/list-by-name")
    R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @GetMapping("/custom-config/get-after-sale-setting")
    R<MgtAfterSaleSettingDTO> getAfterSaleSetting();

    @PostMapping("/websocket/push-by-client-type")
    R<?> pushByClientType(@RequestBody WebsocketMessageDTO dto,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @GetMapping("/websocket/push-all/{message}")
    R<?> pushAll(@PathVariable("message") String message,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}