Merge remote-tracking branch 'origin/xiahailong'

# Conflicts:
#	fusion-analysis/src/main/java/cn/com/taiji/constants/EsIndexConstants.java
#	fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java
#	fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java
#	fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java

.idea/compiler.xml

@@ -9,8 +9,12 @@
         <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" />
   </component>
 </project>

.idea/workspace.xml

@@ -4,21 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[insert]新增融合解析--识别融合数据率波动问题导出">
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/FusionAnalysisApplication.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FusionData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FusionQuery.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/utils/DateUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/resources/application-prod.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+    <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[update]0.7版本">
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/BeiDouOriginal.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FuseOriginal.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/TargetSource.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/TianAoOriginal.java" 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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/es-track-common/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/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/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/service/impl/FusionAnalysisServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -35,7 +29,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="chenfangchao" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -63,30 +57,34 @@
   <component name="ProjectViewState">
     <option name="autoscrollFromSource" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
     <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" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/fusion-analysis/src/main/resources" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="project.structure.last.edited" value="模块" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.0" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <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="preferences.pluginManager" />
   </component>
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\FusionAnalysis\fusion-analysis\src\main\java\cn\com\taiji" />
       <recent name="D:\FusionAnalysis\fusion-analysis\src\main\resources" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -94,7 +92,27 @@
       <recent name="cn.com.taiji.config" />
     </key>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.FusionAnalysisApplication">
+    <configuration name="text" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="cn.com.taiji.service.impl.text" />
+      <module name="fusion-analysis" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="cn.com.taiji.service.impl.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <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">
@@ -108,9 +126,41 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="FusionAnalysisApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="fusion-analysis" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.taiji.FusionAnalysisApplication" />
+      <method v="2">
+        <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="应用程序.text" />
         <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
+        <item itemvalue="应用程序.text" />
+        <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
+        <item itemvalue="应用程序.text" />
       </list>
     </recent_temporary>
   </component>
@@ -125,6 +175,28 @@
       <workItem from="1675647750482" duration="488000" />
       <workItem from="1675651220605" duration="3438000" />
       <workItem from="1675666106206" duration="7273000" />
+      <workItem from="1675730151616" duration="2482000" />
+      <workItem from="1675751880629" duration="13334000" />
+      <workItem from="1675788186214" duration="4782000" />
+      <workItem from="1675817188436" duration="9379000" />
+      <workItem from="1675829258696" duration="25000" />
+      <workItem from="1675839509239" duration="2028000" />
+      <workItem from="1675844180241" duration="4939000" />
+      <workItem from="1675902989280" duration="632000" />
+      <workItem from="1675904453292" duration="806000" />
+      <workItem from="1675910279608" duration="3108000" />
+      <workItem from="1675926884397" duration="1000" />
+      <workItem from="1675926990034" duration="2575000" />
+      <workItem from="1675989856413" duration="1423000" />
+      <workItem from="1676011584046" duration="4880000" />
+      <workItem from="1676252216821" duration="1375000" />
+      <workItem from="1676253941747" duration="1672000" />
+      <workItem from="1676259459788" duration="81000" />
+      <workItem from="1676342714497" duration="42000" />
+      <workItem from="1676342761531" duration="45000" />
+      <workItem from="1676443948706" duration="35000" />
+      <workItem from="1676603269237" duration="1088000" />
+      <workItem from="1676711088015" duration="7165000" />
     </task>
     <task id="LOCAL-00001" summary="[insert]新增prod环境配置，完善es连接配置">
       <created>1675652041715</created>
@@ -140,7 +212,70 @@
       <option name="project" value="LOCAL" />
       <updated>1675652628130</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="[update]修改pom文件">
