Просмотр исходного кода

修改资源同步中获取本地资源的顺序

sunyj 9 лет назад
Родитель
Сommit
307e774f8f
1 измененных файлов с 8 добавлено и 2 удалено
  1. 8 2
      src/main/java/com/uas/report/service/impl/ResourceServiceImpl.java

+ 8 - 2
src/main/java/com/uas/report/service/impl/ResourceServiceImpl.java

@@ -139,6 +139,7 @@ public class ResourceServiceImpl implements ResourceService {
 		if (dir == null || !dir.exists()) {
 		if (dir == null || !dir.exists()) {
 			return resources;
 			return resources;
 		}
 		}
+		resources.add(convertToResource(dir));
 		if (dir.isDirectory()) {
 		if (dir.isDirectory()) {
 			// 递归获取所有资源
 			// 递归获取所有资源
 			File[] files = dir.listFiles();
 			File[] files = dir.listFiles();
@@ -146,7 +147,6 @@ public class ResourceServiceImpl implements ResourceService {
 				resources.addAll(getLocalResources(file));
 				resources.addAll(getLocalResources(file));
 			}
 			}
 		}
 		}
-		resources.add(convertToResource(dir));
 		return resources;
 		return resources;
 	}
 	}
 
 
@@ -199,7 +199,11 @@ public class ResourceServiceImpl implements ResourceService {
 	private void downloadFile(Resource resource) throws ClientProtocolException, URISyntaxException, IOException {
 	private void downloadFile(Resource resource) throws ClientProtocolException, URISyntaxException, IOException {
 		// 如果资源是文件夹,在本地创建
 		// 如果资源是文件夹,在本地创建
 		if (resource.isFolder()) {
 		if (resource.isFolder()) {
-			new File(jsRestAPIConf.getLocalBaseDir() + resource.getUri()).mkdirs();
+			File folder = new File(jsRestAPIConf.getLocalBaseDir() + resource.getUri());
+			if (!folder.exists()) {
+				folder.mkdirs();
+				logger.info("Mkdirs " + folder.getPath());
+			}
 			return;
 			return;
 		}
 		}
 
 
@@ -242,9 +246,11 @@ public class ResourceServiceImpl implements ResourceService {
 		// 该文件所在的路径不存在,创建
 		// 该文件所在的路径不存在,创建
 		if (!exportFile.getParentFile().exists()) {
 		if (!exportFile.getParentFile().exists()) {
 			exportFile.getParentFile().mkdirs();
 			exportFile.getParentFile().mkdirs();
+			logger.info("Mkdirs " + exportFile.getParent());
 		}
 		}
 		FileOutputStream fos = new FileOutputStream(exportFile);
 		FileOutputStream fos = new FileOutputStream(exportFile);
 		fos.write(data);
 		fos.write(data);
+		fos.flush();
 		fos.close();
 		fos.close();
 		logger.info("Download resource to " + exportPath + "\n");
 		logger.info("Download resource to " + exportPath + "\n");
 	}
 	}