Jelajahi Sumber

再次封装

fuyu 6 tahun lalu
induk
melakukan
672fa0297d

+ 230 - 222
.idea/workspace.xml

@@ -6,78 +6,24 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="582764bc-f4d5-49fa-89c5-ed5a1070192f" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileActionCallback.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileChangeProc.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileActionCallback.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileChangeProc.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentUploadQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/ErrorQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/IQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldRetryQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldUploadQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IRemove.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IUpload.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/logs/sys.log" afterPath="$PROJECT_DIR$/logs/sys.log" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/project.properties" afterPath="$PROJECT_DIR$/src/main/resources/project.properties" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/config/NetCodeConfig.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/config/NetCodeConfig.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Constants.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Constants.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/FileAction.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/FileAction.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/FileActionCallback.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/FileActionCallback.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/NowFileChangeProc$1$1$1.class" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/NowFileChangeProc$1$1$2.class" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/NowFileChangeProc$1$1.class" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/NowFileChangeProc$1.class" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/NowFileChangeProc.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/NowFileChangeProc.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/DirMonitor.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/DirMonitor.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/RetryDirMonitor.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/RetryDirMonitor.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/StatRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/StatRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/uploader/FileUploader.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/uploader/FileUploader.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/ExceptionUtil.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/ExceptionUtil.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileHashUtil.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileHashUtil.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/LogEnginer.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/LogEnginer.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/MonitorFileUtils.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/MonitorFileUtils.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/oss/BaseOSSHleper.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/oss/BaseOSSHleper.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/BaseResponse.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/BaseResponse.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/FileUploadChcekResponse.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/FileUploadChcekResponse.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory$ZskkExceptionFactoryHoler.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory$ZskkExceptionFactoryHoler.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/BaseResponseBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/BaseResponseBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadResponseBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadResponseBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/project.properties" afterPath="$PROJECT_DIR$/target/classes/project.properties" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseRemoveRunner.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/CurrentUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/CurrentUploadRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/ErrorRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/ErrorRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/HistoryUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/HistoryUploadRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/SuccessRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/SuccessRunner.class" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -113,68 +59,80 @@
       <file leaf-file-name="CurrentUploadRunner.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="23" column="35" lean-forward="false" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
+            <state relative-caret-position="60">
+              <caret line="8" column="46" lean-forward="false" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HistoryUploadRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java">
+      <file leaf-file-name="AbstractUpload.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="28" column="33" lean-forward="false" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="33" />
+            <state relative-caret-position="195">
+              <caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="23" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RetryCurrentUploadRunner.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java">
+      <file leaf-file-name="SuccessRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="30" column="45" lean-forward="false" selection-start-line="30" selection-start-column="45" selection-end-line="30" selection-end-column="45" />
+            <state relative-caret-position="552">
+              <caret line="39" column="60" lean-forward="false" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="60" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#652#653#0" expanded="true" />
-                <element signature="e#727#728#0" expanded="true" />
+                <element signature="e#243#244#0" expanded="true" />
+                <element signature="e#271#272#0" expanded="true" />
+                <element signature="e#325#326#0" expanded="true" />
+                <element signature="e#363#364#0" expanded="true" />
+                <element signature="e#410#411#0" expanded="true" />
+                <element signature="e#467#468#0" expanded="true" />
+                <element signature="e#509#510#0" expanded="true" />
+                <element signature="e#565#566#0" expanded="true" />
+                <element signature="e#618#619#0" expanded="true" />
+                <element signature="e#655#656#0" expanded="true" />
+                <element signature="e#713#714#0" expanded="true" />
+                <element signature="e#777#778#0" expanded="true" />
+                <element signature="e#856#857#0" expanded="true" />
+                <element signature="e#925#926#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RetryHistoryUploadRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="25" column="38" lean-forward="false" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SuccessRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
+      <file leaf-file-name="ErrorRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+            <state relative-caret-position="558">
+              <caret line="39" column="45" lean-forward="false" selection-start-line="39" selection-start-column="45" selection-end-line="39" selection-end-column="45" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#356#357#0" expanded="true" />
-                <element signature="e#420#421#0" expanded="true" />
-                <element signature="e#499#500#0" expanded="true" />
-                <element signature="e#568#569#0" expanded="true" />
+                <element signature="e#239#240#0" expanded="true" />
+                <element signature="e#267#268#0" expanded="true" />
+                <element signature="e#321#322#0" expanded="true" />
+                <element signature="e#357#358#0" expanded="true" />
+                <element signature="e#404#405#0" expanded="true" />
+                <element signature="e#459#460#0" expanded="true" />
+                <element signature="e#501#502#0" expanded="true" />
+                <element signature="e#555#556#0" expanded="true" />
+                <element signature="e#608#609#0" expanded="true" />
+                <element signature="e#643#644#0" expanded="true" />
+                <element signature="e#701#702#0" expanded="true" />
+                <element signature="e#763#764#0" expanded="true" />
+                <element signature="e#842#843#0" expanded="true" />
+                <element signature="e#910#911#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ErrorRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java">
+      <file leaf-file-name="AbstractRemove.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="16" column="45" lean-forward="false" selection-start-line="16" selection-start-column="45" selection-end-line="16" selection-end-column="45" />
+            <state relative-caret-position="90">
+              <caret line="6" column="19" lean-forward="false" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
               <folding />
             </state>
           </provider>