+      <created>1675677271908</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1675677271908</updated>
+    </task>
+    <task id="LOCAL-00004" summary="[update]修改pom文件">
+      <created>1675768958870</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1675768958870</updated>
+    </task>
+    <task id="LOCAL-00005" summary="[update]修改pom文件">
+      <created>1675792903860</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1675792903860</updated>
+    </task>
+    <task id="LOCAL-00006" summary="[update]0.2版本">
+      <created>1675824149842</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1675824149842</updated>
+    </task>
+    <task id="LOCAL-00007" summary="[update]0.2版本">
+      <created>1675829124942</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1675829124942</updated>
+    </task>
+    <task id="LOCAL-00008" summary="[update]0.2版本">
+      <created>1675850987859</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1675850987859</updated>
+    </task>
+    <task id="LOCAL-00009" summary="[update]0.3版本">
+      <created>1675919825898</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1675919825898</updated>
+    </task>
+    <task id="LOCAL-00010" summary="[update]0.7版本">
+      <created>1676253533579</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1676253533579</updated>
+    </task>
+    <task id="LOCAL-00011" summary="[update]0.7版本">
+      <created>1676342800141</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1676342800141</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -156,12 +291,46 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="User">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="chenfangchao" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="[insert]新增prod环境配置，完善es连接配置" />
     <MESSAGE value="[insert]新增es索引名" />
     <MESSAGE value="[insert]新增融合解析--识别融合数据率波动问题导出" />
-    <option name="LAST_COMMIT_MESSAGE" value="[insert]新增融合解析--识别融合数据率波动问题导出" />
+    <MESSAGE value="[update]修改pom文件" />
+    <MESSAGE value="[update]0.2版本" />
+    <MESSAGE value="[update]0.3版本" />
+    <MESSAGE value="[update]0.7版本" />
+    <option name="LAST_COMMIT_MESSAGE" value="[update]0.7版本" />
+  </component>
+  <component name="XDebuggerManager">
+    <pin-to-top-manager>
+      <pinned-members>
+        <PinnedItemInfo parentTag="org.elasticsearch.search.aggregations.Aggregations" memberName="aggregations" />
+        <PinnedItemInfo parentTag="java.util.HashMap$Node" memberName="value" />
+      </pinned-members>
+    </pin-to-top-manager>
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/FusionAnalysis$FusionAnalysisApplication.ic" NAME="FusionAnalysisApplication 覆盖结果" MODIFIED="1675822157470" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
 </project>

es-track-common/pom.xml

@@ -14,7 +14,7 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <elasticsearch.version>7.8.0</elasticsearch.version>
+        <elasticsearch.version>7.16.2</elasticsearch.version>
     </properties>
 
 

es-track-common/src/main/java/cn/com/taiji/config/EsClientConfiguration.java

