测

.idea/workspace.xml

@@ -5,7 +5,13 @@
     <option name="GROUP_BY_SEVERITY" value="true" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="582764bc-f4d5-49fa-89c5-ed5a1070192f" name="Default" comment="" />
+    <list default="true" id="582764bc-f4d5-49fa-89c5-ed5a1070192f" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/UploaderZskkApplication.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/StatRunner.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/uploader/FileUploadsOss.class" beforeDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,13 +27,27 @@
   <component name="CompilerWorkspaceConfiguration">
     <option name="MAKE_PROJECT_ON_SAVE" value="true" />
   </component>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand />
+    <select />
+  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="StatRunner.java" pinned="false" current-in-tab="true">
         <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="125">
-              <caret line="65" column="7" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
+            <state relative-caret-position="503">
+              <caret line="69" column="10" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -92,7 +112,7 @@
       <file leaf-file-name="HistoryFileQuenuRunner.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="925">
+            <state relative-caret-position="556">
               <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -101,18 +121,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FileUploadsOss.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1325">
-              <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -155,12 +163,12 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.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/MonitorFileUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/RetryUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
       </list>
     </option>
@@ -210,10 +218,10 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="20" />
-    <option name="y" value="58" />
-    <option name="width" value="1608" />
-    <option name="height" value="1004" />
+    <option name="x" value="805" />
+    <option name="y" value="94" />
+    <option name="width" value="1661" />
+    <option name="height" value="1047" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -450,7 +458,7 @@
       <workItem from="1552959048285" duration="16360000" />
       <workItem from="1553046095420" duration="17775000" />
       <workItem from="1553132992622" duration="14255000" />
-      <workItem from="1553156098317" duration="1406000" />
+      <workItem from="1553156098317" duration="2998000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -491,7 +499,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="91718000" />
+    <option name="totallyTimeSpent" value="93310000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -503,7 +511,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32867134" />
@@ -511,20 +520,20 @@
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5021322" side_tool="true" visible="true" weight="0.3971079" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.084754795" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.39339018" side_tool="true" visible="true" weight="0.2502781" />
+      <window_info anchor="right" id="Maven Projects" order="3" weight="0.15618336" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4978678" visible="true" weight="0.3971079" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4978678" weight="0.18020022" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.34498835" />
       <window_info anchor="bottom" id="Spring" order="7" weight="0.32983682" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32983682" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.6066098" visible="true" weight="0.2502781" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1684435" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1684435" />
       <window_info anchor="bottom" id="Problems" order="7" weight="0.32983682" />
-      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" visible="true" weight="0.25" />
       <window_info id="UI Designer" order="2" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8937628" weight="0.13915095" />
@@ -586,6 +595,10 @@
       <option name="time" value="12" />
     </breakpoint-manager>
   </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="jar://D:/Java/jdk1.8.0_121/src.zip!/java/util/concurrent/ExecutorService.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -827,6 +840,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="400">
           <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -834,6 +850,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="475">
           <caret line="19" column="70" selection-start-line="19" selection-start-column="70" selection-end-line="19" selection-end-column="70" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -894,26 +913,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1325">
-          <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="925">
-          <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1500">
@@ -975,10 +974,30 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="556">
+          <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <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="125">
-          <caret line="65" column="7" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
+        <state relative-caret-position="503">
+          <caret line="69" column="10" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java

@@ -55,25 +55,22 @@ public class StatRunner {
 
         //老上传
         oldUploadPools = generatePools(oldUploadPools, 2);
-<<<<<<< HEAD
         oldUploadPools.execute(new OldUploadRunner());
         // oldUploadPools.execute(new FileUploadsOss(UploadsQueue.fileQueue));
-=======
        // oldUploadPools.execute(new OldUploadRunner());
-        oldUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_UPLOAD));
->>>>>>> 4568992786326f0022b942a2e8ae1f026ebec819
+      //  oldUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_UPLOAD));
+
         //新上传
         currentUploadPools = generatePools(currentUploadPools, 2);
         currentUploadPools.execute(new CurrentUploadRunner());
         //重试上传
         retryUploadPools = generatePools(retryUploadPools, 2);
