no message

mall-server-api/src/main/java/com/gree/mall/manager/handler/DelayJobHandler.java

@@ -1,121 +0,0 @@
-//package com.gree.mall.manager.handler;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.gree.mall.manager.bean.container.DelayBucket;
-//import com.gree.mall.manager.bean.container.JobPool;
-//import com.gree.mall.manager.bean.container.ReadyQueue;
-//import com.gree.mall.manager.bean.delay.DelayJob;
-//import com.gree.mall.manager.bean.delay.Job;
-//import com.gree.mall.manager.constant.DelayConfig;
-//import com.gree.mall.manager.constant.JobStatus;
-//import lombok.AllArgsConstructor;
-//import lombok.Data;
-//import lombok.extern.slf4j.Slf4j;
-//
-///**
-// *
-// * @author change
-// *
-// **/
-//@Slf4j
-//@Data
-//@AllArgsConstructor
-//public class DelayJobHandler implements Runnable{
-//
-//    /**
-//     * 延迟队列
-//     */
-//    private DelayBucket delayBucket;
-//    /**
-//     * 任务池
-//     */
-//    private JobPool jobPool;
-//
-//    private ReadyQueue readyQueue;
-//    /**
-//     * 索引
-//     */
-//    private int index;
-//
-//    /**
-//     */
-//    @Override
-//    public void run() {
-//        log.info("定时任务开始执行");
-//        while (true) {
-//            try {
-//                DelayJob delayJob = delayBucket.getFirstDelayTime(index);
-//                //没有任务
-//                if (delayJob == null) {
-//                    sleep();
-//                    continue;
-//                }
-//                // 发现延时任务
-//                // 延迟时间没到
-//                if (delayJob.getDelayDate() > System.currentTimeMillis()) {
-//                    sleep();
-//                    continue;
-//                }
-//                Job job = jobPool.getJob(delayJob.getJodId());
-//
-//                //延迟任务元数据不存在
-//                if (job == null) {
-//                    log.info("移除不存在任务:{}", JSON.toJSONString(delayJob));
-//                    delayBucket.removeDelayTime(index,delayJob);
-//                    continue;
-//                }
-//
-//                JobStatus status = job.getStatus();
-//                if (JobStatus.RESERVED.equals(status)) {
-//                    log.info("处理超时任务:{}", JSON.toJSONString(job));
-//                    // 超时任务
-//                    processTtrJob(delayJob,job);
-//                } else {
-//                    log.info("处理延时任务:{}", JSON.toJSONString(job));
-//                    // 延时任务
-//                    processDelayJob(delayJob,job);
-//                }
-//            } catch (Exception e) {
-//                log.error("扫描DelayBucket出错：",e.getStackTrace());
-//                System.out.println(e.getMessage());
-//                sleep();
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 处理ttr的任务
-//     */
-//    private void processTtrJob(DelayJob delayJob,Job job) {
-//        job.setStatus(JobStatus.DELAY);
-//        // 修改任务池状态
-//        jobPool.addJob(job);
-//        // 移除delayBucket中的任务
-//        delayBucket.removeDelayTime(index,delayJob);
-//        Long delayDate = System.currentTimeMillis() + job.getDelayTime();
-//        delayJob.setDelayDate(delayDate);
-//        // 再次添加到任务中
-//        delayBucket.addDelayJob(delayJob);
-//    }
-//
-//    /**
-//     * 处理延时任务
-//     */
-//    private void processDelayJob(DelayJob delayJob,Job job) {
-//        job.setStatus(JobStatus.READY);
-//        // 修改任务池状态
-//        jobPool.addJob(job);
-//        // 设置到待处理任务
-//        readyQueue.pushJob(delayJob);
-//        // 移除delayBucket中的任务
-//        delayBucket.removeDelayTime(index,delayJob);
-//    }
-//
-//    private void sleep(){
-//        try {
-//            Thread.sleep(DelayConfig.SLEEP_TIME);
-//        } catch (InterruptedException e){
-//            log.error("",e);
-//        }
-//    }
-//}

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -73,7 +73,6 @@ public class OrderBaseEsLogic {
     private final SettlementOrderEsRepository settlementOrderEsRepository;
     private final OrderWorkerEsRepository orderWorkerEsRepository;
     private final PgOrderWorkerService pgOrderWorkerService;
-    private final CommonMapper commonMapper;
 
     public IPage<OrderBaseVO> orderBaseEsList(WorkOrderZfireParam zfireParamBean, HttpServletRequest request) {
 
@@ -82,21 +81,21 @@ public class OrderBaseEsLogic {
         String year = CommonUtils.getYear(request);
 
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
-        this.montage(queryBuilder1,zfireParamBean);
+        this.montage(queryBuilder1, zfireParamBean);
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
             queryBuilder1.must(
                     QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
-                    .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
-                    );
+                            .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+            );
         }
 
         List<String> orderBaseId = new ArrayList<>();
 
-        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()) {
             List<String> collect = workerOrderService.lambdaQuery()
                     .eq(WorkerOrder::getPayStatus, "WAIT")
-                    .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),WorkerOrder::getWebsitId,  adminUser.getAdminWebsitIds())
+                    .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), WorkerOrder::getWebsitId, adminUser.getAdminWebsitIds())
                     .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
                     .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
 
@@ -108,16 +107,15 @@ public class OrderBaseEsLogic {
 
         }
 
-        if (!CollectionUtils.isEmpty(orderBaseId)){
-            queryBuilder1.must(QueryBuilders.termsQuery("id",orderBaseId));
+        if (!CollectionUtils.isEmpty(orderBaseId)) {
+            queryBuilder1.must(QueryBuilders.termsQuery("id", orderBaseId));
         }
 
 
-
         NativeSearchQuery build = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder1)
                 .withSort(SortBuilders.fieldSort("create_time").order(SortOrder.DESC))
-                .withPageable(PageRequest.of(zfireParamBean.getPageNum() -1, zfireParamBean.getPageSize()))
+                .withPageable(PageRequest.of(zfireParamBean.getPageNum() - 1, zfireParamBean.getPageSize()))
                 .build();
 
         build.setTrackTotalHits(true);
@@ -126,52 +124,46 @@ public class OrderBaseEsLogic {
         IPage<OrderBaseVO> page = new Page<>();
 
 
-
         if (year.equals("2023")) {
             SearchHits<OrderBase2023Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2023Es.class);
             SearchPage<OrderBase2023Es> searchHits2023 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
 
             for (SearchHit<OrderBase2023Es> searchHit : searchHits2023.getContent()) {
-                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(),OrderBaseEs.class));
+                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(), OrderBaseEs.class));
             }
 
 
             page.setTotal(searchHits2023.getSearchHits().getTotalHits());
             page.setCurrent(zfireParamBean.getPageNum());
             page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }else
-
-        if (year.equals("2024")) {
+            page.setRecords(BeanUtil.copyToList(orderBaseEs, OrderBaseVO.class));
+        } else if (year.equals("2024")) {
             SearchHits<OrderBase2024Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2024Es.class);
             SearchPage<OrderBase2024Es> searchHits2024 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
 
             for (SearchHit<OrderBase2024Es> searchHit : searchHits2024.getContent()) {
-                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(),OrderBaseEs.class));
+                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(), OrderBaseEs.class));
             }
 
 
             page.setTotal(searchHits2024.getSearchHits().getTotalHits());
             page.setCurrent(zfireParamBean.getPageNum());
             page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }else
-
-
-        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
+            page.setRecords(BeanUtil.copyToList(orderBaseEs, OrderBaseVO.class));
+        } else if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
             SearchHits<OrderBase2022Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2022Es.class);
             SearchPage<OrderBase2022Es> searchHits2022 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
 
             for (SearchHit<OrderBase2022Es> searchHit : searchHits2022.getContent()) {
-                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(),OrderBaseEs.class));
+                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(), OrderBaseEs.class));
             }
 
 
             page.setTotal(searchHits2022.getSearchHits().getTotalHits());
             page.setCurrent(zfireParamBean.getPageNum());
             page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }else {
+            page.setRecords(BeanUtil.copyToList(orderBaseEs, OrderBaseVO.class));
+        } else {
             SearchHits<OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBaseEs.class);
             SearchPage<OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
 
@@ -181,7 +173,7 @@ public class OrderBaseEsLogic {
             page.setTotal(searchHits.getSearchHits().getTotalHits());
             page.setCurrent(zfireParamBean.getPageNum());
             page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
+            page.setRecords(BeanUtil.copyToList(orderBaseEs, OrderBaseVO.class));
         }
 
         //服务单标识
@@ -190,7 +182,7 @@ public class OrderBaseEsLogic {
                     .stream()
                     .map(OrderBaseVO::getId)
                     .collect(Collectors.toList());
-            Map<String, List<PgOrderFlag>> mapList = orderFlagLogic.list(orderBaseIds,year);
+            Map<String, List<PgOrderFlag>> mapList = orderFlagLogic.list(orderBaseIds, year);
 
             List<WorkerOrder> workerOrderList = workerOrderService.lambdaQuery().in(WorkerOrder::getWorkerOrderId, orderBaseIds)
                     .eq(WorkerOrder::getPayStatus, MaterialExamineStatusEnum.PAID.getKey())
@@ -211,7 +203,6 @@ public class OrderBaseEsLogic {
     }
 
 
-
     private void montage(BoolQueryBuilder queryBuilder, WorkOrderZfireParam workOrderZfireParam) {
 
         List<QueryParamBean> params = workOrderZfireParam.getParams();
@@ -225,9 +216,9 @@ public class OrderBaseEsLogic {
                 continue;
 
             String param = "";
-            if (paramBean.getParam().split("\\.").length > 1){
+            if (paramBean.getParam().split("\\.").length > 1) {
                 param = paramBean.getParam().split("\\.")[1];
-            }else {
+            } else {
                 param = paramBean.getParam();
             }
             if (paramBean.getValue() instanceof ArrayList) {
@@ -238,8 +229,7 @@ public class OrderBaseEsLogic {
                         join.add(s);
                     }
 
-                    queryBuilder.must(QueryBuilders.termsQuery(param,join));
-                    continue;
+                    queryBuilder.must(QueryBuilders.termsQuery(param, join));
                 }
             } else {
                 String value = "";
@@ -252,11 +242,11 @@ public class OrderBaseEsLogic {
                     continue;
 
                 if (param.equals("order_status") && value.equals("DYY")
-                ){
+                ) {
 
                     queryBuilder.mustNot(QueryBuilders.existsQuery("appointment_time"));
-                    queryBuilder.mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB","YZP",
-                                    "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"));
+                    queryBuilder.mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB", "YZP",
+                            "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"));
 
                     continue;
                 }
@@ -274,19 +264,19 @@ public class OrderBaseEsLogic {
                 }
 
                 if (param.equals("order_status")
-                        &&  value.equals("YCD")
-                ){
-                    queryBuilder.must(QueryBuilders.termQuery("is_exception",true));
+                        && value.equals("YCD")
+                ) {
+                    queryBuilder.must(QueryBuilders.termQuery("is_exception", true));
                     queryBuilder.mustNot(QueryBuilders.termsQuery("order_status", "YWG", "YWGO", "YJS"));
                     continue;
                 }
 
                 if (param.equals("order_status")
                         && value.equals("DJD")
-                ){
+                ) {
 
                     queryBuilder.must(QueryBuilders.boolQuery()
-                            .mustNot(QueryBuilders.termsQuery("order_status","YQX", "FWQX", "FL", "FWZT", "YCGB","YZP"))
+                            .mustNot(QueryBuilders.termsQuery("order_status", "YQX", "FWQX", "FL", "FWZT", "YCGB", "YZP"))
                             .must(QueryBuilders.boolQuery().should(QueryBuilders.termQuery("is_meet", false))
                                     .should(QueryBuilders.termsQuery("order_status", "DJD"))));
                     continue;
@@ -295,47 +285,45 @@ public class OrderBaseEsLogic {
 
                 if (param.equals("order_status")
                         && value.equals("PJSQZ")
-                ){
-                    queryBuilder.must(QueryBuilders.termQuery("parts_apply_status","ING"));
+                ) {
+                    queryBuilder.must(QueryBuilders.termQuery("parts_apply_status", "ING"));
                     continue;
                 }
 
                 if (param.equals("order_status")
                         && value.equals("PJYDH")
-                ){
-                    queryBuilder.must(QueryBuilders.termQuery("parts_apply_status","END"));
+                ) {
+                    queryBuilder.must(QueryBuilders.termQuery("parts_apply_status", "END"));
                     continue;
                 }
 
 
                 if (param.equals("order_status")
                         && value.equals("PJYQX")
-                ){
-                    queryBuilder.must(QueryBuilders.termQuery("parts_apply_status","CANCEL"));
+                ) {
+                    queryBuilder.must(QueryBuilders.termQuery("parts_apply_status", "CANCEL"));
                     continue;
                 }
 
                 if (StringUtils.equals(paramBean.getCompare(), "like")) {
-                    queryBuilder.must(QueryBuilders.wildcardQuery(param,"*"+value+"*"));
+                    queryBuilder.must(QueryBuilders.wildcardQuery(param, "*" + value + "*"));
                     continue;
                 }
 
                 if (value.equals("true") || value.equals("false")) {
 
-                    queryBuilder.must(QueryBuilders.termQuery(param,value.equals("true")?true:false));
-                    continue;
+                    queryBuilder.must(QueryBuilders.termQuery(param, value.equals("true")));
                 } else {
-                    if (paramBean.getCompare().equals(">=")){
+                    if (paramBean.getCompare().equals(">=")) {
 
                         queryBuilder.must(QueryBuilders.rangeQuery(param).gte(value));
                         continue;
                     }
-                    if (paramBean.getCompare().equals("<=")){
+                    if (paramBean.getCompare().equals("<=")) {
                         queryBuilder.must(QueryBuilders.rangeQuery(param).lte(value));
                         continue;
                     }
-                    queryBuilder.must(QueryBuilders.termQuery(param,value));
-                    continue;
+                    queryBuilder.must(QueryBuilders.termQuery(param, value));
                 }
             }
         }
@@ -343,10 +331,10 @@ public class OrderBaseEsLogic {
 
     }
 
-        public static String replaceValue(String value) {
-            return value.replaceAll("'", "").replaceAll("\"", "")
-                    .replaceAll(" or ", "").replaceAll(" union ", "");
-        }
+    public static String replaceValue(String value) {
+        return value.replaceAll("'", "").replaceAll("\"", "")
+                .replaceAll(" or ", "").replaceAll(" union ", "");
+    }
 
 
     public void test() {
@@ -413,7 +401,7 @@ public class OrderBaseEsLogic {
         }*/
     }
 
-    public List<Map<String, Object>> countStatus(String startTime, String endTime, String orderSmallType, String orderSmallTypeText,HttpServletRequest request) {
+    public List<Map<String, Object>> countStatus(String startTime, String endTime, String orderSmallType, String orderSmallTypeText, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         String year = CommonUtils.getYear(request);
@@ -428,14 +416,14 @@ public class OrderBaseEsLogic {
         }
 
         if (!StringUtil.isEmpty(orderSmallTypeText))
-            queryBuilder.must(QueryBuilders.termsQuery("order_small_type_text",orderSmallTypeText));
+            queryBuilder.must(QueryBuilders.termsQuery("order_small_type_text", orderSmallTypeText));
 
 
         if (startTime != null)
             queryBuilder.must(QueryBuilders.rangeQuery("create_time")
-                .gte(startTime)
-                .lte(endTime)
-        );
+                    .gte(startTime)
+                    .lte(endTime)
+            );
 
 
         //待预约
@@ -444,7 +432,7 @@ public class OrderBaseEsLogic {
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DYY", QueryBuilders.boolQuery()
                         .mustNot(QueryBuilders.existsQuery("appointment_time"))
-                        .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB","YZP",
+                        .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB", "YZP",
                                 "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"))
                         .must(QueryBuilders.rangeQuery("create_time")
                                 .gte(startTime)
@@ -452,7 +440,7 @@ public class OrderBaseEsLogic {
                         ))))
                 .build();
 
-        SearchHits response = this.search(searchQuery,year);
+        SearchHits response = this.search(searchQuery, year);
         HashMap<String, Object> dyy = new HashMap<>();
         dyy.put("total", this.getWorkerOrderCountResult(response.getAggregations(), "DYY"));
         dyy.put("orderStatus", "DYY");
@@ -463,14 +451,14 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DQD", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termQuery("order_status","DQD")))))
+                        .must(QueryBuilders.termQuery("order_status", "DQD")))))
                 .build();
 