@@ -6,6 +6,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -47,6 +48,13 @@ public class EsClientConfiguration {
     @Bean
     public RestHighLevelClient client() {
 
+        RestClientBuilder.RequestConfigCallback requestConfigCallback = requstConfigBuilder -> {
+            requstConfigBuilder.setConnectTimeout(300000);
+            requstConfigBuilder.setSocketTimeout(400000);
+            requstConfigBuilder.setConnectionRequestTimeout(0);
+            return requstConfigBuilder;
+        };
+
         HttpHost[] httpHosts = new HttpHost[esUris.length];
         //将地址转换为http主机数组，未配置端口则采用默认9200端口，配置了端口则用配置的端口
         for (int i = 0; i < httpHosts.length; i++) {

fusion-analysis/src/main/java/cn/com/taiji/constants/EsIndexConstants.java

@@ -43,4 +43,9 @@ public class EsIndexConstants {
      * 中远海雷达
      */
     public static final String INDEX_SEAT_TRACK_ZYH = "index_seat_zyh_radar_track_";
+
+    /**
+     * 俯瞰融合
+     */
+    public static final String INDEX_SEAT_FK_REALTIMETRAJECTORY_TEST = "index_seat_fk_realtimetrajectory_test";
 }

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

@@ -1,17 +1,8 @@
 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
@@ -94,4 +85,177 @@ public class FusionAnalysisController {
     public void tianaoStaticOrDynamicLeaveOutExcel(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         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
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/three")
+    public void fusionAnalysisExcelThree(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelThree(query,response);
+    }
+
+    /**
+     * 轨迹融合-航速航向异常波动-识别融合航向异常波动问题
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/four")
+    public void fusionAnalysisExcelFour(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelFour(query,response);
+    }
+
+
+    /**
+     * 轨迹融合-导出融合原始数据统计
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/one")
+    public void fusionAnalysisExcelOriginalOne(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalOne(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出北斗原始数据统计
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/two")
+    public void fusionAnalysisExcelOriginalTwo(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalTwo(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出天奥原始数据统计
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/three")
+    public void fusionAnalysisExcelOriginalThree(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalThree(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出融合原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/four")
+    public void fusionAnalysisExcelOriginalFour(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalFour(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出北斗原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/five")
+    public void fusionAnalysisExcelOriginalFive(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalFive(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出天奥原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/six")
+    public void fusionAnalysisExcelOriginalSix(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalSix(query,response);
+    }
+
 }

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

@@ -0,0 +1,210 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * @author xhl
+ */
+public class BeiDouOriginal {
+    @ExcelProperty(value = "gisShipUse")
+    private String gisShipUse;
+    @ExcelProperty(value = "latitude")
+    private String latitude;
+    @ExcelProperty(value = "isOnline")
+    private String isOnline;
+    @ExcelProperty(value = "devideNo")
+    private String devideNo;
+    @ExcelProperty(value = "shipName")
+    private String shipName;
+    @ExcelProperty(value = "speed")
+    private int speed;
+    @ExcelProperty(value = "shipLength")
+    private double shipLength;
+    @ExcelProperty(value = "texTure")
+    private String texTure;
+    @ExcelProperty(value = "shiptracktime")
+    private String shiptracktime;
+    @ExcelProperty(value = "course")
+    private String course;
+    @ExcelProperty(value = "jobWay")
+    private String jobWay;
+    @ExcelProperty(value = "jobType")
+    private String jobType;
+    @ExcelProperty(value = "shipId")
+    private String shipId;
+    @ExcelProperty(value = "longitude")
+    private String longitude;
+    @ExcelProperty(value = "locationTime")
+    private String locationTime;
+    @ExcelProperty(value = "gisShipPort")
+    private String gisShipPort;
+    @ExcelProperty(value = "electricity")
+    private String electricity;
+    @ExcelProperty(value = "shipWidth")
+    private String shipWidth;
+    @ExcelProperty(value = "gisShipMaterial")
+    private String gisShipMaterial;
+    @ExcelProperty(value = "sendTime")
+    private String sendTime;
+    @ExcelProperty(value = "shipMaterial")
+    private String shipMaterial;
+    @ExcelProperty(value = "shipTrack")
+    private String shipTrack;
+    @ExcelProperty(value = "locationid")
+    private String locationid;
+    @ExcelProperty(value = "shipType")
+    private String shipType;
+    @ExcelProperty(value = "location")
+    private String location;
+
+    public void setGisShipUse(String gisShipUse){
+        this.gisShipUse = gisShipUse;
+    }
+    public String getGisShipUse(){
+        return this.gisShipUse;
+    }
+    public void setLatitude(String latitude){
+        this.latitude = latitude;
+    }
+    public String getLatitude(){
+        return this.latitude;
+    }
+    public void setIsOnline(String isOnline){
+        this.isOnline = isOnline;
+    }
+    public String getIsOnline(){
+        return this.isOnline;
+    }
+    public void setDevideNo(String devideNo){
+        this.devideNo = devideNo;
+    }
+    public String getDevideNo(){
+        return this.devideNo;
+    }
+    public void setShipName(String shipName){
+        this.shipName = shipName;
+    }
+    public String getShipName(){
+        return this.shipName;
+    }
+    public void setSpeed(int speed){
+        this.speed = speed;
+    }
+    public int getSpeed(){
+        return this.speed;
+    }
+    public void setShipLength(double shipLength){
+        this.shipLength = shipLength;
+    }
+    public double getShipLength(){
+        return this.shipLength;
+    }
+    public void setTexTure(String texTure){
+        this.texTure = texTure;
+    }
+    public String getTexTure(){
+        return this.texTure;
+    }
+    public void setShiptracktime(String shiptracktime){
+        this.shiptracktime = shiptracktime;
+    }
+    public String getShiptracktime(){
+        return this.shiptracktime;
+    }
+    public void setCourse(String course){
+        this.course = course;
+    }
+    public String getCourse(){
+        return this.course;
+    }
+    public void setJobWay(String jobWay){
+        this.jobWay = jobWay;
+    }
+    public String getJobWay(){
+        return this.jobWay;
+    }
+    public void setJobType(String jobType){
+        this.jobType = jobType;
+    }
+    public String getJobType(){
+        return this.jobType;
+    }
+    public void setShipId(String shipId){
+        this.shipId = shipId;
+    }
+    public String getShipId(){
+        return this.shipId;
+    }
+    public void setLongitude(String longitude){
+        this.longitude = longitude;
+    }
+    public String getLongitude(){
+        return this.longitude;
+    }
+    public void setLocationTime(String locationTime){
+        this.locationTime = locationTime;
+    }
+    public String getLocationTime(){
+        return this.locationTime;
+    }
+    public void setGisShipPort(String gisShipPort){
+        this.gisShipPort = gisShipPort;
+    }
+    public String getGisShipPort(){
+        return this.gisShipPort;
+    }
+    public void setElectricity(String electricity){
+        this.electricity = electricity;
+    }
+    public String getElectricity(){
+        return this.electricity;
+    }
+    public void setShipWidth(String shipWidth){
+        this.shipWidth = shipWidth;
+    }
+    public String getShipWidth(){
+        return this.shipWidth;
+    }
+    public void setGisShipMaterial(String gisShipMaterial){
+        this.gisShipMaterial = gisShipMaterial;
+    }
+    public String getGisShipMaterial(){
+        return this.gisShipMaterial;
+    }
+    public void setSendTime(String sendTime){
+        this.sendTime = sendTime;
+    }
+    public String getSendTime(){
+        return this.sendTime;
+    }
+    public void setShipMaterial(String shipMaterial){
+        this.shipMaterial = shipMaterial;
+    }
+    public String getShipMaterial(){
+        return this.shipMaterial;
+    }
+    public void setShipTrack(String shipTrack){
+        this.shipTrack = shipTrack;
+    }
+    public String getShipTrack(){
+        return this.shipTrack;
+    }
+    public void setLocationid(String locationid){
+        this.locationid = locationid;
+    }
+    public String getLocationid(){
+        return this.locationid;
+    }
+    public void setShipType(String shipType){
+        this.shipType = shipType;
+    }
+    public String getShipType(){
+        return this.shipType;
+    }
+    public void setLocation(String location){
+        this.location = location;
+    }
+    public String getLocation(){
+        return this.location;
+    }
+}

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

@@ -0,0 +1,268 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import java.util.List;
+
+/**
+ * @author xhl
+ */
+public class FuseOriginal {
+    @ExcelProperty(value = "targetName")
+    private String targetName;
+    @ExcelProperty(value = "supplyIceWaterAreaId")
+    private String supplyIceWaterAreaId;
+    @ExcelProperty(value = "portState")
+    private String portState;
+    @ExcelProperty(value = "targetHeading")
+    private String targetHeading;
+    @ExcelProperty(value = "portId")
+    private String portId;
+    @ExcelProperty(value = "mergeTarget")
+    private String mergeTarget;
+    @ExcelProperty(value = "targetTrackState")
+    private String targetTrackState;
+    @ExcelProperty(value = "targetShipType")
+    private String targetShipType;
+    @ExcelProperty(value = "targetSource")
+    private String targetSource;
+    @ExcelProperty(value = "gisNationality")
+    private String gisNationality;
+    @ExcelProperty(value = "targetState")
+    private String targetState;
+    @ExcelProperty(value = "targetLength")
+    private int targetLength;
+    @ExcelProperty(value = "targetTrackTime")
+    private String targetTrackTime;
+    @ExcelProperty(value = "motionState")
+    private String motionState;
+    @ExcelProperty(value = "mergeTime")
+    private String mergeTime;
+    @ExcelProperty(value = "targetSpeed")
+    private double targetSpeed;
+    @ExcelProperty(value = "mergeId")
+    private String mergeId;
+    @ExcelProperty(value = "targetRot")
+    private String targetRot;
+    @ExcelProperty(value = "mergeType")
+    private String mergeType;
+    @ExcelProperty(value = "targetType")
+    private String targetType;
+    @ExcelProperty(value = "gisShipType")
+    private String gisShipType;
+    @ExcelProperty(value = "supplyIceWaterState")
+    private String supplyIceWaterState;
+    @ExcelProperty(value = "refueledAreaId")
+    private String refueledAreaId;
+    @ExcelProperty(value = "targetNameEn")
+    private String targetNameEn;
+    @ExcelProperty(value = "refueledState")
+    private String refueledState;
+    @ExcelProperty(value = "targetMonitorId")
+    private String targetMonitorId;
+    @ExcelProperty(value = "targetDraught")
+    private String targetDraught;
+    @ExcelProperty(value = "trackDeviceNo")
+    private String trackDeviceNo;
+    @ExcelProperty(value = "targetCourse")
+    private String targetCourse;
+    @ExcelProperty(value = "targetNationality")
+    private String targetNationality;
+    @ExcelProperty(value = "location")
+    private String location;
+    @ExcelProperty(value = "targetTypeReliability")
+    private int targetTypeReliability;
+
+    public void setTargetName(String targetName){
+        this.targetName = targetName;
+    }
+    public String getTargetName(){
+        return this.targetName;
+    }
+    public void setSupplyIceWaterAreaId(String supplyIceWaterAreaId){
+        this.supplyIceWaterAreaId = supplyIceWaterAreaId;
+    }
+    public String getSupplyIceWaterAreaId(){
+        return this.supplyIceWaterAreaId;
+    }
+    public void setPortState(String portState){
+        this.portState = portState;
+    }
+    public String getPortState(){
+        return this.portState;
+    }
+    public void setTargetHeading(String targetHeading){
+        this.targetHeading = targetHeading;
+    }
+    public String getTargetHeading(){
+        return this.targetHeading;
+    }
+    public void setPortId(String portId){
+        this.portId = portId;
+    }
+    public String getPortId(){
+        return this.portId;
+    }
+    public void setMergeTarget(String mergeTarget){
+        this.mergeTarget = mergeTarget;
+    }
+    public String getMergeTarget(){
+        return this.mergeTarget;
+    }
+    public void setTargetTrackState(String targetTrackState){
+        this.targetTrackState = targetTrackState;
+    }
+    public String getTargetTrackState(){
+        return this.targetTrackState;
+    }
+    public void setTargetShipType(String targetShipType){
+        this.targetShipType = targetShipType;
+    }
+    public String getTargetShipType(){
+        return this.targetShipType;
+    }
+    public void setTargetSource(String targetSource){
+        this.targetSource = targetSource;
+    }
+    public String getTargetSource(){
+        return this.targetSource;
+    }
+    public void setGisNationality(String gisNationality){
+        this.gisNationality = gisNationality;
+    }
+    public String getGisNationality(){
+        return this.gisNationality;
+    }
+    public void setTargetState(String targetState){
+        this.targetState = targetState;
+    }
+    public String getTargetState(){
+        return this.targetState;
+    }
+    public void setTargetLength(int targetLength){
+        this.targetLength = targetLength;
+    }
+    public int getTargetLength(){
+        return this.targetLength;
+    }
+    public void setTargetTrackTime(String targetTrackTime){
+        this.targetTrackTime = targetTrackTime;
+    }
+    public String getTargetTrackTime(){
+        return this.targetTrackTime;
+    }
+    public void setMotionState(String motionState){
+        this.motionState = motionState;
+    }
+    public String getMotionState(){
+        return this.motionState;
+    }
+    public void setMergeTime(String mergeTime){
+        this.mergeTime = mergeTime;
+    }
+    public String getMergeTime(){
+        return this.mergeTime;
+    }
+    public void setTargetSpeed(double targetSpeed){
+        this.targetSpeed = targetSpeed;
+    }
+    public double getTargetSpeed(){
+        return this.targetSpeed;
+    }
+    public void setMergeId(String mergeId){
+        this.mergeId = mergeId;
+    }
+    public String getMergeId(){
+        return this.mergeId;
+    }
+    public void setTargetRot(String targetRot){
+        this.targetRot = targetRot;
+    }
+    public String getTargetRot(){
+        return this.targetRot;
+    }
+    public void setMergeType(String mergeType){
+        this.mergeType = mergeType;
+    }
+    public String getMergeType(){
+        return this.mergeType;
+    }
+    public void setTargetType(String targetType){
+        this.targetType = targetType;
+    }
+    public String getTargetType(){
+        return this.targetType;
+    }
+    public void setGisShipType(String gisShipType){
+        this.gisShipType = gisShipType;
+    }
+    public String getGisShipType(){
+        return this.gisShipType;
+    }
+    public void setSupplyIceWaterState(String supplyIceWaterState){
+        this.supplyIceWaterState = supplyIceWaterState;
+    }
+    public String getSupplyIceWaterState(){
+        return this.supplyIceWaterState;
+    }
+    public void setRefueledAreaId(String refueledAreaId){
+        this.refueledAreaId = refueledAreaId;
+    }
+    public String getRefueledAreaId(){
+        return this.refueledAreaId;
+    }
+    public void setTargetNameEn(String targetNameEn){
+        this.targetNameEn = targetNameEn;
+    }
+    public String getTargetNameEn(){
+        return this.targetNameEn;
+    }
+    public void setRefueledState(String refueledState){
+        this.refueledState = refueledState;
+    }
+    public String getRefueledState(){
+        return this.refueledState;
+    }
+    public void setTargetMonitorId(String targetMonitorId){
+        this.targetMonitorId = targetMonitorId;
+    }
+    public String getTargetMonitorId(){
+        return this.targetMonitorId;
+    }
+    public void setTargetDraught(String targetDraught){
+        this.targetDraught = targetDraught;
+    }
+    public String getTargetDraught(){
+        return this.targetDraught;
+    }
+    public void setTrackDeviceNo(String trackDeviceNo){
+        this.trackDeviceNo = trackDeviceNo;
+    }
+    public String getTrackDeviceNo(){
+        return this.trackDeviceNo;
+    }
+    public void setTargetCourse(String targetCourse){
+        this.targetCourse = targetCourse;
+    }
+    public String getTargetCourse(){
+        return this.targetCourse;
+    }
+    public void setTargetNationality(String targetNationality){
+        this.targetNationality = targetNationality;
+    }
+    public String getTargetNationality(){
+        return this.targetNationality;
+    }
+    public void setLocation(String location){
+        this.location = location;
+    }
+    public String getLocation(){
+        return this.location;
+    }
+    public void setTargetTypeReliability(int targetTypeReliability){
+        this.targetTypeReliability = targetTypeReliability;
+    }
+    public int getTargetTypeReliability(){
+        return this.targetTypeReliability;
+    }
+}

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

@@ -0,0 +1,37 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * @author xhl
+ * @date 2023/2/18
+ */
+public class OriginalData {
+    /**
+     * 批次号
+     */
+    @ExcelProperty(index = 0,value = "批次号")
+    private String mergeTarget;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(index = 1,value = "数量")
+    private Integer num;
+
+    public String getMergeTarget() {
+        return mergeTarget;
+    }
+
+    public void setMergeTarget(String mergeTarget) {
+        this.mergeTarget = mergeTarget;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+}

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

@@ -0,0 +1,40 @@
+package cn.com.taiji.domain;
+
+/**
+ * @author xhl
+ */
+public class TargetSource {
+
+    private String track_id;
+
+    private String id;
+
+    private String time;
+
+    private String type;
+
+    public void setTrack_id(String track_id){
+        this.track_id = track_id;
+    }
+    public String getTrack_id(){
+        return this.track_id;
+    }
+    public void setId(String id){
+        this.id = id;
+    }
+    public String getId(){
+        return this.id;
+    }
+    public void setTime(String time){
+        this.time = time;
+    }
+    public String getTime(){
+        return this.time;
+    }
+    public void setType(String type){
+        this.type = type;
+    }
+    public String getType(){
+        return this.type;
+    }
+}

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

@@ -0,0 +1,163 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * @author xhl
+ */
+public class TianAoOriginal {
+
+    @ExcelProperty(value = "altitude")
+    private String altitude;
+    @ExcelProperty(value = "collectTime")
+    private String collectTime;
+    @ExcelProperty(value = "reliability")
+    private int reliability;
+    @ExcelProperty(value = "fusionBatchNum")
+    private String fusionBatchNum;
+    @ExcelProperty(value = "targetProper")
+    private String targetProper;
+    @ExcelProperty(value = "shipName")
+    private String shipName;
+    @ExcelProperty(value = "fusionTime")
+    private String fusionTime;
+    @ExcelProperty(value = "speed")
+    private double speed;
+    @ExcelProperty(value = "receiveTime")
+    private String receiveTime;
+    @ExcelProperty(value = "traceState")
+    private String traceState;
+    @ExcelProperty(value = "targetSize")
+    private int targetSize;
+    @ExcelProperty(value = "radarCode")
+    private String radarCode;
+    @ExcelProperty(value = "shipTrack")
+    private String shipTrack;
+    @ExcelProperty(value = "shiptracktime")
+    private String shiptracktime;
+    @ExcelProperty(value = "course")
+    private String course;
+    @ExcelProperty(value = "location")
+    private String location;
+    @ExcelProperty(value = "id")
+    private String id;
+    @ExcelProperty(value = "shipId")
+    private String shipId;
+    @ExcelProperty(value = "longitude")
+    private String longitude;
+
+    public void setAltitude(String altitude){
+        this.altitude = altitude;
+    }
+    public String getAltitude(){
+        return this.altitude;
+    }
+    public void setCollectTime(String collectTime){
+        this.collectTime = collectTime;
+    }
+    public String getCollectTime(){
+        return this.collectTime;
+    }
+    public void setReliability(int reliability){
+        this.reliability = reliability;
+    }
+    public int getReliability(){
+        return this.reliability;
+    }
+    public void setFusionBatchNum(String fusionBatchNum){
+        this.fusionBatchNum = fusionBatchNum;
+    }
+    public String getFusionBatchNum(){
+        return this.fusionBatchNum;
+    }
+    public void setTargetProper(String targetProper){
+        this.targetProper = targetProper;
+    }
+    public String getTargetProper(){
+        return this.targetProper;
+    }
+    public void setShipName(String shipName){
+        this.shipName = shipName;
+    }
+    public String getShipName(){
+        return this.shipName;
+    }
+    public void setFusionTime(String fusionTime){
+        this.fusionTime = fusionTime;
+    }
+    public String getFusionTime(){
+        return this.fusionTime;
+    }
+    public void setSpeed(double speed){
+        this.speed = speed;
+    }
+    public double getSpeed(){
+        return this.speed;
+    }
+    public void setReceiveTime(String receiveTime){
+        this.receiveTime = receiveTime;
+    }
+    public String getReceiveTime(){
+        return this.receiveTime;
+    }
+    public void setTraceState(String traceState){
+        this.traceState = traceState;
+    }
+    public String getTraceState(){
+        return this.traceState;
+    }
+    public void setTargetSize(int targetSize){
+        this.targetSize = targetSize;
+    }
+    public int getTargetSize(){
+        return this.targetSize;
+    }
+    public void setRadarCode(String radarCode){
+        this.radarCode = radarCode;
+    }
+    public String getRadarCode(){
+        return this.radarCode;
+    }
+    public void setShipTrack(String shipTrack){
+        this.shipTrack = shipTrack;
+    }
+    public String getShipTrack(){
+        return this.shipTrack;
+    }
+    public void setShiptracktime(String shiptracktime){
+        this.shiptracktime = shiptracktime;
+    }
+    public String getShiptracktime(){
+        return this.shiptracktime;
+    }
+    public void setCourse(String course){
+        this.course = course;
+    }
+    public String getCourse(){
+        return this.course;
+    }
+    public void setLocation(String location){
+        this.location = location;
+    }
+    public String getLocation(){
+        return this.location;
+    }
+    public void setId(String id){
+        this.id = id;
+    }
+    public String getId(){
+        return this.id;
+    }
+    public void setShipId(String shipId){
+        this.shipId = shipId;
+    }
+    public String getShipId(){
+        return this.shipId;
+    }
+    public void setLongitude(String longitude){
+        this.longitude = longitude;
+    }
+    public String getLongitude(){
+        return this.longitude;
+    }
+}