[update]修改pom文件

.idea/compiler.xml

@@ -9,7 +9,10 @@
         <outputRelativeToContentRoot value="true" />
         <module name="tianao-analysis" />
         <module name="es-track-common" />
+        <module name="hlx-one-fusion-analysis" />
+        <module name="beidou-analysis" />
         <module name="fusion-analysis" />
+        <module name="simulation-track" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="8" />

.idea/workspace.xml

@@ -5,24 +5,18 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[update]修改pom文件">
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/config/EsClientConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/constants/EsIndexConstants.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/LeaveOutData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/StaticOrDynamicData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/dto/LeaceOutDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/es-track-common/target/classes/cn/com/taiji/EsTrackAnAlySisApplication.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/es-track-common/target/classes/cn/com/taiji/config/EsClientConfiguration.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FusionData.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FusionData.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FusionQuery.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FusionQuery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/LeaveOutData.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/LeaveOutData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/StaticOrDynamicData.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/StaticOrDynamicData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/dto/LeaceOutDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/dto/LeaceOutDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tianao-analysis/target/classes/application.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/tianao-analysis/target/classes/cn/com/taiji/TianaoAnalySisApplication.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tianao-analysis/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/tianao-analysis/target/classes/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -39,7 +33,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="xiahailong" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -71,6 +65,10 @@
     <option name="showVisibilityIcons" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RequestMappingsPanelOrder0" value="0" />
+    <property name="RequestMappingsPanelOrder1" value="1" />
+    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
@@ -83,7 +81,7 @@
     <property name="project.structure.last.edited" value="项目" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2904762" />
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RebelAgentSelection">
     <selection>jr</selection>
@@ -99,6 +97,13 @@
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.FusionAnalysisApplication">
+    <configuration name="BeidouAnalySisApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="beidou-analysis" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.taiji.BeidouAnalySisApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="EsTrackAnAlySisApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
       <module name="es-track-common" />
       <extension name="coverage">
@@ -119,11 +124,33 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="HlxOneLevelApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="hlx-one-fusion-analysis" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.taiji.HlxOneLevelApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="SimulationTrackApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="simulation-track" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.taiji.SimulationTrackApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="TianaoAnalySisApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="tianao-analysis" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.taiji.TianaoAnalySisApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
         <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
         <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
+        <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
       </list>
     </recent_temporary>
   </component>

fusion-analysis/pom.xml

@@ -24,6 +24,12 @@
             <version>2.7.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.com.taiji</groupId>
+            <artifactId>es-track-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <!-- es -->
         <dependency>
             <groupId>org.elasticsearch</groupId>

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

@@ -3,6 +3,7 @@ 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;
 