@@ -183,28 +141,52 @@
       <file leaf-file-name="RemoveFile2RetryRunner.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+            <state relative-caret-position="234">
+              <caret line="39" column="63" lean-forward="false" selection-start-line="39" selection-start-column="63" selection-end-line="39" selection-end-column="63" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#261#262#0" expanded="true" />
+                <element signature="e#289#290#0" expanded="true" />
+                <element signature="e#343#344#0" expanded="true" />
+                <element signature="e#390#391#0" expanded="true" />
+                <element signature="e#437#438#0" expanded="true" />
+                <element signature="e#503#504#0" expanded="true" />
+                <element signature="e#545#546#0" expanded="true" />
+                <element signature="e#610#611#0" expanded="true" />
+                <element signature="e#663#664#0" expanded="true" />
+                <element signature="e#709#710#0" expanded="true" />
+                <element signature="e#767#768#0" expanded="true" />
+                <element signature="e#840#841#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BaseCurrentRunner.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="120">
+              <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="StatRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
+      <file leaf-file-name="AddRetryHistory2QueueRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-108">
-              <caret line="107" column="51" lean-forward="false" selection-start-line="107" selection-start-column="51" selection-end-line="107" selection-end-column="51" />
+            <state relative-caret-position="60">
+              <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MonitorFileUtils.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
+      <file leaf-file-name="AddHistory2QueueRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="70">
-              <caret line="211" column="9" lean-forward="false" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
+            <state relative-caret-position="75">
+              <caret line="7" column="48" lean-forward="false" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
               <folding />
             </state>
           </provider>
@@ -213,10 +195,12 @@
       <file leaf-file-name="BaseRemoveRunner.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" column="9" lean-forward="true" selection-start-line="9" selection-start-column="8" selection-end-line="20" selection-end-column="9" />
+            <state relative-caret-position="990">
+              <caret line="66" column="26" lean-forward="false" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
               <folding>
                 <element signature="imports" expanded="true" />
+                <element signature="e#1406#1407#0" expanded="true" />
+                <element signature="e#1437#1438#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -278,7 +262,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/UploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IUpload.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/ErrorQueue.java" />
@@ -288,20 +271,21 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IRemove.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
       </list>
     </option>
   </component>
@@ -349,9 +333,9 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="14" />
-    <option name="y" value="23" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-36" />
+    <option name="y" value="24" />
     <option name="width" value="1440" />
     <option name="height" value="829" />
   </component>
@@ -371,10 +355,10 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -684,7 +668,10 @@
       <workItem from="1553258560432" duration="1655000" />
       <workItem from="1553260377761" duration="1786000" />
       <workItem from="1553262187986" duration="1785000" />
-      <workItem from="1553264000610" duration="1040000" />
+      <workItem from="1553264000610" duration="1674000" />
+      <workItem from="1553307146396" duration="538000" />
+      <workItem from="1553310925318" duration="1787000" />
+      <workItem from="1553312732767" duration="813000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -753,7 +740,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="120299000" />
+    <option name="totallyTimeSpent" value="124071000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -765,7 +752,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="14" y="23" width="1440" height="829" extended-state="0" />
+    <frame x="-36" y="24" width="1440" height="829" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -775,13 +763,13 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5762943" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4332425" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32331902" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33619457" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -853,13 +841,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="43" lean-forward="false" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileAction.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -941,7 +922,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="1" column="34" lean-forward="false" selection-start-line="1" selection-start-column="34" selection-end-line="1" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -964,7 +944,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="27" column="53" lean-forward="false" selection-start-line="27" selection-start-column="19" selection-end-line="27" selection-end-column="53" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -972,10 +951,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="555">
           <caret line="48" column="227" lean-forward="false" selection-start-line="48" selection-start-column="213" selection-end-line="48" selection-end-column="227" />
