任务提交 订单查询接口完成

modules/admin/src/main/java/com/fire/admin/AdminApplication.java

@@ -1,5 +1,6 @@
 package com.fire.admin;
 
+import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,6 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @MapperScan({"com.fire.admin.modules.mapper"})
 @EnableTransactionManagement(proxyTargetClass = true)
 @ComponentScans(value = {@ComponentScan("com.fire.dto.system"),@ComponentScan("com.fire.admin.*")})
+@EnableSwagger2Doc
 public class AdminApplication {
 
     public static void main(String[] args) {

modules/admin/src/main/java/com/fire/admin/rest/OrderRest.java

@@ -2,6 +2,7 @@ package com.fire.admin.rest;
 
 import com.fire.admin.request.OrderSearchPram;
 import com.fire.admin.service.OrderManagementService;
+import com.fire.dto.response.BaseRestResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 
 @Api(tags = "订单管理")
 @RestController
@@ -28,9 +32,8 @@ public class OrderRest {
      */
     @PostMapping("/search")
     @ApiOperation(value = "订单查询", notes = "order_search.py")
-    public String orderSearch(@RequestBody OrderSearchPram orderSearchPram) {
-
-        return orderManagementService.orderSearch(orderSearchPram);
+    public BaseRestResponse<Map<String,Object>> orderSearch(@RequestBody OrderSearchPram orderSearchPram) {
+        return new BaseRestResponse<>(orderManagementService.orderSearch(orderSearchPram));
     }
 
 

modules/admin/src/main/java/com/fire/admin/service/OrderManagementService.java

@@ -18,8 +18,7 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -27,16 +26,17 @@ public class OrderManagementService {
     @Autowired
     private ElasticsearchRestTemplate restTemplate;
 
-    public String orderSearch(OrderSearchPram orderSearchPram) {
+    public Map<String,Object> orderSearch(OrderSearchPram orderSearchPram) {
         //以创建时间倒序排列
+        HashMap<String, Object> pageMap = new HashMap<>();
+        ArrayList<OrderEsDto> resultsList = new ArrayList<OrderEsDto>();
         Sort sort = Sort.by(Sort.Direction.DESC, "applyDate");
         Date applyDateStart = orderSearchPram.getApplyDateStart();
         Date applyDateEnd = orderSearchPram.getApplyDateEnd();
-
         int page = 0;
         int size = 10;
         if (null != orderSearchPram.getPage()) {
-            page = orderSearchPram.getPage();
+            page = orderSearchPram.getPage() - 1;
         }
         if (null != orderSearchPram.getSize()) {
             size = orderSearchPram.getSize();
@@ -66,11 +66,15 @@ public class OrderManagementService {
         }
         //电话号码
         if (Strings.isNotBlank(orderSearchPram.getUsedMobile())) {
-            boolQuery.must(QueryBuilders.termQuery("usedMobile", orderSearchPram.getUsedMobile()));
-        }
-        //电话号码
-        if (Strings.isNotBlank(orderSearchPram.getUsedMobile())) {
-            boolQuery.must(QueryBuilders.termQuery("usedMobile", orderSearchPram.getUsedMobile()));
+            String usedMobiles = orderSearchPram.getUsedMobile();
+            if (usedMobiles.indexOf(",") >= 0){
+                String[] usedMobileList = usedMobiles.split(",");
+                for (String usedMobile : usedMobileList) {
+                    boolQuery.should(QueryBuilders.termQuery("usedMobile", usedMobile));
+                }
+            }else{
+                boolQuery.must(QueryBuilders.termQuery("usedMobile", usedMobiles));
+            }
         }
         //客户名称 暂时用的ID
         if (Strings.isNotBlank(orderSearchPram.getEnterpriseIdDesc())) {
@@ -95,7 +99,7 @@ public class OrderManagementService {
         //归属地
         if (Strings.isNotBlank(orderSearchPram.getMobileHome())) {
             BoolQueryBuilder tempQueryBuilder = QueryBuilders.boolQuery();
-            tempQueryBuilder.should(QueryBuilders.wildcardQuery("mobileHome.keyword", orderSearchPram.getMobileHome()));
+            tempQueryBuilder.should(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
             boolQuery.must(tempQueryBuilder);
         }
 
@@ -110,10 +114,16 @@ public class OrderManagementService {
         System.out.println("一共" + total + "个");
         System.out.println("搜索结果" + searchHits.size() + "个");
         for (SearchHit<OrderEsDto> searchHit : searchHits) {
-            OrderEsDto stuEntity = searchHit.getContent();
-            log.info(stuEntity.toString());
+            OrderEsDto orderEsDto = searchHit.getContent();
+            resultsList.add(orderEsDto);
+//            log.info(stuEntity.toString());
         }
-        return "success";
+        pageMap.put("records",resultsList);
+        pageMap.put("size",size);
+        pageMap.put("current",page + 1);
+        pageMap.put("total",total);
+        pageMap.put("pages",total%size == 0 ? (int)total/size:(int)total/size + 1);
+        return pageMap;
     }
 }
 

modules/admin/src/main/resources/bootstrap.yml

@@ -4,6 +4,9 @@ server:
 spring:
   application:
     name: admin
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   cloud:
     nacos:
       config: