add search total count

elastic-publish-service/req/main-controller.http

@@ -21,7 +21,7 @@ Content-Type: application/json
 
 {
   "agencyPath": "/1",
-  "keyword": "",
+  "keyword": "教学楼四教",
   "page": 1,
   "size": 10,
   "regulatoryLevelId": "",

elastic-publish-service/src/main/java/com/vcarecity/publish/api/ApiResult.java

@@ -14,4 +14,5 @@ public class ApiResult {
     private String message;
     private int errorCode;
     private Object data;
+    private Long total;
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/controller/MainController.java

@@ -5,6 +5,7 @@ import com.vcarecity.publish.api.ApiResult;
 import com.vcarecity.publish.api.ApiStatus;
 import com.vcarecity.publish.constants.ElasticConstant;
 import com.vcarecity.publish.elastic.service.ElasticLoadDataService;
+import com.vcarecity.publish.pojo.dto.TotalResultDTO;
 import com.vcarecity.publish.pojo.dto.UnitAgencyDTO;
 import com.vcarecity.publish.pojo.dto.UnitIdDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
@@ -73,15 +74,23 @@ public class MainController implements PrepareController {
     @PostMapping("/query-unit-agency")
     public ApiResult queryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {
 
-        List<UnitIdDTO> data = unitService.getUnitAgencyByQuery(unitAgencyQuery, UnitIdDTO.class, ElasticConstant.UNIT_AGENCY_INDEX);
+        TotalResultDTO<List<UnitIdDTO>> totalResult = unitService.getUnitAgencyByQuery(unitAgencyQuery, UnitIdDTO.class, ElasticConstant.UNIT_AGENCY_INDEX);
 
-        return ApiResult.builder().status(ApiStatus.SUCCESS_CODE).data(data).build();
+        return ApiResult.builder()
+                .status(ApiStatus.SUCCESS_CODE)
+                .data(totalResult.getData())
+                .total(totalResult.getTotal())
+                .build();
     }
 
     @PostMapping("/test/query-unit-agency")
     public ApiResult testQueryUnitAgency(@RequestBody @Valid UnitAgencyQuery unitAgencyQuery) throws IOException {
-        List<UnitAgencyDTO> data = unitService.getUnitAgencyByQuery(unitAgencyQuery, UnitAgencyDTO.class, ElasticConstant.UNIT_AGENCY_INDEX);
-        return ApiResult.builder().status(ApiStatus.SUCCESS_CODE).data(data).build();
+        TotalResultDTO<List<UnitAgencyDTO>> totalResult = unitService.getUnitAgencyByQuery(unitAgencyQuery, UnitAgencyDTO.class, ElasticConstant.UNIT_AGENCY_INDEX);
+        return ApiResult.builder()
+                .status(ApiStatus.SUCCESS_CODE)
+                .data(totalResult.getData())
+                .total(totalResult.getTotal())
+                .build();
     }
 
 

elastic-publish-service/src/main/java/com/vcarecity/publish/pojo/dto/TotalResultDTO.java

@@ -0,0 +1,17 @@
+package com.vcarecity.publish.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author VcKerry on 12/23/19
+ */
+
+@NoArgsConstructor
+@Data
+@AllArgsConstructor
+public class TotalResultDTO<T> {
+    private T data;
+    private Long total;
+}

elastic-publish-service/src/main/java/com/vcarecity/publish/sql/service/UnitService.java

@@ -1,5 +1,6 @@
 package com.vcarecity.publish.sql.service;
 
+import com.vcarecity.publish.pojo.dto.TotalResultDTO;
 import com.vcarecity.publish.pojo.dto.UnitIdDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
 
@@ -21,6 +22,6 @@ public interface UnitService {
      * @return
      * @throws IOException
      */
-    <T extends UnitIdDTO> List<T> getUnitAgencyByQuery(UnitAgencyQuery queryParam, Class<T> cls, String... indices) throws IOException;
+    <T extends UnitIdDTO> TotalResultDTO<List<T>> getUnitAgencyByQuery(UnitAgencyQuery queryParam, Class<T> cls, String... indices) throws IOException;
 
 }

elastic-publish-service/src/main/java/com/vcarecity/publish/sql/service/impl/UnitServiceImpl.java

@@ -2,6 +2,7 @@ package com.vcarecity.publish.sql.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.vcarecity.elastic.util.AgencyPathUtil;
+import com.vcarecity.publish.pojo.dto.TotalResultDTO;
 import com.vcarecity.publish.pojo.dto.UnitIdDTO;
 import com.vcarecity.publish.pojo.query.UnitAgencyQuery;
 import com.vcarecity.publish.sql.service.UnitService;
@@ -60,12 +61,12 @@ public class UnitServiceImpl implements UnitService {
     }
 
     @Override
-    public <T extends UnitIdDTO> List<T> getUnitAgencyByQuery(UnitAgencyQuery queryParam, Class<T> cls, String... indices) throws IOException {
+    public <T extends UnitIdDTO> TotalResultDTO<List<T>> getUnitAgencyByQuery(UnitAgencyQuery queryParam, Class<T> cls, String... indices) throws IOException {
 
 
         List<Integer> agencyIdList = AgencyPathUtil.splitAgencyId(queryParam.getAgencyPath());
         if (agencyIdList.isEmpty()) {
-            return Collections.emptyList();
+            return new TotalResultDTO<>(Collections.emptyList(), 0L);
         }
 
         String[] queryFields = ObjectFieldToMap.getField(cls);
@@ -107,13 +108,16 @@ public class UnitServiceImpl implements UnitService {
 
         final SearchHits hits = searchResponse.getHits();
 
+        long total = hits.getTotalHits().value;
 
         List<T> res = new ArrayList<>(hits.getHits().length);
+
+
         for (SearchHit hit : hits.getHits()) {
             T t = objectMapper.readValue(hit.getSourceAsString(), cls);
             res.add(t);
         }
-        return res;
+        return new TotalResultDTO<>(res, total);
     }
 
     /**