fix(jg):1，新增分页查证书的设备列表

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

@@ -6,12 +6,14 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import io.swagger.annotations.ApiParam;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 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.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -175,6 +177,29 @@ public class JgUseRegistrationManageController extends BaseController {
 		List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
 				.map(Long::parseLong)
 				.collect(Collectors.toList());
-		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect));
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect,null,null));
+	}
+
+	/**
+	 * 根据证的sequenceNbrs 批量查询证下面的所有设备
+	 * @param current 非必填，不填不分页，展示全部
+	 * @param size 非必填，不填不分页，展示全部
+	 * @param paramMap **仅仅支持** studio平台传参类似&certificateSeqs[0]=1809032149396975618&certificateSeqs[1]=1809032151141806081
+	 *                 如需其他需求使用上面的接口查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/queryEquByCertificateSeqs")
+	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 批量查询证下面的所有设备",  notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
+	public ResponseModel<List<JSONObject>> queryEquByCertificateSeqList( @RequestParam(value = "current",required = false) String current,
+																		 @RequestParam(value = "size",required = false) String size,
+																		 @RequestParam MultiValueMap<String, String> paramMap) {
+		List<Long> certificateSeqs = new ArrayList<>();
+		paramMap.forEach((key, value) -> {
+			if (key.startsWith("certificateSeqs[")) {
+				value.forEach(val -> certificateSeqs.add(Long.parseLong(val)));
+			}
+		});
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(certificateSeqs,current,size));
 	}
 }

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

@@ -32,6 +32,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -203,13 +204,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
      * 根据证的sequenceNbr，查询证下面的所有设备
      */
     public List<JSONObject> queryEquByCertificateSeq(Long sequenceNbr) {
-        return queryEquByCertificateSeqList(Collections.singletonList(sequenceNbr));
+        return queryEquByCertificateSeqList(Collections.singletonList(sequenceNbr),null,null);
     }
 
     /**
      * 根据证的sequenceNbr集合，批量查询证下面的所有设备
      */
-    public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
+    public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList,String current,String size) {
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
                 .eq(JgUseRegistrationManage::getIsDelete, 0));
@@ -228,8 +229,17 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         TermsQueryBuilder termsQuery = QueryBuilders.termsQuery("USE_ORG_CODE", useOrgCodes);
         boolQuery.must(termsQuery);
         builder.query(boolQuery);
+        // 支持分页
+        if (!StringUtils.isEmpty(current) && !StringUtils.isEmpty(size)) {
+            try {
+                builder.from((Integer.parseInt(current) - 1) * Integer.parseInt(size));
+                builder.size(Integer.parseInt(size));
+            }catch (Exception e){
+                log.error("分页参数转化失败");
+                e.printStackTrace();
+            }
+        }
         request.source(builder);
-
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
             for (SearchHit hit : response.getHits().getHits()) {