分支合并

fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java

@@ -1,8 +1,17 @@
 package cn.com.taiji.controller;
 
+import cn.com.taiji.domain.FusionQuery;
+import cn.com.taiji.service.FusionAnalysisService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.ParseException;
+
 /**
  * @author xhl
  * @date 2023/2/6
@@ -86,81 +95,6 @@ public class FusionAnalysisController {
         fusionAnalysisService.tianaoStaticOrDynamicLeaveOutExcel(query,response);
     }
 
-    @Resource
-    private FusionAnalysisService fusionAnalysisService;
-
-    /**
-     * 轨迹融合-航速航向异常波动-识别融合数据率波动问题
-     * @param query
-     * @param response
-     * @throws IOException
-     * @throws ParseException
-     */
-    @PostMapping("excel/one")
-    public void fusionAnalysisExcelOne(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
-        fusionAnalysisService.fusionAnalysisExcelOne(query,response);
-    }
-
-    /**
-     * 虚假外推数据-虚假推送问题
-     * @param query
-     * @param response
-     * @throws IOException
-     * @throws ParseException
-     */
-    @PostMapping("excel/two")
-    public void fusionAnalysisExcelTwo(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
-        fusionAnalysisService.fusionAnalysisExcelTwo(query,response);
-    }
-
-    /**
-     * 遗漏融合-天奥轨迹数据遗漏
-     * @param query
-     * @param response
-     * @throws IOException
-     * @throws ParseException
-     */
-    @PostMapping("/tianao/excel")
-    public void tianAoLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
-        fusionAnalysisService.tianAoLeaveOutExcel(query,response);
-    }
-
-    /**
-     * 遗漏融合-北斗轨迹数据遗漏
-     * @param query
-     * @param response
-     * @throws IOException
-     * @throws ParseException
-     */
-    @PostMapping("/beidou/excel")
-    public void beiDouLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
-        fusionAnalysisService.beiDouLeaveOutExcel(query,response);
-    }
-
-    /**
-     * 遗漏融合-海兰信1级融合轨迹数据遗漏
-     * @param query
-     * @param response
-     * @throws IOException
-     * @throws ParseException
-     */
-    @PostMapping("/hlxyjrh/excel")
-    public void hlxyjrhLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
-        fusionAnalysisService.hlxyjrhLeaveOutExcel(query,response);
-    }
-
-    /**
-     * 错误融合-天奥静态数据与动态轨迹融合
-     * @param query
-     * @param response
-     * @throws IOException
-     * @throws ParseException
-     */
-    @PostMapping("/tianao/static/excel")
-    public void tianaoStaticOrDynamicLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
-        fusionAnalysisService.tianaoStaticOrDynamicLeaveOutExcel(query,response);
-    }
-
     /**
      * 轨迹融合-航速航向异常波动-识别融合速度异常波动问题
      * @param query

fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java

@@ -65,4 +65,20 @@ public interface FusionAnalysisService {
      * @throws ParseException
      */
     void tianaoStaticOrDynamicLeaveOutExcel(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelThree(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    abstract void fusionAnalysisExcelFour(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelOriginalOne(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelOriginalTwo(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelOriginalThree(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelOriginalFour(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelOriginalFive(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    void fusionAnalysisExcelOriginalSix(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
 }

fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java

@@ -4,19 +4,15 @@ import cn.com.taiji.domain.*;
 import cn.com.taiji.domain.dto.LeaceOutDto;
 import cn.com.taiji.service.FusionAnalysisService;
 import cn.com.taiji.utils.DateUtils;
-import cn.hutool.core.io.LineHandler;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.config.RequestConfig;
-import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.HttpAsyncResponseConsumerFactory;
 import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.core.TimeValue;
@@ -24,13 +20,6 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedDoubleTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ParsedTopHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
@@ -40,7 +29,6 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.*;