123

src/main/java/com/zskk/dicom/UploaderZskkApplication.java

@@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @Configuration
 @CacheEvict(allEntries = true)
 public class UploaderZskkApplication {
-
+    public static StringBuilder sb = new StringBuilder();
     public UploaderZskkApplication() {
         Configs.sysLog.info("new WebStarts()...");
     }
@@ -22,8 +22,8 @@ public class UploaderZskkApplication {
         SpringApplication springApplication = new SpringApplication(UploaderZskkApplication.class);
         // 初始化配置信息
         Configs.initConfig();
-        StringBuilder sb = new StringBuilder();
-        sb.append("Dicom dir monitor...\n");
+
+        sb.append("1Dicom dir monitor...\n");
         sb.append("--------------------------------------------------\n");
         sb.append("Monitoring directory:" + Configs.monitorDir + "\n");
         sb.append("--------------------------------------------------\n");
@@ -32,4 +32,6 @@ public class UploaderZskkApplication {
         InitMonitor.start();
         StatRunner.start();
     }
+
+
 }

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

@@ -1,15 +1,15 @@
 package com.zskk.dicom.monitor.schedules;
 
+import com.zskk.dicom.UploaderZskkApplication;
 import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.utils.MonitorFileUtils;
 
 public class InitMonitor {
     /**
-     * 系统启动时，将目录中的图片进行上传处理
+     * 系统启动时，创建目录
      */
     public static void start() {
         Configs.sysLog.info("Dicom monitor check waiting files ...");
-
         // 创建备份文件夹 重试文件夹 错误文件夹
         boolean flag = MonitorFileUtils.createDirs(new String[] {
                 Configs.monitorBackDir,
@@ -17,26 +17,5 @@ public class InitMonitor {
                 Configs.errorDir
         });
 
-        //读取监听文件
-//        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);
-
-          // monitorRetryDir.mkdirs();
-         // MonitorFileUtils.touchRetryDir(monitorRetryDir);
-
-         // eorrRetryDir.mkdirs();
-        // MonitorFileUtils.touchEorrDir(eorrRetryDir);
     }
 }

src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java

@@ -37,6 +37,7 @@ public class MonitorFileUtils {
 				}
 			}
 		}else{
+			Configs.sysLog.info("The directory is not exist!".toString());
 			System.out.println("The directory is not exist!");
 		}
 	}
@@ -67,6 +68,7 @@ public class MonitorFileUtils {
 		}
 		File file = new File(dir);
 		if(!file.exists()) {
+
 			return file.mkdirs();
 		}
 		return true;

src/main/resources/project.properties

@@ -1,11 +1,11 @@
-#monitor.monitorDir=D:\\zskk\\zskk_system
-#monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
-#monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
-#monitor.errorDir=D:\\zskk\\zskk_system_eorr12
-monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
-monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
-monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
-monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
+monitor.monitorDir=D:\\zskk\\zskk_system
+monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
+monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
+monitor.errorDir=D:\\zskk\\zskk_system_eorr12
+#monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
+#monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
+#monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
+#monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
 monitor.hospitalId=test_zzp
 #73090001
 monitor.postHost=api.pacsonline.cn
@@ -21,4 +21,5 @@ monitor.oss.region=oss-cn-beijing
 monitor.oss.endpoint=oss-cn-beijing.aliyuncs.com
 monitor.oss.scheme=dicomweb
 monitor.oss.bucket=zskk-dcm
-monitor.oss.callback_url=http://api.aliyuoss.callback.pacsonline.cn/oss_callback
+monitor.oss.callback_url=http://api.aliyuoss.callback.pacsonline.cn/oss_callback
+logging.level.org.springframework=debug

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

@@ -1,3 +1,3 @@
-#Fri Mar 22 14:27:26 CST 2019
+#Mon Mar 25 15:50:16 CST 2019
 com.zskk.dicom.UploaderZskkApplication.Configuration=
 com.zskk.dicom.UploaderZskkApplication=

target/classes/project.properties

@@ -1,11 +1,11 @@
-#monitor.monitorDir=D:\\zskk\\zskk_system
-#monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
-#monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
-#monitor.errorDir=D:\\zskk\\zskk_system_eorr12
-monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
-monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
-monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
-monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
+monitor.monitorDir=D:\\zskk\\zskk_system
+monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
+monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
+monitor.errorDir=D:\\zskk\\zskk_system_eorr12
+#monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
+#monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
+#monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
+#monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
 monitor.hospitalId=test_zzp
 #73090001
 monitor.postHost=api.pacsonline.cn
@@ -21,4 +21,5 @@ monitor.oss.region=oss-cn-beijing
 monitor.oss.endpoint=oss-cn-beijing.aliyuncs.com
 monitor.oss.scheme=dicomweb
 monitor.oss.bucket=zskk-dcm
-monitor.oss.callback_url=http://api.aliyuoss.callback.pacsonline.cn/oss_callback
+monitor.oss.callback_url=http://api.aliyuoss.callback.pacsonline.cn/oss_callback
+logging.level.org.springframework=debug