-          <folding>
-            <element signature="e#2198#2199#0" expanded="false" />
-            <element signature="e#2243#2244#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,7 +972,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="492">
           <caret line="60" column="29" lean-forward="false" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1050,18 +1024,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="36" column="24" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1076,7 +1042,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1084,7 +1049,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="780">
           <caret line="64" column="37" lean-forward="false" selection-start-line="64" selection-start-column="37" selection-end-line="64" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1092,7 +1056,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
           <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="96" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1100,7 +1063,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="8580">
           <caret line="613" column="34" lean-forward="false" selection-start-line="613" selection-start-column="18" selection-end-line="613" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1108,9 +1070,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
           <caret line="14" column="28" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1118,7 +1077,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="10" lean-forward="false" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1126,134 +1084,184 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="11" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="7" column="48" lean-forward="false" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
+        <state relative-caret-position="1545">
+          <caret line="107" column="51" lean-forward="false" selection-start-line="107" selection-start-column="51" selection-end-line="107" selection-end-column="51" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="36" lean-forward="false" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="36" />
+        <state relative-caret-position="3060">
+          <caret line="211" column="9" lean-forward="false" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="19" lean-forward="false" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="27" />
-          <folding />
+        <state relative-caret-position="225">
+          <caret line="23" column="21" lean-forward="false" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="11" column="105" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="105" />
-          <folding />
+        <state relative-caret-position="249">
+          <caret line="24" column="12" lean-forward="false" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="9" lean-forward="true" selection-start-line="9" selection-start-column="8" selection-end-line="20" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="309">
+          <caret line="31" column="76" lean-forward="false" selection-start-line="31" selection-start-column="76" selection-end-line="31" selection-end-column="76" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="23" column="35" lean-forward="false" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
+        <state relative-caret-position="465">
+          <caret line="36" column="24" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="28" column="33" lean-forward="false" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="33" />
+        <state relative-caret-position="75">
+          <caret line="7" column="48" lean-forward="false" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#356#357#0" expanded="true" />
-            <element signature="e#420#421#0" expanded="true" />
-            <element signature="e#499#500#0" expanded="true" />
-            <element signature="e#568#569#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="60">
+          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="16" column="45" lean-forward="false" selection-start-line="16" selection-start-column="45" selection-end-line="16" selection-end-column="45" />
+        <state relative-caret-position="90">
+          <caret line="6" column="19" lean-forward="false" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+        <state relative-caret-position="60">
+          <caret line="8" column="46" lean-forward="false" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-108">
-          <caret line="107" column="51" lean-forward="false" selection-start-line="107" selection-start-column="51" selection-end-line="107" selection-end-column="51" />
+        <state relative-caret-position="195">
+          <caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="70">
-          <caret line="211" column="9" lean-forward="false" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
-          <folding />
+        <state relative-caret-position="990">
+          <caret line="66" column="26" lean-forward="false" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1406#1407#0" expanded="true" />
+            <element signature="e#1437#1438#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="25" column="38" lean-forward="false" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
-          <folding />
+        <state relative-caret-position="558">
+          <caret line="39" column="45" lean-forward="false" selection-start-line="39" selection-start-column="45" selection-end-line="39" selection-end-column="45" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#239#240#0" expanded="true" />
+            <element signature="e#267#268#0" expanded="true" />
+            <element signature="e#321#322#0" expanded="true" />
+            <element signature="e#357#358#0" expanded="true" />
+            <element signature="e#404#405#0" expanded="true" />
+            <element signature="e#459#460#0" expanded="true" />
+            <element signature="e#501#502#0" expanded="true" />
+            <element signature="e#555#556#0" expanded="true" />
+            <element signature="e#608#609#0" expanded="true" />
+            <element signature="e#643#644#0" expanded="true" />
+            <element signature="e#701#702#0" expanded="true" />
+            <element signature="e#763#764#0" expanded="true" />
+            <element signature="e#842#843#0" expanded="true" />
+            <element signature="e#910#911#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="552">
+          <caret line="39" column="60" lean-forward="false" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="60" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#243#244#0" expanded="true" />
+            <element signature="e#271#272#0" expanded="true" />
+            <element signature="e#325#326#0" expanded="true" />
+            <element signature="e#363#364#0" expanded="true" />
+            <element signature="e#410#411#0" expanded="true" />
+            <element signature="e#467#468#0" expanded="true" />
+            <element signature="e#509#510#0" expanded="true" />
+            <element signature="e#565#566#0" expanded="true" />
+            <element signature="e#618#619#0" expanded="true" />
+            <element signature="e#655#656#0" expanded="true" />
+            <element signature="e#713#714#0" expanded="true" />
+            <element signature="e#777#778#0" expanded="true" />
+            <element signature="e#856#857#0" expanded="true" />
+            <element signature="e#925#926#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="30" column="45" lean-forward="false" selection-start-line="30" selection-start-column="45" selection-end-line="30" selection-end-column="45" />
+        <state relative-caret-position="234">
+          <caret line="39" column="63" lean-forward="false" selection-start-line="39" selection-start-column="63" selection-end-line="39" selection-end-column="63" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#652#653#0" expanded="true" />
-            <element signature="e#727#728#0" expanded="true" />
+            <element signature="e#261#262#0" expanded="true" />
+            <element signature="e#289#290#0" expanded="true" />
+            <element signature="e#343#344#0" expanded="true" />
+            <element signature="e#390#391#0" expanded="true" />
+            <element signature="e#437#438#0" expanded="true" />
+            <element signature="e#503#504#0" expanded="true" />
+            <element signature="e#545#546#0" expanded="true" />
+            <element signature="e#610#611#0" expanded="true" />
+            <element signature="e#663#664#0" expanded="true" />
+            <element signature="e#709#710#0" expanded="true" />
+            <element signature="e#767#768#0" expanded="true" />
+            <element signature="e#840#841#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 0 - 5
logs/sys.log