@@ -30,7 +31,7 @@ public class FusionAnalysisController {
      * @throws ParseException
      */
     @PostMapping("excel/one")
-    public void fusionAnalysisExcelOne(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+    public void fusionAnalysisExcelOne(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.fusionAnalysisExcelOne(query,response);
     }
 
@@ -42,7 +43,7 @@ public class FusionAnalysisController {
      * @throws ParseException
      */
     @PostMapping("excel/two")
-    public void fusionAnalysisExcelTwo(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+    public void fusionAnalysisExcelTwo(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.fusionAnalysisExcelTwo(query,response);
     }
 
@@ -54,7 +55,7 @@ public class FusionAnalysisController {
      * @throws ParseException
      */
     @PostMapping("/tianao/excel")
-    public void tianAoLeaveOutExcel(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+    public void tianAoLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.tianAoLeaveOutExcel(query,response);
     }
 
@@ -66,7 +67,7 @@ public class FusionAnalysisController {
      * @throws ParseException
      */
     @PostMapping("/beidou/excel")
-    public void beiDouLeaveOutExcel(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+    public void beiDouLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.beiDouLeaveOutExcel(query,response);
     }
 
@@ -78,7 +79,7 @@ public class FusionAnalysisController {
      * @throws ParseException
      */
     @PostMapping("/hlxyjrh/excel")
-    public void hlxyjrhLeaveOutExcel(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+    public void hlxyjrhLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.hlxyjrhLeaveOutExcel(query,response);
     }
 
@@ -90,7 +91,7 @@ public class FusionAnalysisController {
      * @throws ParseException
      */
     @PostMapping("/tianao/static/excel")
-    public void tianaoStaticOrDynamicLeaveOutExcel(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+    public void tianaoStaticOrDynamicLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.tianaoStaticOrDynamicLeaveOutExcel(query,response);
     }
 }

fusion-analysis/src/main/java/cn/com/taiji/domain/FusionData.java

@@ -7,7 +7,6 @@ import lombok.Data;
  * @author xhl
  * @date 2023/2/6
  */
-@Data
 public class FusionData {
 
     /**
@@ -39,4 +38,44 @@ public class FusionData {
      */
     @ExcelProperty(index = 4,value = "波动次数")
     private Integer fluctuateNumber;
+
+    public String getMergeTarget() {
+        return mergeTarget;
+    }
+
+    public void setMergeTarget(String mergeTarget) {
+        this.mergeTarget = mergeTarget;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Long getTrackCount() {
+        return trackCount;
+    }
+
+    public void setTrackCount(Long trackCount) {
+        this.trackCount = trackCount;
+    }
+
+    public Integer getFluctuateNumber() {
+        return fluctuateNumber;
+    }
+
+    public void setFluctuateNumber(Integer fluctuateNumber) {
+        this.fluctuateNumber = fluctuateNumber;
+    }
 }

fusion-analysis/src/main/java/cn/com/taiji/domain/FusionQuery.java

@@ -6,11 +6,25 @@ import lombok.Data;
  * @author xhl
  * @date 2023/2/6
  */
-@Data
 public class FusionQuery {
 
     private String startTime;
 
     private String endTime;
 
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

fusion-analysis/src/main/java/cn/com/taiji/domain/LeaveOutData.java

@@ -7,7 +7,7 @@ import lombok.Data;
  * @author xhl
  * @date 2023/2/7
  */
-@Data
+
 public class LeaveOutData {
     /**
      * 批次号
@@ -44,4 +44,52 @@ public class LeaveOutData {
      */
     @ExcelProperty(index = 5,value = "融合轨迹中出现的次数")
     private Long trackCount;
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Long getOriginalCount() {
+        return originalCount;
+    }
+
+    public void setOriginalCount(Long originalCount) {
+        this.originalCount = originalCount;
+    }
+
+    public String getMergeTarget() {
+        return mergeTarget;
+    }
+
+    public void setMergeTarget(String mergeTarget) {
+        this.mergeTarget = mergeTarget;
+    }
+
+    public Long getTrackCount() {
+        return trackCount;
+    }
+
+    public void setTrackCount(Long trackCount) {
+        this.trackCount = trackCount;
+    }
 }

fusion-analysis/src/main/java/cn/com/taiji/domain/StaticOrDynamicData.java

@@ -7,7 +7,6 @@ import lombok.Data;
  * @author xhl
  * @date 2023/2/7
  */
-@Data
 public class StaticOrDynamicData {
 
     /**
@@ -21,4 +20,20 @@ public class StaticOrDynamicData {
      */
     @ExcelProperty(index = 1,value = "天奥批次号")
     private String batchNumber;
+
+    public String getMergeTarget() {
+        return mergeTarget;
+    }
+
+    public void setMergeTarget(String mergeTarget) {
+        this.mergeTarget = mergeTarget;
+    }
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
 }

fusion-analysis/src/main/java/cn/com/taiji/domain/dto/LeaceOutDto.java

@@ -6,7 +6,6 @@ import lombok.Data;
  * @author xhl
  * @date 2023/2/7
  */
-@Data
 public class LeaceOutDto {
     /**
      * 批次号
@@ -17,4 +16,20 @@ public class LeaceOutDto {
      * 数量
      */
     private Long count;
+
+    public String getBatchNumber() {
+        return batchNumber;
+    }
+
+    public void setBatchNumber(String batchNumber) {
+        this.batchNumber = batchNumber;
+    }
+
+    public Long getCount() {
+        return count;
+    }
+
+    public void setCount(Long count) {
+        this.count = count;
+    }
 }

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

@@ -47,7 +47,6 @@ import static cn.com.taiji.constants.EsIndexConstants.*;
  * @author xhl
  * @date 2023/2/6
  */
-@Slf4j
 @Service
 public class FusionAnalysisServiceImpl implements FusionAnalysisService {
 
@@ -67,10 +66,10 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder.query(boolQueryBuilder);
         TermsAggregationBuilder aggBuilder = AggregationBuilders.terms("ship_field_agg")
                 .field("mergeTarget")
-                .size(0)
+                .size(1000000)
                 .subAggregation(
                         AggregationBuilders.topHits("ship_field_agg_top1")
-                                .size(0)
+                                .size(100)
                                 .sort(
                                         SortBuilders.fieldSort("mergeTime").order(SortOrder.ASC)
                                 )
@@ -78,7 +77,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder
                 .trackTotalHits(true)
                 .aggregation(aggBuilder)
-                .size(0);
+                .size(1000000);
         request.source(searchSourceBuilder);
         SearchResponse search = client.search(request, RequestOptions.DEFAULT);
         Aggregations aggregations = search.getAggregations();
@@ -120,7 +119,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            log.info("导出识别融合数据率波动问题excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出识别融合数据率波动问题excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -137,17 +136,17 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder.query(boolQueryBuilder);
         TermsAggregationBuilder aggBuilder = AggregationBuilders.terms("ship_field_agg")
                 .field("mergeTarget")
-                .size(0)
+                .size(1000000)
                 .subAggregation(
                         AggregationBuilders.terms("ship_field_agg_one")
                                 .field("targetCourse")
-                                .size(0)
+                                .size(1000000)
                                 .subAggregation(
                                         AggregationBuilders.terms("ship_field_agg_two")
                                                 .field("targetSpeed")
-                                                .size(0)
+                                                .size(1000000)
                                                 .subAggregation(AggregationBuilders.topHits("ship_field_agg_top1")
-                                                        .size(0)
+                                                        .size(100)
                                                         .sort(
                                                                 SortBuilders.fieldSort("mergeTime").order(SortOrder.ASC)
                                                         ))
@@ -156,7 +155,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder
                 .trackTotalHits(true)
                 .aggregation(aggBuilder)
-                .size(0);
+                .size(1000000);
         request.source(searchSourceBuilder);
         SearchResponse search = client.search(request, RequestOptions.DEFAULT);
         Aggregations aggregations = search.getAggregations();
@@ -204,7 +203,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            log.info("导出虚假推送问题excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出虚假推送问题excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -222,11 +221,11 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder.query(boolQueryBuilder);
         TermsAggregationBuilder aggBuilder = AggregationBuilders.terms("ship_field_agg")
                 .field("fusionBatchNum")
-                .size(0);
+                .size(1000000);
         searchSourceBuilder
                 .trackTotalHits(true)
                 .aggregation(aggBuilder)
-                .size(0);
+                .size(1000000);
         request.source(searchSourceBuilder);
         SearchResponse search = client.search(request, RequestOptions.DEFAULT);
         Aggregations aggregations = search.getAggregations();
@@ -248,7 +247,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","RADAR","AIS_RADAR","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));
             searchSourceBuilder2.query(boolQueryBuilder2)
                     .trackTotalHits(true)
-                    .size(0);
+                    .size(1000000);
             request2.source(searchSourceBuilder2);
             try {
                 SearchResponse search2 = client.search(request, RequestOptions.DEFAULT);
@@ -280,7 +279,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            log.info("导出天奥轨迹数据遗漏excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出天奥轨迹数据遗漏excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -298,11 +297,11 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder.query(boolQueryBuilder);
         TermsAggregationBuilder aggBuilder = AggregationBuilders.terms("ship_field_agg")
                 .field("devideNo")
-                .size(0);
+                .size(1000000);
         searchSourceBuilder
                 .trackTotalHits(true)
                 .aggregation(aggBuilder)
-                .size(0);
+                .size(1000000);
         request.source(searchSourceBuilder);
         SearchResponse search = client.search(request, RequestOptions.DEFAULT);
         Aggregations aggregations = search.getAggregations();
@@ -324,7 +323,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","BEIDOU","AIS_BEIDOU","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));
             searchSourceBuilder2.query(boolQueryBuilder2)
                     .trackTotalHits(true)
-                    .size(0);
+                    .size(1000000);
             request2.source(searchSourceBuilder2);
             try {
                 SearchResponse search2 = client.search(request, RequestOptions.DEFAULT);
@@ -356,7 +355,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            log.info("导出北斗轨迹数据遗漏excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出北斗轨迹数据遗漏excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -374,11 +373,11 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder.query(boolQueryBuilder);
         TermsAggregationBuilder aggBuilder = AggregationBuilders.terms("ship_field_agg")
                 .field("targetID")
-                .size(0);
+                .size(1000000);
         searchSourceBuilder
                 .trackTotalHits(true)
                 .aggregation(aggBuilder)
-                .size(0);
+                .size(1000000);
         request.source(searchSourceBuilder);
         SearchResponse search = client.search(request, RequestOptions.DEFAULT);
         Aggregations aggregations = search.getAggregations();
@@ -400,7 +399,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","AIS","RADAR","AIS_BEIDOU","AIS_RADAR","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));
             searchSourceBuilder2.query(boolQueryBuilder2)
                     .trackTotalHits(true)
-                    .size(0);
+                    .size(1000000);
             request2.source(searchSourceBuilder2);
             try {
                 SearchResponse search2 = client.search(request, RequestOptions.DEFAULT);
@@ -432,7 +431,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            log.info("导出海兰信1级融合轨迹数据遗漏excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出海兰信1级融合轨迹数据遗漏excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -451,11 +450,11 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         searchSourceBuilder.query(boolQueryBuilder);
         TermsAggregationBuilder aggBuilder = AggregationBuilders.terms("ship_field_agg")
                 .field("fusionBatchNum")
-                .size(0);
+                .size(1000000);
         searchSourceBuilder
                 .trackTotalHits(true)
                 .aggregation(aggBuilder)
-                .size(0);
+                .size(1000000);
         request.source(searchSourceBuilder);
         SearchResponse search = client.search(request, RequestOptions.DEFAULT);
         Aggregations aggregations = search.getAggregations();
@@ -478,7 +477,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","RADAR","AIS_RADAR","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));
             searchSourceBuilder2.query(boolQueryBuilder2)
                     .trackTotalHits(true)
-                    .size(0);
+                    .size(1000000);
             request2.source(searchSourceBuilder2);
             try {
                 SearchResponse search2 = client.search(request, RequestOptions.DEFAULT);
@@ -503,7 +502,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            log.info("导出天奥静态数据与动态轨迹融合excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出天奥静态数据与动态轨迹融合excel失败：{}" + e.getMessage() + e);
         }
     }
 }

pom.xml

@@ -54,8 +54,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>