[update]0.7版本

.idea/workspace.xml

@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[update]0.3版本">
+    <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[update]0.7版本">
       <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/service/impl/FusionAnalysisServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java" afterDir="false" />
     </list>
@@ -183,7 +183,10 @@
       <workItem from="1675926990034" duration="2575000" />
       <workItem from="1675989856413" duration="1423000" />
       <workItem from="1676011584046" duration="4880000" />
-      <workItem from="1676252216821" duration="1298000" />
+      <workItem from="1676252216821" duration="1375000" />
+      <workItem from="1676253941747" duration="1672000" />
+      <workItem from="1676259459788" duration="81000" />
+      <workItem from="1676342714497" duration="42000" />
     </task>
     <task id="LOCAL-00001" summary="[insert]新增prod环境配置，完善es连接配置">
       <created>1675652041715</created>
@@ -248,7 +251,14 @@
       <option name="project" value="LOCAL" />
       <updated>1675919825898</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <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>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -288,7 +298,8 @@
     <MESSAGE value="[update]修改pom文件" />
     <MESSAGE value="[update]0.2版本" />
     <MESSAGE value="[update]0.3版本" />
-    <option name="LAST_COMMIT_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>

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

@@ -319,8 +319,8 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
                                 Date date = null;
                                 Date date2 = null;
                                 try {
-                                    date = DateUtils.parse(job.get("mergeTime").toString(),"yyyy-MM-dd HH:mm:ss.SSS");
-                                    date2 = DateUtils.parse(job2.get("mergeTime").toString(),"yyyy-MM-dd HH:mm:ss.SSS");
+                                    date = DateUtils.parse(job.getString("mergeTime"),"yyyy-MM-dd HH:mm:ss.SSS");
+                                    date2 = DateUtils.parse(job2.getString("mergeTime"),"yyyy-MM-dd HH:mm:ss.SSS");
                                 } catch (ParseException e) {
                                     e.printStackTrace();
                                 }