@@ -1,8 +1,3 @@
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
 Dicom dir monitor...
 --------------------------------------------------
 Monitoring directory:/Users/fuyu/Desktop/zzp/test/src

+ 49 - 6
src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java

@@ -8,19 +8,62 @@ public abstract class BaseRemoveRunner extends AbstractRemove implements Runnabl
     @Override
     public void run() {
         while (true) {
-            boolean flag = remove();
-            Configs.sysLog.info("--文件移动队列-- :" + getQueueName() + "\t 移动结果:" + flag + "\n队列长度:" + size());
             try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(empty() || !flag ) {
-                    TimeUnit.SECONDS.sleep(10);
+                while (empty()) {
+                    printEmptyAndSleep();
+                    if(exit()) {
+                        return;
+                    }
+                }
+                if(remove()) {
+                    printSuccessAndSleep();
+                } else {
+                    printFailAndSleep();
                 }
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
         }
     }
+    private int MIN_FAIL_SLEEP_TIME = 1;
+    private int MAX_FAIL_SLEEP_TIME = 5;
+    private int failSleepTime = 0;
+
+    private int MIN_EMPTY_SLEEP_TIME = 10;
+    private int MAX_EMPTY_SLEEP_TIME = 60;
+    private int emptySleepTime = 0;
+
+    protected abstract boolean exit();
+
+    protected void printFailAndSleep() throws InterruptedException {
+        Configs.sysLog.warn(getRunnerName() + ": " + action() + " fail");
+        if(failSleepTime < MAX_FAIL_SLEEP_TIME) {
+            failSleepTime += MIN_FAIL_SLEEP_TIME;
+        }
+        TimeUnit.SECONDS.sleep(failSleepTime);
+    }
+
+    protected abstract String getRunnerName();
+
+    private String action() {
+        return "upload";
+    }
+
+    protected void printSuccessAndSleep() {
+        Configs.sysLog.info(getRunnerName() + ": " + action() + " success!" + getQueueName() + " size :" + size());
+        failSleepTime = 0;
+        emptySleepTime = 0;
+    }
+
+    protected void printEmptyAndSleep() throws InterruptedException {
+        Configs.sysLog.warn(getRunnerName() + ": " + getQueueName() + " is empty");
+        if(emptySleepTime < MAX_EMPTY_SLEEP_TIME) {
+            emptySleepTime += MIN_EMPTY_SLEEP_TIME;
+        }
+        TimeUnit.SECONDS.sleep(emptySleepTime);
+    }
+
     protected abstract boolean empty();
-    protected abstract boolean size();
+    protected abstract int size();
     protected abstract String getQueueName();
 }

