Selaa lähdekoodia

download_enable改refresh_enable

menglu 3 vuotta sitten
vanhempi
commit
f5f47e17a7

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

@@ -63,21 +63,21 @@ public class RefreshThread extends Thread {
 			try {
 				boolean changed_config = false;
 				if (last_refresh_config == null || currTime.getTime() - last_refresh_config.getTime() > 1000L * 15) {
-					if (Constant.config_download_enable) {
+					if (Constant.config_refresh_enable) {
 						changed_config = Process_config();
 					}
 					last_refresh_config = currTime;
 				}
 				boolean changed_physical_world = false;
 				if (last_refresh_physical_world == null || currTime.getTime() - last_refresh_physical_world.getTime() > 1000L * 60 * 60) {
-					if (Constant.physical_world_download_enable) {
+					if (Constant.physical_world_refresh_enable) {
 						changed_physical_world = RWDDownloadUtil.Process_physical_world();
 					}
 					last_refresh_physical_world = currTime;
 				}
 				boolean changed_zkt_physical_world = false;
 				if (last_refresh_zkt_physical_world == null || currTime.getTime() - last_refresh_zkt_physical_world.getTime() > 1000L * 60 * 60) {
-					if (Constant.zkt_physical_world_download_enable) {
+					if (Constant.zkt_physical_world_refresh_enable) {
 						changed_zkt_physical_world = RWDDownloadUtil.Process_zkt_physical_world();
 					}
 					last_refresh_zkt_physical_world = currTime;

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

@@ -24,13 +24,13 @@ public class Constant {
 	public static String rwd_url;
 	public static String zkt_monitor_url;
 	public static String physical_world;
-	public static boolean physical_world_download_enable;
+	public static boolean physical_world_refresh_enable;
 	public static String zkt_physical_world;
-	public static boolean zkt_physical_world_download_enable;
+	public static boolean zkt_physical_world_refresh_enable;
 	public static String ibms_physical_world;
-	public static boolean ibms_physical_world_download_enable;
+	public static boolean ibms_physical_world_refresh_enable;
 	public static String config;
-	public static boolean config_download_enable;
+	public static boolean config_refresh_enable;
 	public static String iot_websocket_url;
 	public static String iot_collect_url;
 	public static String iot_project_url;
@@ -96,25 +96,25 @@ public class Constant {
 					if (iter.hasNext()) {
 						element = (Element) iter.next();
 						physical_world = element.attribute("path").getValue();
-						physical_world_download_enable = Boolean.parseBoolean(element.attribute("download_enable").getValue());
+						physical_world_refresh_enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 					}
 					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_download_enable = Boolean.parseBoolean(element.attribute("download_enable").getValue());
+						zkt_physical_world_refresh_enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 					}
 					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_download_enable = Boolean.parseBoolean(element.attribute("download_enable").getValue());
+						ibms_physical_world_refresh_enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 					}
 					iter = document.selectNodes("/root/config").iterator();
 					if (iter.hasNext()) {
 						element = (Element) iter.next();
 						config = element.attribute("path").getValue();
-						config_download_enable = Boolean.parseBoolean(element.attribute("download_enable").getValue());
+						config_refresh_enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 					}
 
 					iter = document.selectNodes("/root/iot_websocket").iterator();

+ 4 - 4
ibms-data-sdk/src/main/resources/config.xml

@@ -6,12 +6,12 @@
 	<!-- rwd的服务地址 -->
 	<!-- <rwd url="http://192.168.100.33:9909/dmp-rwd/" /> -->
 	<rwd url="http://192.168.0.30:7707/" />
-	<physical_world path="D-physical_world" download_enable="true" />
-	<zkt_physical_world path="D-zkt_physical_world" download_enable="true" />
-	<ibms_physical_world path="D-ibms_physical_world" download_enable="false" />
+	<physical_world path="D-physical_world" refresh_enable="true" />
+	<zkt_physical_world path="D-zkt_physical_world" refresh_enable="true" />
+	<ibms_physical_world path="D-ibms_physical_world" refresh_enable="false" />
 	<!-- zkt-monitor的服务地址 -->
 	<zkt_monitor url="http://192.168.100.33:9909/zkt-monitor/" />
-	<config path="D-config" download_enable="true" />
+	<config path="D-config" refresh_enable="true" />
 	<!-- iot的websocket地址 -->
 	<!-- <iot_websocket url="ws://192.168.0.30:8868/websocket" /> -->
 	<iot_websocket url="ws://192.168.100.33:8858/websocket" />