[update]0.3版本

.idea/workspace.xml

@@ -175,7 +175,9 @@
       <workItem from="1675817188436" duration="9379000" />
       <workItem from="1675829258696" duration="25000" />
       <workItem from="1675839509239" duration="2028000" />
-      <workItem from="1675844180241" duration="4797000" />
+      <workItem from="1675844180241" duration="4939000" />
+      <workItem from="1675902989280" duration="632000" />
+      <workItem from="1675904453292" duration="806000" />
     </task>
     <task id="LOCAL-00001" summary="[insert]新增prod环境配置，完善es连接配置">
       <created>1675652041715</created>
@@ -226,7 +228,14 @@
       <option name="project" value="LOCAL" />
       <updated>1675829124942</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <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>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

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

@@ -265,11 +265,11 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             if (jsonArray.size() > 0) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject job = jsonArray.getJSONObject(i);
-                    for (int j = 0; j < jsonArray.size(); j++){
-                        JSONObject job2 = jsonArray.getJSONObject(j);
+                    for (int j = 0; j+i < jsonArray.size(); j++){
+                        JSONObject job2 = jsonArray.getJSONObject(j+i);
                         if (job.getString("targetCourse").equals(job2.getString("targetCourse"))){
                             if (job.getString("targetSpeed").equals(job2.getString("targetSpeed"))){
-                                if (num==9){
+                                if (num==3){
                                     if (data.getFluctuateNumber()!=null){
                                         data.setFluctuateNumber(data.getFluctuateNumber()+1);
                                     }else {
@@ -280,6 +280,7 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                                     data.setStartTime(jsonArray.getJSONObject(0).getString("mergeTime"));
                                     data.setEndTime(jsonArray.getJSONObject(jsonArray.size()-1).getString("mergeTime"));
                                     list.add(data);
+                                    num =0;
                                 }
                                 Date date = null;
                                 Date date2 = null;
@@ -439,6 +440,13 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                         data.setOriginalCount(item.getCount());
                         data.setTrackCount(totalHits);
                         list.add(data);
+                    }else {
+                        data.setMergeTarget("未查出匹配融合数据");
+                        data.setStartTime("未查出匹配融合数据");
+                        data.setEndTime("未查出匹配融合数据");
+                        data.setBatchNumber(item.getBatchNumber());
+                        data.setOriginalCount(item.getCount());
+                        data.setTrackCount(totalHits);
                     }
                 }
             } catch (IOException e) {
@@ -549,6 +557,13 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                         data.setOriginalCount(item.getCount());
                         data.setTrackCount(totalHits);
                         list.add(data);
+                    }else {
+                        data.setMergeTarget("未查出匹配融合数据");
+                        data.setStartTime("未查出匹配融合数据");
+                        data.setEndTime("未查出匹配融合数据");
+                        data.setBatchNumber(item.getBatchNumber());
+                        data.setOriginalCount(item.getCount());
+                        data.setTrackCount(totalHits);
                     }
                 }
             } catch (IOException e) {
@@ -659,6 +674,13 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                         data.setOriginalCount(item.getCount());
                         data.setTrackCount(totalHits);
                         list.add(data);
+                    }else {
+                        data.setMergeTarget("未查出匹配融合数据");
+                        data.setStartTime("未查出匹配融合数据");
+                        data.setEndTime("未查出匹配融合数据");
+                        data.setBatchNumber(item.getBatchNumber());
+                        data.setOriginalCount(item.getCount());
+                        data.setTrackCount(totalHits);
                     }
                 }
             } catch (IOException e) {
@@ -755,6 +777,10 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                     data.setMergeTarget(sourceItem.getString("mergeTarget"));
                     data.setBatchNumber(item.getBatchNumber());
                     list.add(data);
+                }else {
+                    data.setMergeTarget("未查出匹配融合数据");
+                    data.setBatchNumber(item.getBatchNumber());
+                    list.add(data);
                 }
             } catch (IOException e) {
                 e.printStackTrace();