-        SearchHits responsedqd = this.search(searchQueryDqd,year);
+        SearchHits responsedqd = this.search(searchQueryDqd, year);
 
         HashMap<String, Object> dqd = new HashMap<>();
-        dqd.put("total",this.getWorkerOrderCountResult(responsedqd.getAggregations(),"DQD"));
-        dqd.put("orderStatus","DQD");
+        dqd.put("total", this.getWorkerOrderCountResult(responsedqd.getAggregations(), "DQD"));
+        dqd.put("orderStatus", "DQD");
         maps.add(dqd);
 
 
@@ -479,14 +467,14 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DSHPG", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termsQuery("order_status","DSHPG","CJ","YPD","DXSPD","DZBPG","DWDSPGP","DXSSPGP",
-                                "DTJXSSPGP","DZBSPGP","DFZXPD","DFZXSPGP")))))
+                        .must(QueryBuilders.termsQuery("order_status", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP",
+                                "DTJXSSPGP", "DZBSPGP", "DFZXPD", "DFZXSPGP")))))
                 .build();
-        SearchHits responseDshpg =this.search(searchQueryDshpg,year);
+        SearchHits responseDshpg = this.search(searchQueryDshpg, year);
 
         HashMap<String, Object> dshpg = new HashMap<>();
-        dshpg.put("total",this.getWorkerOrderCountResult(responseDshpg.getAggregations(),"DSHPG"));
-        dshpg.put("orderStatus","DSHPG");
+        dshpg.put("total", this.getWorkerOrderCountResult(responseDshpg.getAggregations(), "DSHPG"));
+        dshpg.put("orderStatus", "DSHPG");
 
         maps.add(dshpg);
 
@@ -496,13 +484,13 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DWDPG", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termsQuery("order_status","DWDPG","DWDPD")))))
+                        .must(QueryBuilders.termsQuery("order_status", "DWDPG", "DWDPD")))))
                 .build();
-        SearchHits responseDwdpg = this.search(searchQueryDwdpg,year);
+        SearchHits responseDwdpg = this.search(searchQueryDwdpg, year);
 
         HashMap<String, Object> DWDPG = new HashMap<>();
-        DWDPG.put("total",this.getWorkerOrderCountResult(responseDwdpg.getAggregations(),"DWDPG"));
-        DWDPG.put("orderStatus","DWDPG");
+        DWDPG.put("total", this.getWorkerOrderCountResult(responseDwdpg.getAggregations(), "DWDPG"));
+        DWDPG.put("orderStatus", "DWDPG");
         maps.add(DWDPG);
 
 
@@ -511,16 +499,16 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DJD", QueryBuilders.boolQuery()
-                        .mustNot(QueryBuilders.termsQuery("order_status","YQX", "FWQX", "FL", "FWZT", "YCGB","YZP"))
+                        .mustNot(QueryBuilders.termsQuery("order_status", "YQX", "FWQX", "FL", "FWZT", "YCGB", "YZP"))
                         .must(QueryBuilders.boolQuery().should(QueryBuilders.termQuery("is_meet", false))
-                        .should(QueryBuilders.termsQuery("order_status", "DJD")))
-                        )))
+                                .should(QueryBuilders.termsQuery("order_status", "DJD")))
+                )))
                 .build();
