11111111111111111111111

logs/2019-03-20/sys-2019-03-20.0.log

@@ -0,0 +1,130 @@
+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
+--------------------------------------------------
+
+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
+--------------------------------------------------
+

logs/sys.log

@@ -128,3 +128,58 @@ 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
+--------------------------------------------------
+

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

@@ -1,6 +1,7 @@
 package com.zskk.dicom;
 
 import com.zskk.dicom.monitor.config.Configs;
+import com.zskk.dicom.monitor.schedules.InitMonitor;
 import com.zskk.dicom.monitor.schedules.StatRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,7 +29,7 @@ public class UploaderZskkApplication {
         sb.append("--------------------------------------------------\n");
         Configs.sysLog.info(sb.toString());
         springApplication.run(args);
-       // InitMonitor.start();
+        InitMonitor.start();
         StatRunner.start();
     }
 }

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

@@ -39,7 +39,7 @@ public class StatRunner {
     //重试上传线程
     private static ExecutorService retryUploadPools = null;
     public static void start() {
-      dirMonitorPools = generateSinglePools(dirMonitorPools );
+      dirMonitorPools = generateSinglePools(dirMonitorPools);
         dirMonitorPools.execute(new DirMonitor() );
         //成功备份移除
         successPools = generatePools(successPools, 2);
@@ -54,17 +54,16 @@ public class StatRunner {
         }
         //老上传
         oldUploadPools = generatePools(oldUploadPools, 2);
-       // oldUploadPools.execute(new OldUploadRunner());
-         oldUploadPools.execute(new FileUploadsOss(UploadsQueue.fileQueue));
+        oldUploadPools.execute(new OldUploadRunner());
+        // oldUploadPools.execute(new FileUploadsOss(UploadsQueue.fileQueue));
         //新上传
         currentUploadPools = generatePools(currentUploadPools, 2);
         currentUploadPools.execute(new CurrentUploadRunner());
         //重试上传
         retryUploadPools = generatePools(retryUploadPools, 2);
-       // retryUploadPools.execute(new RetryUploadRunner());
-        retryUploadPools.execute(new FileUploadsOss(UploadsQueue.failFileQueue));
+       retryUploadPools.execute(new RetryUploadRunner());
+     //   retryUploadPools.execute(new FileUploadsOss(UploadsQueue.failFileQueue));
     }
-
     public static ExecutorService generatePools(ExecutorService oldPool, int length) {
         if (oldPool != null && !oldPool.isTerminated()) {
             oldPool.shutdown();

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

@@ -97,6 +97,7 @@ public class FileMover implements Runnable {
 		}
 		// 移除空的目录
 		MonitorFileUtils.removeBeforeTodayEmptyDir(sourceFile.getParentFile());
+
 	}
 
 }

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

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class FileUploadsOss implements Runnable{
-    static  List<File> list;
+     List<File> list;
     public FileUploadsOss(List<File> list){
         this.list = list;
 
@@ -20,7 +20,7 @@ public class FileUploadsOss implements Runnable{
 
                 try {
                     if(flag) {
-                        TimeUnit.MILLISECONDS.sleep(10);
+                         TimeUnit.MILLISECONDS.sleep(10);
                     }
                     else {
                         TimeUnit.SECONDS.sleep(1);
@@ -28,9 +28,12 @@ public class FileUploadsOss implements Runnable{
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
+
         }
+
     }
-    public synchronized static boolean upload() {
+
+    public synchronized  boolean upload() {
         boolean flag = false;
             try{
                // List<File> fileQueue = UploadsQueue.fileQueue;
@@ -43,10 +46,12 @@ public class FileUploadsOss implements Runnable{
                     if (list.equals(UploadsQueue.failFileQueue)){
                         System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
                         FileUploader_two.upload(file);
-                    }else if (list.equals(UploadsQueue.fileQueue)){
+                    }
+                    if (list.equals(UploadsQueue.fileQueue)){
                         System.out.println("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
                         FileUploader.upload(file);
                     }
+                 //   if (list.equals(UploadsQueue.))
 
                     flag = true;
                 }

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

@@ -59,10 +59,13 @@ public class MonitorFileUtils {
 	 */
 	public static String touchBackDir(File dcomFile) {
 		String targetFile = dcomFile.getAbsolutePath();
+		// 去监控目录
 		targetFile = targetFile.replace(Configs.monitorDir, "");
+		//备份文件绝对路径
 		targetFile = Configs.monitorBackDir + targetFile;
 		String targetFileDirStr = targetFile.substring(0, targetFile.lastIndexOf(File.separator));
-		Configs.sysLog.info("64-----64-----错误文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
+		Configs.sysLog.info("64-----64-----备份文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
+		// 备份文件夹
 		File targetFileDir = new File(targetFileDirStr);
 		if (!targetFileDir.exists()) {
 			Boolean cr = targetFileDir.mkdirs();
@@ -85,7 +88,7 @@ public class MonitorFileUtils {
 		targetFile = targetFile.replace(Configs.monitorDir, "");
 		targetFile = Configs.monitorRetryDir + targetFile;
 		String targetFileDirStr = targetFile.substring(0, targetFile.lastIndexOf(File.separator));
-		Configs.sysLog.info("11-----11-----备份文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
+		Configs.sysLog.info("11-----11-----重试文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
 		File targetFileDir = new File(targetFileDirStr);
 		if (!targetFileDir.exists()) {
 			System.out.println("------------------------------------------------------------------------------------------");
@@ -106,10 +109,10 @@ public class MonitorFileUtils {
 	 */
 	public static String touchEorrDir(File dcomFile) {
 		String targetFile = dcomFile.getAbsolutePath();
-		targetFile = targetFile.replace(Configs.monitorDir, "");
+		targetFile = targetFile.replace(Configs.monitorRetryDir, "");
 		targetFile = Configs.eorrRetryDir + targetFile;
 		String targetFileDirStr = targetFile.substring(0, targetFile.lastIndexOf(File.separator));
-		Configs.sysLog.info("11-----11-----备份文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
+		Configs.sysLog.info("11-----11-----错误文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
 		File targetFileDir = new File(targetFileDirStr);
 		if (!targetFileDir.exists()) {
 			System.out.println("------------------------------------------------------------------------------------------");