fix(jg):证集合查询下面设备的接口调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -11,8 +11,11 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -162,13 +165,16 @@ public class JgUseRegistrationManageController extends BaseController {
 
 	/**
 	 * 根据证的sequenceNbr 批量查询证下面的所有设备
-	 * @param sequenceNbr  证的sequenceNbr集合
+	 * @param sequenceNbrs  证的sequenceNbr集合
 	 * @return 证下的所有设备
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/queryEquByCertificateSeqList")
-	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 查询证下面的所有设备",  notes = "根据证的sequenceNbr 查询证下面的所有设备")
-	public ResponseModel<List<JSONObject>> queryEquByCertificateSeqList(List<Long> sequenceNbr) {
-		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(sequenceNbr));
+	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 批量查询证下面的所有设备",  notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
+	public ResponseModel<List<JSONObject>> queryEquByCertificateSeqList(@RequestParam String sequenceNbrs) {
+		List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
+				.map(Long::parseLong)
+				.collect(Collectors.toList());
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect));
 	}
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java

@@ -28,6 +28,7 @@ import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 服务实现类
@@ -293,26 +295,26 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
      * 根据证的sequenceNbr集合，批量查询证下面的所有设备
      */
     public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
-        JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
+        List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
                 .eq(JgUseRegistrationManage::getIsDelete, 0));
-        if (ValidationUtil.isEmpty(jgUseRegistrationManage) || ValidationUtil.isEmpty(jgUseRegistrationManage.getApplyNo())){
+        if (ValidationUtil.isEmpty(jgUseRegistrationManageList)){
             return new ArrayList<>();
         }
-        JgUseRegistration useRegistration = jgUseRegistrationMapper.selectOne(new LambdaQueryWrapper<JgUseRegistration>()
-                .eq(JgUseRegistration::getApplyNo, jgUseRegistrationManage.getApplyNo()));
+        List<JSONObject> result = new ArrayList<>();
+        Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.toSet());
+
         // es中通过查询【使用登记证编号】所有设备
-        SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
+        SearchRequest request = new SearchRequest("idx_biz_view_jg_all");
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
-        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
-        builder.query(boolMust);
-        BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-        pBuilder.must(QueryBuilders.termQuery("USE_ORG_CODE", useRegistration.getUseRegistrationCode()));
-        boolMust.must(pBuilder);
+
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        TermsQueryBuilder termsQuery = QueryBuilders.termsQuery("USE_ORG_CODE", useOrgCodes);
+        boolQuery.must(termsQuery);
+        builder.query(boolQuery);
         request.source(builder);
-        List<JSONObject> result = new ArrayList<>();
+
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
             for (SearchHit hit : response.getHits().getHits()) {