Ver Fonte

修改创建文件路径

zhangzhanping há 6 anos atrás
pai
commit
e695651d8b

+ 154 - 93
.idea/workspace.xml

@@ -6,11 +6,15 @@
   </component>
   <component name="ChangeListManager">
     <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" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/project.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/project.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/InitMonitor.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/InitMonitor.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/project.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/project.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -43,10 +47,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="StatRunner.java" pinned="false" current-in-tab="true">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="503">
+            <state relative-caret-position="-50">
               <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" />
@@ -55,29 +59,53 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MonitorFileUtils.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="MonitorFileUtils.java" pinned="false" current-in-tab="true">
         <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="2975">
-              <caret line="125" column="25" selection-start-line="125" selection-start-column="15" selection-end-line="125" selection-end-column="25" />
+            <state relative-caret-position="508">
+              <caret line="70" column="45" selection-start-line="70" selection-start-column="39" selection-end-line="70" selection-end-column="45" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FileMover.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
+      <file leaf-file-name="UploaderZskkApplication.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-575">
-              <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+            <state relative-caret-position="449">
+              <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InitMonitor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="141">
+              <caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="project.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret column="18" selection-start-column="8" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FileUploader.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java">
+      <file leaf-file-name="Configs.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1500">
-              <caret line="60" column="63" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="63" />
+            <state relative-caret-position="290">
+              <caret line="117" column="71" selection-start-line="117" selection-start-column="71" selection-end-line="117" selection-end-column="71" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -85,11 +113,20 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="FileMover.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="675">
+              <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="FileUploader_two.java" pinned="false" current-in-tab="false">
         <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="1225">
-              <caret line="49" column="64" selection-start-line="49" selection-start-column="64" selection-end-line="49" selection-end-column="64" />
+            <state relative-caret-position="446">
+              <caret line="49" column="63" selection-start-line="49" selection-start-column="63" selection-end-line="49" selection-end-column="63" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -143,12 +180,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/CopyFile.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileHashUtil.java" />
@@ -163,13 +197,16 @@
         <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/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" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java" />
       </list>
     </option>
   </component>
@@ -217,11 +254,11 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="805" />
-    <option name="y" value="94" />
-    <option name="width" value="1661" />
-    <option name="height" value="1047" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="136" />
+    <option name="y" value="12" />
+    <option name="width" value="1719" />
+    <option name="height" value="1030" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -314,6 +351,23 @@
               <item name="monitor" type="462c0819:PsiDirectoryNode" />
               <item name="uploader" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="uploader-zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dicom" type="462c0819:PsiDirectoryNode" />
+              <item name="monitor" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="uploader-zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -458,7 +512,7 @@
       <workItem from="1552959048285" duration="16360000" />
       <workItem from="1553046095420" duration="17775000" />
       <workItem from="1553132992622" duration="14255000" />
-      <workItem from="1553156098317" duration="2998000" />
+      <workItem from="1553156098317" duration="6885000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -495,11 +549,18 @@
       <option name="project" value="LOCAL" />
       <updated>1553156644068</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="测">
+      <created>1553159162510</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1553159162510</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="93310000" />
+    <option name="totallyTimeSpent" value="97197000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -511,7 +572,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="136" y="12" width="1719" height="1030" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -520,20 +581,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.39339018" side_tool="true" visible="true" weight="0.2502781" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.121157326" side_tool="true" visible="true" weight="0.31042382" />
       <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 anchor="bottom" id="Run" order="2" sideWeight="0.4978678" weight="0.18020022" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.87884265" visible="true" weight="0.31042382" />
       <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" sideWeight="0.6066098" visible="true" weight="0.2502781" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.90777576" weight="0.096219935" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info active="true" 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.1904762" />
       <window_info anchor="bottom" id="Problems" order="7" weight="0.32983682" />
       <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" visible="true" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" visible="true" weight="0.17420132" />
       <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" />
@@ -707,13 +768,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="50">
-          <caret line="2" column="20" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/CopyFile.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="272">
@@ -873,36 +927,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="126" column="6" lean-forward="true" selection-start-line="126" selection-start-column="6" selection-end-line="126" selection-end-column="6" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="454">
-          <caret line="31" column="23" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-514">
@@ -950,60 +974,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java">
+    <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="1225">
-          <caret line="49" column="64" selection-start-line="49" selection-start-column="64" selection-end-line="49" selection-end-column="64" />
+        <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/utils/MonitorFileUtils.java">
+    <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="2975">
-          <caret line="125" column="25" selection-start-line="125" selection-start-column="15" selection-end-line="125" selection-end-column="25" />
+        <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/uploader/FileMover.java">
+    <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="-575">
-          <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+        <state relative-caret-position="446">
+          <caret line="49" column="63" selection-start-line="49" selection-start-column="63" selection-end-line="49" selection-end-column="63" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.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="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" />
+        <state relative-caret-position="-50">
+          <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>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.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" />
+        <state relative-caret-position="290">
+          <caret line="117" column="71" selection-start-line="117" selection-start-column="71" selection-end-line="117" selection-end-column="71" />
           <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">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="141">
