[update]0.3版本

.idea/workspace.xml

@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[update]0.3版本">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/constants/EsIndexConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/constants/EsIndexConstants.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" />
@@ -178,7 +179,10 @@
       <workItem from="1675844180241" duration="4939000" />
       <workItem from="1675902989280" duration="632000" />
       <workItem from="1675904453292" duration="806000" />
-      <workItem from="1675910279608" duration="3089000" />
+      <workItem from="1675910279608" duration="3108000" />
+      <workItem from="1675926884397" duration="1000" />
+      <workItem from="1675926990034" duration="2575000" />
+      <workItem from="1675989856413" duration="1423000" />
     </task>
     <task id="LOCAL-00001" summary="[insert]新增prod环境配置，完善es连接配置">
       <created>1675652041715</created>
@@ -236,7 +240,14 @@
       <option name="project" value="LOCAL" />
       <updated>1675850987859</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <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>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -275,7 +286,8 @@
     <MESSAGE value="[insert]新增融合解析--识别融合数据率波动问题导出" />
     <MESSAGE value="[update]修改pom文件" />
     <MESSAGE value="[update]0.2版本" />
-    <option name="LAST_COMMIT_MESSAGE" value="[update]0.2版本" />
+    <MESSAGE value="[update]0.3版本" />
+    <option name="LAST_COMMIT_MESSAGE" value="[update]0.3版本" />
   </component>
   <component name="XDebuggerManager">
     <pin-to-top-manager>

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

@@ -15,6 +15,11 @@ public class EsIndexConstants {
     public static final String INDEX_SEAT_REALTIMETRAJECTORY = "index_seat_realtimetrajectory_";
 
     /**
+     * 融合
+     */
+    public static final String INDEX_SEAT_REALTIMETRAJECTORY_TEST = "index_seat_realtimetrajectory_test_";
+
+    /**
      * 北斗
      */
     public static final String INDEX_SEAT_TRACK_BEIDOU = "index_seat_beidou_dynamic_ship_track_";

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

@@ -410,13 +410,13 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
 //        }
         dtos.forEach(item->{
             LeaveOutData data = new LeaveOutData();
-            SearchRequest request2 = new SearchRequest(INDEX_SEAT_REALTIMETRAJECTORY+time);
+            SearchRequest request2 = new SearchRequest(INDEX_SEAT_REALTIMETRAJECTORY_TEST+time);
             // 构建查询条件
             BoolQueryBuilder boolQueryBuilder2 = QueryBuilders.boolQuery();
             SearchSourceBuilder searchSourceBuilder2 = new SearchSourceBuilder();
-            boolQueryBuilder2.filter(QueryBuilders.wildcardQuery("targetSource", "*"+ item.getBatchNumber() +"*"));
+            boolQueryBuilder2.filter(QueryBuilders.wildcardQuery("trackDeviceNo", "*,"+ item.getBatchNumber() +",*"));
             boolQueryBuilder2.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
-            boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","RADAR","AIS_RADAR","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));
+            boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","TA_RADAR"));
             searchSourceBuilder2.query(boolQueryBuilder2)
                     .trackTotalHits(true)
                     .size(query.getPageSize())
@@ -644,13 +644,13 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
 //        }
         dtos.forEach(item->{
             LeaveOutData data = new LeaveOutData();
-            SearchRequest request2 = new SearchRequest(INDEX_SEAT_REALTIMETRAJECTORY+time);
+            SearchRequest request2 = new SearchRequest(INDEX_SEAT_REALTIMETRAJECTORY_TEST+time);
             // 构建查询条件
             BoolQueryBuilder boolQueryBuilder2 = QueryBuilders.boolQuery();
             SearchSourceBuilder searchSourceBuilder2 = new SearchSourceBuilder();
-            boolQueryBuilder2.filter(QueryBuilders.wildcardQuery("targetSource", "*"+ item.getBatchNumber() +"*"));
+            boolQueryBuilder2.filter(QueryBuilders.wildcardQuery("trackDeviceNo", "*,"+ item.getBatchNumber() +",*"));
             boolQueryBuilder2.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
-            boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","AIS","RADAR","AIS_BEIDOU","AIS_RADAR","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));
+            boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","HLX_AIS_RADAR","HLX_AIS","HLX_RADAR","HLX_ZYD_RADAR"));
             searchSourceBuilder2.query(boolQueryBuilder2)
                     .trackTotalHits(true)
                     .size(query.getPageSize())
@@ -753,11 +753,11 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
         });
         dtos.forEach(item->{
             StaticOrDynamicData data = new StaticOrDynamicData();
-            SearchRequest request2 = new SearchRequest(INDEX_SEAT_REALTIMETRAJECTORY+time);
+            SearchRequest request2 = new SearchRequest(INDEX_SEAT_REALTIMETRAJECTORY_TEST+time);
             // 构建查询条件
             BoolQueryBuilder boolQueryBuilder2 = QueryBuilders.boolQuery();
             SearchSourceBuilder searchSourceBuilder2 = new SearchSourceBuilder();
-            boolQueryBuilder2.filter(QueryBuilders.wildcardQuery("targetSource", "*"+ item.getBatchNumber() +"*"));
+            boolQueryBuilder2.filter(QueryBuilders.wildcardQuery("trackDeviceNo", "*,"+ item.getBatchNumber() +",*"));
             boolQueryBuilder2.filter(QueryBuilders.termQuery("targetType","0"));
             boolQueryBuilder2.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
             boolQueryBuilder2.filter(QueryBuilders.termsQuery("mergeType","RADAR","AIS_RADAR","BEIDOU_RADAR","AIS_BEIDOU_RADAR"));