-        SearchHits responseDJD = this.search(searchQueryDJD,year);
+        SearchHits responseDJD = this.search(searchQueryDJD, year);
 
         HashMap<String, Object> DJD = new HashMap<>();
-        DJD.put("total",this.getWorkerOrderCountResult(responseDJD.getAggregations(),"DJD"));
-        DJD.put("orderStatus","DJD");
+        DJD.put("total", this.getWorkerOrderCountResult(responseDJD.getAggregations(), "DJD"));
+        DJD.put("orderStatus", "DJD");
 
         maps.add(DJD);
 
@@ -529,14 +517,14 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("FWZ", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termsQuery("order_status","FWZ","GCSZT","BFWG",
-                                "DSM","WDBH", "XSBH","TJXSBH","ZBBH","FZXBH")))))
+                        .must(QueryBuilders.termsQuery("order_status", "FWZ", "GCSZT", "BFWG",
+                                "DSM", "WDBH", "XSBH", "TJXSBH", "ZBBH", "FZXBH")))))
                 .build();
-        SearchHits responseFWZ = this.search(searchQueryfwz,year);
+        SearchHits responseFWZ = this.search(searchQueryfwz, year);
 
         HashMap<String, Object> FWZ = new HashMap<>();
-        FWZ.put("total",this.getWorkerOrderCountResult(responseFWZ.getAggregations(),"FWZ"));
-        FWZ.put("orderStatus","FWZ");
+        FWZ.put("total", this.getWorkerOrderCountResult(responseFWZ.getAggregations(), "FWZ"));
+        FWZ.put("orderStatus", "FWZ");
 
         maps.add(FWZ);
 
@@ -546,14 +534,14 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("YCD", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termQuery("is_exception",true))
+                        .must(QueryBuilders.termQuery("is_exception", true))
                         .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "YWGO", "YJS")))))
                 .build();
-        SearchHits responseYCD = this.search(searchQueryYCD,year);
+        SearchHits responseYCD = this.search(searchQueryYCD, year);
 
         HashMap<String, Object> YCD = new HashMap<>();
-        YCD.put("total",this.getWorkerOrderCountResult(responseYCD.getAggregations(),"YCD"));
-        YCD.put("orderStatus","YCD");
+        YCD.put("total", this.getWorkerOrderCountResult(responseYCD.getAggregations(), "YCD"));
+        YCD.put("orderStatus", "YCD");
 
         maps.add(YCD);
 
@@ -562,29 +550,29 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("YWG", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termsQuery("order_status","YWG","GCSZX","WDWG","YWGO")))))
+                        .must(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO")))))
                 .build();
-        SearchHits responseYWG = this.search(searchQueryYWGDJS,year);
+        SearchHits responseYWG = this.search(searchQueryYWGDJS, year);
 
         HashMap<String, Object> YWG = new HashMap<>();
-        YWG.put("total",this.getWorkerOrderCountResult(responseYWG.getAggregations(),"YWG"));
-        YWG.put("orderStatus","YWG");
+        YWG.put("total", this.getWorkerOrderCountResult(responseYWG.getAggregations(), "YWG"));
+        YWG.put("orderStatus", "YWG");
 
         maps.add(YWG);
 
 
         //已结算
-        NativeSearchQuery searchQueryYJS= new NativeSearchQueryBuilder()
+        NativeSearchQuery searchQueryYJS = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("YJS", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termsQuery("order_status","YJS","LRCD")))))
+                        .must(QueryBuilders.termsQuery("order_status", "YJS", "LRCD")))))
                 .build();
-        SearchHits responseYJS = this.search(searchQueryYJS,year);
+        SearchHits responseYJS = this.search(searchQueryYJS, year);
 
         HashMap<String, Object> YJS = new HashMap<>();
-        YJS.put("total",this.getWorkerOrderCountResult(responseYJS.getAggregations(),"YJS"));
-        YJS.put("orderStatus","YJS");
+        YJS.put("total", this.getWorkerOrderCountResult(responseYJS.getAggregations(), "YJS"));
+        YJS.put("orderStatus", "YJS");
 
         maps.add(YJS);
 
@@ -593,13 +581,13 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("YQX", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termsQuery("order_status","YZP","YQX","FWZT","YCGB","FWQX","FL")))))
+                        .must(QueryBuilders.termsQuery("order_status", "YZP", "YQX", "FWZT", "YCGB", "FWQX", "FL")))))
                 .build();
-        SearchHits responseYQX = this.search(searchQueryYQX,year);
+        SearchHits responseYQX = this.search(searchQueryYQX, year);
 
         HashMap<String, Object> YQX = new HashMap<>();