-<<<<<<< HEAD
+
        retryUploadPools.execute(new RetryUploadRunner());
-       //   retryUploadPools.execute(new FileUploadsOss(UploadsQueue.failFileQueue));
-=======
+        // retryUploadPools.execute(new FileUploadsOss(UploadsQueue.failFileQueue));
        // retryUploadPools.execute(new RetryUploadRunner());
-        retryUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_RETRY));
->>>>>>> 4568992786326f0022b942a2e8ae1f026ebec819
+       // retryUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_RETRY));
+
     }
     public static ExecutorService generatePools(ExecutorService oldPool, int length) {
         if (oldPool != null && !oldPool.isTerminated()) {

src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java

@@ -1,90 +0,0 @@
-package com.zskk.dicom.monitor.uploader;
-
-import com.zskk.dicom.monitor.config.Configs;
-
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-public class FileUploadsOss implements Runnable{
-<<<<<<< HEAD
-     List<File> list;
-    public FileUploadsOss(List<File> list){
-        this.list = list;
-
-=======
-    public final static String FLAG_UPLOAD = "FLAG_UPLOAD";
-    public final static String FLAG_RETRY = "FLAG_RETRY";
-    private String flag = null;
-    public FileUploadsOss(String flag){
-        this.flag = flag;
->>>>>>> 4568992786326f0022b942a2e8ae1f026ebec819
-    }
-    @Override
-    public void run() {
-        while(true){
-            boolean flag = upload();
-            Configs.sysLog.info("--list -- System upload flag:" + flag + "\n Filelist.size：" + list.size());
-
-                try {
-                    if(flag) {
-                         TimeUnit.MILLISECONDS.sleep(10);
-                    }
-                    else {
-                        TimeUnit.SECONDS.sleep(1);
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-
-        }
-
-    }
-
-    public synchronized  boolean upload() {
-        boolean flag = false;
-        File file = null;
-            try{
-               // List<File> fileQueue = UploadsQueue.fileQueue;
-                // 从队列中移除已完成任务
-                // if(list.size() > 0) {
-                //     System.out.println("老文件"+list.size()+"-----------------------");
-                //     File file = list.remove(0);
-                    //上传
-
-                    if (FLAG_UPLOAD.equals(flag)){ // 上传
-                        System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-                        file = UploadsQueue.fileQueue.remove(0);
-                        FileUploader_two.upload(file);
-                    }
-<<<<<<< HEAD
-                    if (list.equals(UploadsQueue.fileQueue)){
-=======
-                    if (FLAG_RETRY.equals(flag)){ // 重试上传
->>>>>>> 4568992786326f0022b942a2e8ae1f026ebec819
-                        System.out.println("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
-                        file = UploadsQueue.failFileQueue.remove(0);
-                        FileUploader.upload(file);
-                    }
-<<<<<<< HEAD
-                 //   if (list.equals(UploadsQueue.))
-=======
-                    // if (list.equals(UploadsQueue.failFileQueue)){
-                    //     System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-                    //     FileUploader_two.upload(file);
-                    // }else if (list.equals(UploadsQueue.fileQueue)){
-                    //     System.out.println("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
-                    //     FileUploader.upload(file);
-                    // }
->>>>>>> 4568992786326f0022b942a2e8ae1f026ebec819
-
-                    flag = true;
-                // }
-            }catch(Throwable e) {
-
-        }
-
-        return flag;
-    }
-
-}

target/classes/META-INF/spring-autoconfigure-metadata.properties

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-#Thu Mar 21 15:13:26 CST 2019
-=======
-#Thu Mar 21 14:03:28 CST 2019
->>>>>>> 4568992786326f0022b942a2e8ae1f026ebec819
+#Thu Mar 21 17:05:00 CST 2019
 com.zskk.dicom.UploaderZskkApplication.Configuration=
 com.zskk.dicom.UploaderZskkApplication=