浏览代码

批量查用户信息

gaodm 6 年之前
父节点
当前提交
d4ecd6aab0

+ 2 - 2
icssman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -2,12 +2,12 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserNameDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,7 +19,7 @@ import java.util.List;
 public interface UserServiceClient {
 
     @PostMapping(value = "/user/getUserInfoByIds")
-    RespDTO<List<UserNameDTO>> getUserInfoByIds(@RequestBody List<String> ids);
+    RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids);
 }
 
 

+ 2 - 2
icssman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -2,12 +2,12 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserNameDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -20,7 +20,7 @@ import java.util.List;
 public class UserServiceHystrix implements UserServiceClient {
 
 	@Override
-    public RespDTO<List<UserNameDTO>> getUserInfoByIds(@RequestBody List<String> ids){
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids){
         log.error("【hystrix】调用{}异常", "getUserInfoByIds");
         return null;
     }

+ 0 - 16
icssman-service/src/main/java/com/diagbot/dto/UserNameDTO.java

@@ -1,16 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/12/10 15:15
- */
-@Getter
-@Setter
-public class UserNameDTO {
-    private Long id;//用户ID
-    private String username;// 用户名
-}

+ 0 - 16
user-service/src/main/java/com/diagbot/dto/UserNameDTO.java

@@ -1,16 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/12/10 15:15
- */
-@Getter
-@Setter
-public class UserNameDTO {
-    private Long id;//用户ID
-    private String username;// 用户名
-}

+ 8 - 5
user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -21,7 +21,6 @@ import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserLoginDTO;
-import com.diagbot.dto.UserNameDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.JWT;
@@ -44,7 +43,6 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.idc.VisibleIdCreater;
-import com.diagbot.service.TokenService;
 import com.diagbot.service.impl.UserServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -1440,7 +1438,7 @@ public class UserFacade extends UserServiceImpl {
      * @param ids 用户ID列表
      * @return 用户名信息列表
      */
-    public List<UserNameDTO> getUserInfoByIds(List<String> ids) {
+    public Map<String, String> getUserInfoByIds(List<String> ids) {
         List<Long> longList = new ArrayList<>();
         for (String id : ids){
             if(!longList.contains(id)){
@@ -1448,7 +1446,12 @@ public class UserFacade extends UserServiceImpl {
             }
         }
         List<User> userList = this.getByIds(longList);
-        List<UserNameDTO> res = BeanUtil.listCopyTo(userList, UserNameDTO.class);
-        return res;
+        Map<String, String> map = new HashMap<>();
+        if (ListUtil.isNotEmpty(userList)){
+            for (User user: userList){
+                map.put(user.getId().toString(), user.getUsername());
+            }
+        }
+        return map;
     }
 }

+ 2 - 3
user-service/src/main/java/com/diagbot/web/UserController.java

@@ -7,7 +7,6 @@ import com.diagbot.dto.JwtDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserLoginDTO;
-import com.diagbot.dto.UserNameDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.Permission;
 import com.diagbot.entity.Token;
@@ -352,8 +351,8 @@ public class UserController {
     @ApiOperation(value = "根据用户ID列表获取用户数据(远程调用)[by:gaodm]", notes = "根据用户ID列表获取用户数据")
     @PostMapping("/getUserInfoByIds")
     @SysLogger("getUserInfoByIds")
-    @ApiIgnore
-    public RespDTO<List<UserNameDTO>> getUserInfoByIds(@RequestBody List<String> ids){
+//    @ApiIgnore
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids){
         return RespDTO.onSuc(userFacade.getUserInfoByIds(ids));
     }
 }