-        YQX.put("total",this.getWorkerOrderCountResult(responseYQX.getAggregations(),"YQX"));
-        YQX.put("orderStatus","YQX");
+        YQX.put("total", this.getWorkerOrderCountResult(responseYQX.getAggregations(), "YQX"));
+        YQX.put("orderStatus", "YQX");
 
         maps.add(YQX);
 
@@ -609,13 +597,13 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("PJSQZ", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termQuery("parts_apply_status","ING")))))
+                        .must(QueryBuilders.termQuery("parts_apply_status", "ING")))))
                 .build();
-        SearchHits responsePJSQZ = this.search(searchQueryPJSQZ,year);
+        SearchHits responsePJSQZ = this.search(searchQueryPJSQZ, year);
 
         HashMap<String, Object> PJSQZ = new HashMap<>();
-        PJSQZ.put("total",this.getWorkerOrderCountResult(responsePJSQZ.getAggregations(),"PJSQZ"));
-        PJSQZ.put("orderStatus","PJSQZ");
+        PJSQZ.put("total", this.getWorkerOrderCountResult(responsePJSQZ.getAggregations(), "PJSQZ"));
+        PJSQZ.put("orderStatus", "PJSQZ");
 
         maps.add(PJSQZ);
 
@@ -625,13 +613,13 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("PJYDH", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termQuery("parts_apply_status","END")))))
+                        .must(QueryBuilders.termQuery("parts_apply_status", "END")))))
                 .build();
-        SearchHits responsePJYDH =  this.search(searchQueryPJYDH,year);
+        SearchHits responsePJYDH = this.search(searchQueryPJYDH, year);
 
         HashMap<String, Object> PJYDH = new HashMap<>();
-        PJYDH.put("total",this.getWorkerOrderCountResult(responsePJYDH.getAggregations(),"PJYDH"));
-        PJYDH.put("orderStatus","PJYDH");
+        PJYDH.put("total", this.getWorkerOrderCountResult(responsePJYDH.getAggregations(), "PJYDH"));
+        PJYDH.put("orderStatus", "PJYDH");
 
         maps.add(PJYDH);
 
@@ -641,13 +629,13 @@ public class OrderBaseEsLogic {
                 .withQuery(queryBuilder)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("PJYQX", QueryBuilders.boolQuery()
-                        .must(QueryBuilders.termQuery("parts_apply_status","CANCEL")))))
+                        .must(QueryBuilders.termQuery("parts_apply_status", "CANCEL")))))
                 .build();
-        SearchHits responsePJYQX = this.search(searchQueryPJYQX,year);
+        SearchHits responsePJYQX = this.search(searchQueryPJYQX, year);
 
         HashMap<String, Object> PJYQX = new HashMap<>();
-        PJYQX.put("total",this.getWorkerOrderCountResult(responsePJYQX.getAggregations(),"PJYQX"));
-        PJYQX.put("orderStatus","PJYQX");
+        PJYQX.put("total", this.getWorkerOrderCountResult(responsePJYQX.getAggregations(), "PJYQX"));
+        PJYQX.put("orderStatus", "PJYQX");
 
         maps.add(PJYQX);
 
@@ -656,7 +644,7 @@ public class OrderBaseEsLogic {
         HashMap<String, Object> DZF = new HashMap<>();
         List<String> collect = workerOrderService.lambdaQuery()
                 .eq(WorkerOrder::getPayStatus, "WAIT")
-                .between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime, startTime,endTime)
+                .between(!StringUtil.isEmpty(startTime), WorkerOrder::getCreateTime, startTime, endTime)
                 .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
                 .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(collect)) {
@@ -667,12 +655,12 @@ public class OrderBaseEsLogic {
                     .withQuery(queryBuilder)
                     .withPageable(PageRequest.of(1, 1))
                     .addAggregation(this.getAggs(AggregationBuilders.filter("DZF", QueryBuilders.boolQuery()
-                            .must(QueryBuilders.termsQuery("id",orderBaseId))
+                            .must(QueryBuilders.termsQuery("id", orderBaseId))
                     )))
                     .build();
-            SearchHits responseDZF = this.search(searchQueryDZF,year);
-            DZF.put("total",this.getWorkerOrderCountResult(responseDZF.getAggregations(),"DZF"));
-            DZF.put("orderStatus","DZF");
+            SearchHits responseDZF = this.search(searchQueryDZF, year);
+            DZF.put("total", this.getWorkerOrderCountResult(responseDZF.getAggregations(), "DZF"));
+            DZF.put("orderStatus", "DZF");
 
             maps.add(DZF);
 
@@ -720,9 +708,9 @@ public class OrderBaseEsLogic {
                         .gte(today8)
                         .lte(today1759))
                 .must(QueryBuilders.rangeQuery("create_time")  // create_time >= 半小时前（后移半小时内）
-                    .lte(nowMinus30))
+                        .lte(nowMinus30))
                 .mustNot(QueryBuilders.existsQuery("appointment_time"))
-                .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB","YZP",
+                .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB", "YZP",
                         "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"));
     }
 
