Browse Source

重构文件夹结构

menglu 3 years ago
parent
commit
89e8c0de16

+ 17 - 4
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java

@@ -56,9 +56,22 @@ public class DaemonThread extends Thread {
 		KeywordUtil.keyWordMap = Constant.keyWordMap;
 		KeywordUtil.prefixMap = Constant.prefixMap;
 		KeywordUtil.suffixMap = Constant.suffixMap;
-		// 没有就下载
+		// 确保文件夹
 		{
 			{
+				File root = new File(RepositoryContainer.RepositoryProject.groupCode);
+				if (!root.exists()) {
+					root.mkdir();
+				}
+			}
+			{
+				File root = new File(
+						RepositoryContainer.RepositoryProject.groupCode + Constant.getSeperator() + RepositoryContainer.RepositoryProject.projectId);
+				if (!root.exists()) {
+					root.mkdir();
+				}
+			}
+			{
 				File root = new File(Constant.config);
 				if (!root.exists()) {
 					root.mkdir();
@@ -222,9 +235,9 @@ public class DaemonThread extends Thread {
 
 				// 循环打印字符画
 				if (LogOfRun.errorList.size() == 0) {
-					A.print_status("perfect", 1000L, 10);
+					A.print_status("perfect", 1000L, Constant.print_status_times);
 				} else {
-					A.print_status("good", 1000L, 10);
+					A.print_status("good", 1000L, Constant.print_status_times);
 				}
 
 				break;
@@ -233,7 +246,7 @@ public class DaemonThread extends Thread {
 				A.print_status("bad", 1000L, 1);
 
 				// 循环打印字符画
-				A.print_status("bad", 1000L, 10);
+				A.print_status("bad", 1000L, Constant.print_status_times);
 			}
 		}
 

+ 3 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/RefreshThread.java

@@ -127,9 +127,9 @@ public class RefreshThread extends Thread {
 					RepositoryContainer.RepositoryProject.AddSuccessLogOfRun(LogOfRun);
 
 					if (LogOfRun.errorList.size() == 0) {
-						A.print_status("perfect", 1000L, 10);
+						A.print_status("perfect", 1000L, Constant.print_status_times);
 					} else {
-						A.print_status("good", 1000L, 10);
+						A.print_status("good", 1000L, Constant.print_status_times);
 					}
 				} catch (Exception e) {
 					String message = LogUtil.GetExceptionStackTrace(e);
@@ -137,7 +137,7 @@ public class RefreshThread extends Thread {
 					LogOfRun.error(null, message);
 					LogOfRun.status = "failure";
 
-					A.print_status("bad", 1000L, 10);
+					A.print_status("bad", 1000L, Constant.print_status_times);
 				}
 				for (String resource : LogOfRun.resourceTime_new.keySet()) {
 					RepositoryContainer.RepositoryProject.resourceMap_try.put(resource, LogOfRun.resourceTime_new.get(resource));

+ 11 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -30,6 +30,7 @@ public class Constant {
 	public static boolean use_thread = true;
 	public static boolean enable_factor = true;
 	public static boolean clear_old_dir = true;
+	public static int print_status_times = 10;
 
 	public static int compute_thread_count;
 	public static long compute_thread_sdv_interval;
@@ -183,7 +184,8 @@ public class Constant {
 				iter = document.selectNodes("/root/config").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
-					config = element.attribute("path").getValue();
+					config = RepositoryContainer.RepositoryProject.groupCode + Constant.getSeperator()
+							+ RepositoryContainer.RepositoryProject.projectId + Constant.getSeperator() + element.attribute("path").getValue();
 					{
 						boolean enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 						long interval_second = Long.parseLong(element.attribute("refresh_interval_second").getValue());
@@ -193,7 +195,8 @@ public class Constant {
 				iter = document.selectNodes("/root/physical_world").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
-					physical_world = element.attribute("path").getValue();
+					physical_world = RepositoryContainer.RepositoryProject.groupCode + Constant.getSeperator()
+							+ RepositoryContainer.RepositoryProject.projectId + Constant.getSeperator() + element.attribute("path").getValue();
 					{
 						boolean enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 						long interval_second = Long.parseLong(element.attribute("refresh_interval_second").getValue());
@@ -203,7 +206,8 @@ public class Constant {
 				iter = document.selectNodes("/root/zkt_physical_world").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
-					zkt_physical_world = element.attribute("path").getValue();
+					zkt_physical_world = RepositoryContainer.RepositoryProject.groupCode + Constant.getSeperator()
+							+ RepositoryContainer.RepositoryProject.projectId + Constant.getSeperator() + element.attribute("path").getValue();
 					zkt_physical_world_enable = Boolean.parseBoolean(element.attribute("enable").getValue());
 					if (zkt_physical_world_enable) {
 						boolean enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
@@ -214,7 +218,8 @@ public class Constant {
 				iter = document.selectNodes("/root/ibms_physical_world").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
-					ibms_physical_world = element.attribute("path").getValue();
+					ibms_physical_world = RepositoryContainer.RepositoryProject.groupCode + Constant.getSeperator()
+							+ RepositoryContainer.RepositoryProject.projectId + Constant.getSeperator() + element.attribute("path").getValue();
 					ibms_physical_world_enable = Boolean.parseBoolean(element.attribute("enable").getValue());
 					if (ibms_physical_world_enable) {
 						boolean enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
@@ -225,7 +230,8 @@ public class Constant {
 				iter = document.selectNodes("/root/info_point").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
-					info_point = element.attribute("path").getValue();
+					info_point = RepositoryContainer.RepositoryProject.groupCode + Constant.getSeperator()
+							+ RepositoryContainer.RepositoryProject.projectId + Constant.getSeperator() + element.attribute("path").getValue();
 					info_point_enable = Boolean.parseBoolean(element.attribute("enable").getValue());
 					info_point_version = element.attribute("version").getValue();
 					if (info_point_enable) {