+ 10 - 6
src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java

@@ -16,18 +16,22 @@ public class CurrentUploadRunner extends AbstractUpload implements Runnable{
     protected String getUploadFilePath() {
         return (String) CurrentUploadQueue.getInstance().pop();
     }
-
     @Override
     public void run() {
         while(true) {
-            boolean flag = upload();
-            Configs.sysLog.info("--上传队列-- : CurrentUploadQueue \t 上传结果:" + flag + "\n队列长度:" + CurrentUploadQueue.getInstance().size());
             try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(CurrentUploadQueue.getInstance().empty() || flag) {
-                    Configs.sysLog.info("upload error or CurrentUploadQueue is empty");
+                if(CurrentUploadQueue.getInstance().empty()) {
+                    Configs.sysLog.warn("CurrentUploadQueue is empty");
+                    TimeUnit.SECONDS.sleep(1);
+                }
+                if(upload()) {
+                    Configs.sysLog.info("CurrentUploadRunner upload success ");
+                    TimeUnit.MILLISECONDS.sleep(10);
+                } else {
+                    Configs.sysLog.warn("CurrentUploadRunner upload error ");
                     TimeUnit.SECONDS.sleep(1);
                 }
+
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }

+ 26 - 19
src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java

@@ -1,12 +1,35 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.queue.ErrorQueue;
 import com.zskk.dicom.monitor.utils.MonitorFileUtils;
 
-import java.util.concurrent.TimeUnit;
+public class ErrorRunner extends BaseRemoveRunner {
+
+    @Override
+    protected boolean exit() {
+        return false;
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "ErrorRunner";
+    }
+
+    @Override
+    protected boolean empty() {
+        return ErrorQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return ErrorQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "ErrorQueue";
+    }
 
-public class ErrorRunner extends AbstractRemove implements Runnable{
     @Override
     protected String getSourceFilePath() {
         return (String) ErrorQueue.getInstance().pop();
@@ -16,20 +39,4 @@ public class ErrorRunner extends AbstractRemove implements Runnable{
     protected String getTargetFilePath(String sourceFilePath) {
         return MonitorFileUtils.getErrorPath(sourceFilePath);
     }
-
-    @Override
-    public void run() {
-        while (true) {
-            boolean flag = remove();
-            Configs.sysLog.info("--文件移动队列-- ErrorQueue: \t 移动结果:" + flag + "\n队列长度:" + ErrorQueue.getInstance().size());
-            try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(ErrorQueue.getInstance().empty() || !flag ) {
-                    TimeUnit.SECONDS.sleep(10);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
 }

+ 7 - 5
src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java

@@ -22,14 +22,16 @@ public class HistoryUploadRunner extends AbstractUpload implements Runnable{
     @Override
     public void run() {
         while(true) {
-            boolean flag = upload();
-            Configs.sysLog.info("--老上传队列-- : OldUploadQueue \t 上传结果:" + flag + "\n队列长度:" + OldUploadQueue.getInstance().size());
             try {
-                TimeUnit.MILLISECONDS.sleep(10);
                 if(OldUploadQueue.getInstance().empty()) {
-                   return;
+                    Configs.sysLog.warn("OldUploadQueue is empty");
+                    return;
                 }
-                if(!flag) {
+                if(upload()) {
+                    Configs.sysLog.info("HistoryUploadRunner upload success");
+                    TimeUnit.MILLISECONDS.sleep(10);
+                } else {
+                    Configs.sysLog.warn("HistoryUploadRunner upload fail");
                     TimeUnit.SECONDS.sleep(1);
                 }
             } catch (InterruptedException e) {

+ 26 - 19
src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java

@@ -1,12 +1,35 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.queue.RemoveFile2RetryQueue;
 import com.zskk.dicom.monitor.utils.MonitorFileUtils;
 
-import java.util.concurrent.TimeUnit;
+public class RemoveFile2RetryRunner extends BaseRemoveRunner {
+
+    @Override
+    protected boolean exit() {
+        return false;
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "RemoveFile2RetryRunner";
+    }
+
+    @Override
+    protected boolean empty() {
+        return RemoveFile2RetryQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return RemoveFile2RetryQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "RemoveFile2RetryQueue";
+    }
 
-public class RemoveFile2RetryRunner extends AbstractRemove implements Runnable{
     @Override
     protected String getSourceFilePath() {
         return (String) RemoveFile2RetryQueue.getInstance().pop();
@@ -16,20 +39,4 @@ public class RemoveFile2RetryRunner extends AbstractRemove implements Runnable{
     protected String getTargetFilePath(String sourceFilePath) {
         return MonitorFileUtils.getRetryFilePath(sourceFilePath);
     }
-
-    @Override
-    public void run() {
-        while (true) {
-            boolean flag = remove();
-            Configs.sysLog.info("--文件移动队列-- RemoveFile2RetryQueue: \t 移动结果:" + flag + "\n队列长度:" + RemoveFile2RetryQueue.getInstance().size());
-            try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(RemoveFile2RetryQueue.getInstance().empty() || !flag ) {
-                    TimeUnit.SECONDS.sleep(10);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
 }

+ 9 - 5
src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java

@@ -22,14 +22,18 @@ public class RetryCurrentUploadRunner extends AbstractUpload implements Runnable
     @Override
     public void run() {
         while(true) {
-            boolean flag = upload();
-            Configs.sysLog.info("--重试上传队列-- : CurrentRetryUploadQueue \t 上传结果:" + flag + "\n队列长度:" + CurrentRetryUploadQueue.getInstance().size());
             try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(CurrentRetryUploadQueue.getInstance().empty() || !flag) {
-                    Configs.sysLog.info("upload error or CurrentRetryUploadQueue is empty");
+                if(CurrentRetryUploadQueue.getInstance().empty()) {
+                    Configs.sysLog.warn("CurrentRetryUploadQueue is empty");
                     TimeUnit.SECONDS.sleep(10);
                 }
+                if(upload()) {
+                    Configs.sysLog.info("RetryCurrentUploadRunner upload success");
+                    TimeUnit.MILLISECONDS.sleep(10);
+                } else {
+                    Configs.sysLog.warn("RetryCurrentUploadRunner upload fail");
+                    TimeUnit.SECONDS.sleep(1);
+                }
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }

+ 7 - 4
src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java

@@ -23,13 +23,16 @@ public class RetryHistoryUploadRunner extends AbstractUpload implements Runnable
     public void run() {
         while(true) {
             boolean flag = upload();
-            Configs.sysLog.info("--老重试上传队列-- : OldRetryQueue \t 上传结果:" + flag + "\n队列长度:" + OldRetryQueue.getInstance().size());
             try {
-                TimeUnit.MILLISECONDS.sleep(10);
                 if(OldRetryQueue.getInstance().empty()) {
-                   return;
+                    Configs.sysLog.warn("OldRetryQueue is empty");
+                    return;
                 }
-                if(!flag) {
+                if(upload()) {
+                    Configs.sysLog.warn("RetryHistoryUploadRunner is success");
+                    TimeUnit.MILLISECONDS.sleep(10);
+                } else {
+                    Configs.sysLog.warn("RetryHistoryUploadRunner is fail");
                     TimeUnit.SECONDS.sleep(1);
                 }
             } catch (InterruptedException e) {

+ 26 - 19
src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java

@@ -1,12 +1,35 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.queue.SuccessQueue;
 import com.zskk.dicom.monitor.utils.MonitorFileUtils;
 
-import java.util.concurrent.TimeUnit;
+public class SuccessRunner extends BaseRemoveRunner {
+
+    @Override
+    protected boolean exit() {
+        return false;
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "SuccessRunner";
+    }
+
+    @Override
+    protected boolean empty() {
+        return SuccessQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return SuccessQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "SuccessQueue";
+    }
 
-public class SuccessRunner extends AbstractRemove implements Runnable{
     @Override
     protected String getSourceFilePath() {
         return (String) SuccessQueue.getInstance().pop();
@@ -16,20 +39,4 @@ public class SuccessRunner extends AbstractRemove implements Runnable{
     protected String getTargetFilePath(String sourceFilePath) {
         return MonitorFileUtils.getBackupPath(sourceFilePath);
     }
-
-    @Override
-    public void run() {
-        while (true) {
-            boolean flag = remove();
-            Configs.sysLog.info("--文件移动队列-- SuccessQueue: \t 移动结果:" + flag + "\n队列长度:" + SuccessQueue.getInstance().size());
-            try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(SuccessQueue.getInstance().empty() || !flag ) {
-                    TimeUnit.SECONDS.sleep(10);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
 }

TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/BaseRemoveRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/CurrentUploadRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/ErrorRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/HistoryUploadRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.class


TEMPAT SAMPAH
target/classes/com/zskk/dicom/monitor/runner/SuccessRunner.class