@@ -746,16 +734,16 @@ public class OrderBaseEsLogic {
                 // 条件 3：appointment_time为空（保持不变）
                 .mustNot(QueryBuilders.existsQuery("appointment_time"))
                 // 条件 4：order_status排除（保持不变）
-                .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB","YZP",
+                .mustNot(QueryBuilders.termsQuery("order_status", "YWG", "GCSZX", "WDWG", "YWGO", "YQX", "FWZT", "YCGB", "YZP",
                         "FWQX", "FL", "YJS", "LRCD", "DSHPG", "CJ", "YPD", "DXSPD", "DZBPG", "DWDSPGP", "DXSSPGP", "DTJXSSPGP", "DZBSPGP"));
     }
 
 
-    private SearchHits search(NativeSearchQuery searchQuery,String year) {
+    private SearchHits search(NativeSearchQuery searchQuery, String year) {
 
         if (year.equals("2023")) {
             SearchHits response = elasticsearchRestTemplate.search(searchQuery, OrderBase2023Es.class);
-             return response;
+            return response;
         }
         if (year.equals("2024")) {
             SearchHits response = elasticsearchRestTemplate.search(searchQuery, OrderBase2024Es.class);
@@ -765,7 +753,7 @@ public class OrderBaseEsLogic {
         if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
             SearchHits response = elasticsearchRestTemplate.search(searchQuery, OrderBase2022Es.class);
             return response;
-        }else {
+        } else {
             SearchHits response = elasticsearchRestTemplate.search(searchQuery, OrderBaseEs.class);
             return response;
         }
@@ -776,6 +764,7 @@ public class OrderBaseEsLogic {
                 .subAggregation(AggregationBuilders.terms("order_type_group").field("order_type")
                         .subAggregation(AggregationBuilders.sum("mac_sum").field("total_num")));
     }
+
     private long getWorkerOrderCountResult(Aggregations aggregations, String name) {
 //        StringBuffer sb = new StringBuffer();
 //        ParsedFilter parsedFilter = aggregations.get(name);
@@ -791,7 +780,7 @@ public class OrderBaseEsLogic {
     public void esSync() {
 
         List<PgOrderBase> list = pgOrderBaseService.lambdaQuery()
-                .gt(PgOrderBase::getUpdateTime,DateUtil.offsetMinute(new Date(),-5))
+                .gt(PgOrderBase::getUpdateTime, DateUtil.offsetMinute(new Date(), -5))
                 .list();
 
         List<OrderBaseEsDate> orderBaseEsDates = BeanUtil.copyToList(list, OrderBaseEsDate.class);
@@ -801,7 +790,7 @@ public class OrderBaseEsLogic {
 
 
         List<PgOrderBase2022> list2022 = pgOrderBase2022Service.lambdaQuery()
-                .gt(PgOrderBase2022::getUpdateTime,DateUtil.offsetMinute(new Date(),-5))
+                .gt(PgOrderBase2022::getUpdateTime, DateUtil.offsetMinute(new Date(), -5))
                 .list();
 
         List<OrderBaseEs2022Date> orderBaseEsDates2022 = BeanUtil.copyToList(list2022, OrderBaseEs2022Date.class);
@@ -810,7 +799,7 @@ public class OrderBaseEsLogic {
 
 
         List<PgOrderBase2023> list2023 = pgOrderBase2023Service.lambdaQuery()
-                .gt(PgOrderBase2023::getUpdateTime,DateUtil.offsetMinute(new Date(),-5))
+                .gt(PgOrderBase2023::getUpdateTime, DateUtil.offsetMinute(new Date(), -5))
                 .list();
 
         List<OrderBaseEs2023Date> orderBaseEsDates2023 = BeanUtil.copyToList(list2023, OrderBaseEs2023Date.class);
@@ -818,7 +807,7 @@ public class OrderBaseEsLogic {
         orderBase2023EsRepository.saveAll(orderBaseEsDates2023);
 
         List<PgOrderBase2024> list2024 = pgOrderBase2024Service.lambdaQuery()
-                .gt(PgOrderBase2024::getUpdateTime,DateUtil.offsetMinute(new Date(),-5))
+                .gt(PgOrderBase2024::getUpdateTime, DateUtil.offsetMinute(new Date(), -5))
                 .list();
 
         List<OrderBaseEs2024Date> orderBaseEsDates2024 = BeanUtil.copyToList(list2024, OrderBaseEs2024Date.class);
@@ -843,7 +832,7 @@ public class OrderBaseEsLogic {
     public void esSync2() {
 
         List<PgOrderWorker> list = pgOrderWorkerService.lambdaQuery()
-                .gt(PgOrderWorker::getUpdateTime,DateUtil.offsetMinute(new Date(),-5))
+                .gt(PgOrderWorker::getUpdateTime, DateUtil.offsetMinute(new Date(), -5))
                 .list();
 
         List<PgOrderWorkerEs> pgOrderWorkerEs = BeanUtil.copyToList(list, PgOrderWorkerEs.class);
@@ -852,14 +841,14 @@ public class OrderBaseEsLogic {
         orderWorkerEsRepository.saveAll(pgOrderWorkerEs);
     }
 
-    public List<OrderBaseVO> listExport(WorkOrderZfireParam zfireParamBean,HttpServletRequest request) {
+    public List<OrderBaseVO> listExport(WorkOrderZfireParam zfireParamBean, HttpServletRequest request) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         String year = CommonUtils.getYear(request);
 
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
-        this.montage(queryBuilder1,zfireParamBean);
+        this.montage(queryBuilder1, zfireParamBean);
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
             queryBuilder1.must(
@@ -871,10 +860,10 @@ public class OrderBaseEsLogic {
 
         List<String> orderBaseId = new ArrayList<>();
 
-        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()) {
             List<String> collect = workerOrderService.lambdaQuery()
                     .eq(WorkerOrder::getPayStatus, "WAIT")
-                    .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),WorkerOrder::getWebsitId,  adminUser.getAdminWebsitIds())
+                    .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), WorkerOrder::getWebsitId, adminUser.getAdminWebsitIds())
                     .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
                     .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
 
@@ -886,20 +875,18 @@ public class OrderBaseEsLogic {
 
         }
 
-        if (!CollectionUtils.isEmpty(orderBaseId)){
-            queryBuilder1.must(QueryBuilders.termsQuery("id",orderBaseId));
+        if (!CollectionUtils.isEmpty(orderBaseId)) {
+            queryBuilder1.must(QueryBuilders.termsQuery("id", orderBaseId));
         }
 
 
-
-        NativeSearchQuery query  = new NativeSearchQueryBuilder()
+        NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder1)
                 .withSort(SortBuilders.fieldSort("create_time").order(SortOrder.DESC))
                 .withPageable(PageRequest.of(0, 3000))
                 .build();
 
 
-
         // 2. 初始化 Scroll
 
         List<OrderBaseVO> orderBaseVOS1 = new ArrayList<>();
@@ -918,7 +905,7 @@ public class OrderBaseEsLogic {
             int batch = 0;
 
             if (scrollHits.getTotalHits() > 60000)
-                throw  new RemoteServiceException("数据超过六万上限，请分批导出");
+                throw new RemoteServiceException("数据超过六万上限，请分批导出");
 
 
             try {
@@ -949,10 +936,8 @@ public class OrderBaseEsLogic {
                 }
             }
 
-            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS,OrderBaseVO.class);
-        }else
-
-        if (year.equals("2024")) {
+            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS, OrderBaseVO.class);
+        } else if (year.equals("2024")) {
 
             List<OrderBase2024Es> orderBaseVOS = new ArrayList<>();
             SearchScrollHits<OrderBase2024Es> scrollHits = elasticsearchRestTemplate.searchScrollStart(
@@ -966,7 +951,7 @@ public class OrderBaseEsLogic {
             int batch = 0;
 
             if (scrollHits.getTotalHits() > 60000)
-                throw  new RemoteServiceException("数据超过六万上限，请分批导出");
+                throw new RemoteServiceException("数据超过六万上限，请分批导出");
 
 
             try {
@@ -997,11 +982,8 @@ public class OrderBaseEsLogic {
                 }
             }
 
-            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS,OrderBaseVO.class);
-        }else
-
-
-        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
+            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS, OrderBaseVO.class);
+        } else if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
 
             List<OrderBase2022Es> orderBaseVOS = new ArrayList<>();
             SearchScrollHits<OrderBase2022Es> scrollHits = elasticsearchRestTemplate.searchScrollStart(
@@ -1015,7 +997,7 @@ public class OrderBaseEsLogic {
             int batch = 0;
 
             if (scrollHits.getTotalHits() > 60000)
-                throw  new RemoteServiceException("数据超过六万上限，请分批导出");
+                throw new RemoteServiceException("数据超过六万上限，请分批导出");
 
 
             try {
@@ -1046,8 +1028,8 @@ public class OrderBaseEsLogic {
                 }
             }
 
-            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS,OrderBaseVO.class);
-        }else {
+            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS, OrderBaseVO.class);
+        } else {
 
             List<OrderBaseEs> orderBaseVOS = new ArrayList<>();
             SearchScrollHits<OrderBaseEs> scrollHits = elasticsearchRestTemplate.searchScrollStart(
@@ -1061,7 +1043,7 @@ public class OrderBaseEsLogic {
             int batch = 0;
 
             if (scrollHits.getTotalHits() > 60000)
-                throw  new RemoteServiceException("数据超过六万上限，请分批导出");
+                throw new RemoteServiceException("数据超过六万上限，请分批导出");
 
 
             try {
@@ -1092,7 +1074,7 @@ public class OrderBaseEsLogic {
                 }
             }
 
-            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS,OrderBaseVO.class);
+            orderBaseVOS1 = BeanUtil.copyToList(orderBaseVOS, OrderBaseVO.class);
         }
 
         List<String> orderBaseIds = orderBaseVOS1