+          <caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="18" selection-start-column="8" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="449">
+          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <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="508">
+          <caret line="70" column="45" selection-start-line="70" selection-start-column="39" selection-end-line="70" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 65 - 0
logs/sys.log

@@ -183,3 +183,68 @@ Dicom dir monitor...
 Monitoring directory:D:\zskk\zskk_system
 --------------------------------------------------
 
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\zskk\zskk_system
+--------------------------------------------------
+

+ 7 - 2
src/main/java/com/zskk/dicom/monitor/config/Configs.java

@@ -112,6 +112,11 @@ public class Configs {
             // 去掉路径最后一个路径分隔符
             monitorDir = monitorDir.substring(0, monitorDir.lastIndexOf(File.separator));
         }
+        monitorBackDir = rb.getString("monitor.monitorBackDir");
+        if (monitorBackDir.endsWith(File.separator)) {
+            // 去掉路径最后一个路径分隔符
+            monitorBackDir = monitorBackDir.substring(0, monitorBackDir.lastIndexOf(File.separator));
+        }
         monitorRetryDir = rb.getString("monitor.monitorRetryDir");
         if (monitorRetryDir.endsWith(File.separator)) {
             // 去掉路径最后一个路径分隔符
@@ -122,9 +127,9 @@ public class Configs {
             // 去掉路径最后一个路径分隔符
             eorrRetryDir = eorrRetryDir.substring(0, eorrRetryDir.lastIndexOf(File.separator));
         }
-        monitorBackDir = monitorDir + "_back";
+    /*  monitorBackDir = monitorDir + "_back";
         monitorRetryDir=monitorDir+"_Retry";
-        eorrRetryDir=monitorDir+"_Eorr";
+        eorrRetryDir=monitorDir+"_Eorr";*/
         postHost = rb.getString("monitor.postHost");
         postUri = rb.getString("monitor.postUri");
         postPort = Integer.parseInt(rb.getString("monitor.postPort"));

+ 19 - 7
src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java

@@ -1,7 +1,6 @@
 package com.zskk.dicom.monitor.schedules;
 
 import com.zskk.dicom.monitor.config.Configs;
-import com.zskk.dicom.monitor.utils.MonitorFileUtils;
 
 import java.io.File;
 
@@ -12,12 +11,25 @@ public class InitMonitor {
     public static void start() {
         Configs.sysLog.info("Dicom monitor check waiting files ...");
         //读取监听文件
-        File monitorDir = new File(Configs.monitorDir);
+         File monitorBackDir = new File(Configs.monitorBackDir);
+        File monitorRetryDir = new File(Configs.monitorRetryDir);
+        File eorrRetryDir = new File(Configs.eorrRetryDir);
+         if (!monitorBackDir.exists()){
+             monitorBackDir.mkdirs();
+        }
+        if (!monitorRetryDir.exists()){
+            monitorRetryDir.mkdirs();
+        }
+        if (!eorrRetryDir.exists()){
+            eorrRetryDir.mkdirs();
+        }
         //创建备份文件夹
-         MonitorFileUtils.touchBackDir(monitorDir);
-         File monitorRetryDir = new File(Configs.monitorRetryDir);
-         MonitorFileUtils.touchRetryDir(monitorRetryDir);
-         File eorrRetryDir = new File(Configs.eorrRetryDir);
-         MonitorFileUtils.touchEorrDir(eorrRetryDir);
+         //MonitorFileUtils.touchBackDir(monitorDir);
+
+        monitorRetryDir.mkdirs();
+         //MonitorFileUtils.touchRetryDir(monitorRetryDir);
+
+        eorrRetryDir.mkdirs();
+        // MonitorFileUtils.touchEorrDir(eorrRetryDir);
     }
 }

+ 3 - 2
src/main/resources/project.properties

@@ -1,6 +1,7 @@
 monitor.monitorDir=D:\\zskk\\zskk_system
-monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry
-monitor.eorrRetryDir=D:\\zskk\\zskk_system_eorr
+monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
+monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
+monitor.eorrRetryDir=D:\\zskk\\zskk_system_eorr12
 monitor.hospitalId=73090001
 monitor.postHost=api.pacsonline.cn
 monitor.postPort=80

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

@@ -1,3 +1,3 @@
-#Thu Mar 21 17:05:00 CST 2019
+#Thu Mar 21 18:41:06 CST 2019
 com.zskk.dicom.UploaderZskkApplication.Configuration=
 com.zskk.dicom.UploaderZskkApplication=

BIN
target/classes/com/zskk/dicom/monitor/config/Configs.class


BIN
target/classes/com/zskk/dicom/monitor/schedules/InitMonitor.class


+ 3 - 2
target/classes/project.properties

@@ -1,6 +1,7 @@
 monitor.monitorDir=D:\\zskk\\zskk_system
-monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry
-monitor.eorrRetryDir=D:\\zskk\\zskk_system_eorr
+monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
+monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
+monitor.eorrRetryDir=D:\\zskk\\zskk_system_eorr12
 monitor.hospitalId=73090001
 monitor.postHost=api.pacsonline.cn
 monitor.postPort=80