fix:入场人查询详情支持同时查询多个;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java

@@ -42,7 +42,9 @@ public interface IAdamRdmService {
 
     List<AdamEntersVo> getEntersVoByUid(String uid);
 
-    AdamEntersVo getEntersVoByUidEntersId(String uid, String... entersIds);
+    AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId);
+
+    List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds);
 
     void delEntersVoByUid(String uid);
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -3,10 +3,8 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
-import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.service.IAdamEntersService;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
@@ -15,15 +13,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -108,9 +104,9 @@ public class AdamEntersController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "入场人详情")
     @PostMapping("query")
-    public ResponseDto<AdamEntersVo> query(@NotBlank @RequestParam String entersIds) {
-        AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(CurrentUtil.getCurrentUid(), entersIds.split(","));
-        return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
+    public ResponseDto<List<AdamEntersVo>> query(@NotBlank @RequestParam String entersIds) {
+        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUidEntersIds(CurrentUtil.getCurrentUid(), entersIds.split(","));
+        return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
     }
 
     @ApiOperationSupport(order = 7)

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -155,9 +156,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public AdamEntersVo getEntersVoByUidEntersId(String uid, String... entersIds) {
+    public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
+        return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
+    }
+
+    @Override
+    public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds) {
         List<String> entersIdList = Arrays.asList(entersIds);
-        return this.getEntersVoByUid(uid).stream().filter(r -> entersIdList.contains(r.getEntersId())).findAny().orElse(null);
+        return this.getEntersVoByUid(uid).stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
     }
 
     @Override