合并分支 'qa' 到 'master'

src/main/java/com/sfa/system/api/RemoteUserService.java

@@ -3,38 +3,40 @@ package com.sfa.system.api;
 import com.sfa.common.core.constant.SecurityConstants;
 import com.sfa.common.core.constant.ServiceNameConstants;
 import com.sfa.common.core.domain.R;
+import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.system.api.domain.SysUser;
 import com.sfa.system.api.factory.RemoteUserFallbackFactory;
 import com.sfa.system.api.model.LoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 用户服务
  *
  * @author ruoyi
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService
-{
+public interface RemoteUserService {
     /**
      * 通过用户名查询用户信息
      *
      * @param username 用户名
-     * @param source 请求来源
+     * @param source   请求来源
      * @return 结果
      */
     @GetMapping("/system/user/info/{username}")
     public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/system/user/userInfoById")
-    public R<SysUser> getUserInfoById(@RequestParam("userId")Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    public R<SysUser> getUserInfoById(@RequestParam("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
      *
      * @param sysUser 用户信息
-     * @param source 请求来源
+     * @param source  请求来源
      * @return 结果
      */
     @PostMapping("/system/user/register")
@@ -44,9 +46,15 @@ public interface RemoteUserService
      * 记录用户登录IP地址和登录时间
      *
      * @param sysUser 用户信息
-     * @param source 请求来源
+     * @param source  请求来源
      * @return 结果
      */
     @PutMapping("/system/user/recordlogin")
     public R<Boolean> recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @PostMapping("/system/user/getUserInfoByIds")
+    public R<PageInfo<SysUser>> getUserInfoByIds(@RequestParam("pageSize") Integer pageSize,  // URL查询参数
+                                                 @RequestParam("pageNum") Integer pageNum,   // URL查询参数
+                                                 @RequestBody List<Long> userIds,
+                                                 @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

src/main/java/com/sfa/system/api/factory/RemoteUserFallbackFactory.java

 package com.sfa.system.api.factory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
 import com.sfa.common.core.domain.R;
+import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.system.api.RemoteUserService;
 import com.sfa.system.api.domain.SysUser;
 import com.sfa.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * 用户服务降级处理
@@ -48,6 +51,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             {
                 return R.fail("记录用户登录信息失败:" + throwable.getMessage());
             }
+            @Override
+            public R<PageInfo<SysUser>> getUserInfoByIds(Integer pageSize, Integer pageNum, List<Long> userIds , String source) {
+                return R.fail("根据用户ids获取用户信息失败:" + throwable.getMessage());
+            }
         };
     }
 }