Browse Source

统一处理url

menglu 3 năm trước cách đây
mục cha
commit
6a6e1d03d2

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

@@ -37,7 +37,7 @@ public class DaemonThread extends Thread {
 		try {
 			this.join();
 		} catch (InterruptedException e) {
-			log.error(e.getMessage(),e);
+			log.error(e.getMessage(), e);
 		}
 	}
 
@@ -124,7 +124,7 @@ public class DaemonThread extends Thread {
 			if (Constant.alarm_enable) {
 				log.warn("alarm-websocket");
 				AlarmWebSocketClient.client = new AlarmWebSocketClient(
-						new URI(Constant.alarm_websocket + "/" + RepositoryContainer.RepositoryBase.projectId));
+						new URI(Constant.alarm_websocket_url + "/" + RepositoryContainer.RepositoryBase.projectId));
 				AlarmWebSocketClient.client.connect();
 				// while (!myClient.getReadyState().equals(READYSTATE.OPEN)) {
 				// Thread.sleep(1000L);
@@ -148,7 +148,7 @@ public class DaemonThread extends Thread {
 				try {
 					Thread.sleep(1000 * 60 * 5);
 				} catch (Exception e) {
-					log.error(e.getMessage(),e);
+					log.error(e.getMessage(), e);
 				}
 
 				try {

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

@@ -27,7 +27,7 @@ public class WebSocketCheckThread extends Thread {
 			try {
 				Thread.sleep(1000L * 15);
 			} catch (InterruptedException e) {
-				log.error(e.getMessage(),e);
+				log.error(e.getMessage(), e);
 			}
 
 			if (IOTWebSocketClient.client != null) {
@@ -39,7 +39,7 @@ public class WebSocketCheckThread extends Thread {
 					}
 				} catch (URISyntaxException e) {
 					log.warn(e.getMessage(), e);
-					log.error(e.getMessage(),e);
+					log.error(e.getMessage(), e);
 				}
 			}
 			if (AlarmWebSocketClient.client != null) {
@@ -50,7 +50,7 @@ public class WebSocketCheckThread extends Thread {
 					}
 				} catch (URISyntaxException e) {
 					log.warn(e.getMessage(), e);
-					log.error(e.getMessage(),e);
+					log.error(e.getMessage(), e);
 				}
 			}
 		}

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -647,7 +647,7 @@ public class RestUtil {
 		JSONObject postJSON = new JSONObject();
 		postJSON.put("building", RepositoryContainer.RepositoryBase.projectId.substring(2));
 		postJSON.put("points", points);
-		String post_url = Constant.iot_collect_url + "fjd_query_batch_post";
+		String post_url = Constant.iot_collect_url + "/fjd_query_batch_post";
 		String post_result = HttpClientUtil.post(post_url, postJSON.toJSONString());
 		JSONObject resultJSON = JSON.parseObject(post_result);
 		JSONArray result_points = (JSONArray) resultJSON.get("points");
@@ -668,7 +668,7 @@ public class RestUtil {
 		JSONObject postJSON = new JSONObject();
 		postJSON.put("building", RepositoryContainer.RepositoryBase.projectId.substring(2));
 		postJSON.put("points", points);
-		String post_url = Constant.iot_collect_url + "fjd_query_batch_post";
+		String post_url = Constant.iot_collect_url + "/fjd_query_batch_post";
 		String post_result = HttpClientUtil.post(post_url, postJSON.toJSONString());
 		JSONObject resultJSON = JSON.parseObject(post_result);
 		JSONArray result_points = (JSONArray) resultJSON.get("points");

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

@@ -38,8 +38,8 @@ public class Constant {
 	public static String iot_collect_url;
 	public static String iot_project_url;
 	public static boolean alarm_enable;
-	public static String alarm_websocket;
-	public static String alarm_rest;
+	public static String alarm_websocket_url;
+	public static String alarm_rest_url;
 	public static boolean alarm_rest_get;
 
 	public static Map<String, Boolean> objType_hasRelation = new HashMap<String, Boolean>();
@@ -73,16 +73,19 @@ public class Constant {
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					rwd_url = element.attribute("url").getValue();
+					rwd_url = StrUtil.removeSuffix(rwd_url, "/");
 				}
 				iter = document.selectNodes("/root/zkt_monitor").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					zkt_monitor_url = element.attribute("url").getValue();
+					zkt_monitor_url = StrUtil.removeSuffix(zkt_monitor_url, "/");
 				}
 				iter = document.selectNodes("/root/zkt_control").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					zkt_control_url = element.attribute("url").getValue();
+					zkt_control_url = StrUtil.removeSuffix(zkt_control_url, "/");
 				}
 				iter = document.selectNodes("/root/physical_world").iterator();
 				if (iter.hasNext()) {
@@ -115,24 +118,29 @@ public class Constant {
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					iot_websocket_url = element.attribute("url").getValue();
+					iot_websocket_url = StrUtil.removeSuffix(iot_websocket_url, "/");
 				}
 				iter = document.selectNodes("/root/iot_collect").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					iot_collect_url = element.attribute("url").getValue();
+					iot_collect_url = StrUtil.removeSuffix(iot_collect_url, "/");
 				}
 				iter = document.selectNodes("/root/iot_project").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					iot_project_url = element.attribute("url").getValue();
+					iot_project_url = StrUtil.removeSuffix(iot_project_url, "/");
 				}
 
 				iter = document.selectNodes("/root/alarm").iterator();
 				if (iter.hasNext()) {
 					element = (Element) iter.next();
 					alarm_enable = Boolean.parseBoolean(element.attribute("enable").getValue());
-					alarm_websocket = element.attribute("websocket").getValue();
-					alarm_rest = element.attribute("rest").getValue();
+					alarm_websocket_url = element.attribute("websocket").getValue();
+					alarm_websocket_url = StrUtil.removeSuffix(alarm_websocket_url, "/");
+					alarm_rest_url = element.attribute("rest").getValue();
+					alarm_rest_url = StrUtil.removeSuffix(alarm_rest_url, "/");
 					alarm_rest_get = Boolean.parseBoolean(element.attribute("rest_get").getValue());
 				}
 

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ControlUtil.java

@@ -123,7 +123,7 @@ public class ControlUtil {
 		JSONObject postJSON = new JSONObject();
 		postJSON.put("building", RepositoryContainer.RepositoryBase.projectId.substring(2));
 		postJSON.put("points", points);
-		String post_url = Constant.iot_project_url + "sync_pointsetbatch_post";
+		String post_url = Constant.iot_project_url + "/sync_pointsetbatch_post";
 		log.debug(postJSON.toJSONString());
 		String post_result = HttpClientUtil.post(post_url, postJSON.toJSONString());
 		JSONObject result = JSON.parseObject(post_result);

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/DeamonUtil.java

@@ -110,7 +110,7 @@ public class DeamonUtil {
 		JSONObject postJSON = new JSONObject();
 		postJSON.put("building", RepositoryContainer.RepositoryBase.projectId.substring(2));
 		postJSON.put("points", points);
-		String post_url = Constant.iot_collect_url + "fjd_query_batch_post";
+		String post_url = Constant.iot_collect_url + "/fjd_query_batch_post";
 		String post_result = HttpClientUtil.post(post_url, postJSON.toJSONString());
 		JSONObject resultJSON = JSON.parseObject(post_result);
 		if (resultJSON == null) {

+ 4 - 4
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -52,7 +52,7 @@ public class RWDAlarmUtil {
 			JSONObject params = (JSONObject) paramObject.get("params");
 			JSONArray Content;
 			if (Constant.alarm_rest_get) {
-				String get_url = Constant.alarm_rest + "alarm-record/page";
+				String get_url = Constant.alarm_rest_url + "/alarm-record/page";
 				StringBuffer sb = new StringBuffer();
 				sb.append("?appId=" + "0" + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode="
 						+ RepositoryContainer.RepositoryBase.groupCode);
@@ -93,7 +93,7 @@ public class RWDAlarmUtil {
 				Content = getResult.getJSONArray("Content");
 				result.put("count", getResult.get("Count"));
 			} else {
-				String post_url = Constant.alarm_rest + "alarm/queryAlarmList";
+				String post_url = Constant.alarm_rest_url + "/alarm/queryAlarmList";
 				JSONObject postParam = new JSONObject();
 				postParam.put("appId", "0");
 				postParam.put("userId", "systemId");
@@ -377,13 +377,13 @@ public class RWDAlarmUtil {
 
 		JSONArray Content;
 		if (Constant.alarm_rest_get) {
-			String get_url = Constant.alarm_rest + "/alarm-record/list" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
+			String get_url = Constant.alarm_rest_url + "/alarm-record/list" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
 					+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode;
 			String getResultString = HttpClientUtil.get(get_url, null);
 			JSONObject getResult = JSON.parseObject(getResultString);
 			Content = (JSONArray) getResult.get("Item");
 		} else {
-			String post_url = Constant.alarm_rest + "/alarm/queryAlarmList";
+			String post_url = Constant.alarm_rest_url + "/alarm/queryAlarmList";
 			JSONObject postParam = new JSONObject();
 			postParam.put("userId", "systemId");
 			postParam.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);

+ 19 - 18
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -41,7 +41,7 @@ public class RWDDownloadUtil {
 			param.put("projectId", projectId);
 			param.put("dictType", Constant.sdk_version);
 			param.put("code", "1");
-			String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "generalDictionary/list", param.toJSONString());
+			String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "/generalDictionary/list", param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			classArray = resultJSON.getJSONArray("Content");
 			if (classArray != null) {
@@ -131,7 +131,7 @@ public class RWDDownloadUtil {
 			JSONObject param = new JSONObject();
 			JSONObject criteria = new JSONObject();
 			param.put("criteria", criteria);
-			String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/def/class?projectId=" + RepositoryContainer.RepositoryBase.projectId
+			String post_result = HttpClientUtil.post(Constant.rwd_url + "/rwd/def/class?projectId=" + RepositoryContainer.RepositoryBase.projectId
 					+ "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode, param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			classArray = resultJSON.getJSONArray("data");
@@ -148,8 +148,9 @@ public class RWDDownloadUtil {
 				criteria.put("classCode", code);
 				param.put("criteria", criteria);
 				log.debug("Download info " + code);
-				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/def/funcid?projectId=" + RepositoryContainer.RepositoryBase.projectId
-						+ "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode, param.toJSONString());
+				String post_result = HttpClientUtil.post(Constant.rwd_url + "/rwd/def/funcid?projectId="
+						+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode,
+						param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
 				infoArray = resultJSON.getJSONArray("data");
 			}
@@ -183,7 +184,7 @@ public class RWDDownloadUtil {
 				criteria.put("valid", 1);
 				param.put("criteria", criteria);
 				log.debug("Download object " + code);
-				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/object/query?projectId="
+				String post_result = HttpClientUtil.post(Constant.rwd_url + "/rwd/instance/object/query?projectId="
 						+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode,
 						param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
@@ -215,7 +216,7 @@ public class RWDDownloadUtil {
 					criteria.put("relCode", relCode);
 					param.put("criteria", criteria);
 					log.debug("Download relation " + graphCode + " " + relCode);
-					String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/relation/query?projectId="
+					String post_result = HttpClientUtil.post(Constant.rwd_url + "/rwd/instance/relation/query?projectId="
 							+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode,
 							param.toJSONString());
 					JSONObject resultJSON = JSON.parseObject(post_result);
@@ -299,7 +300,7 @@ public class RWDDownloadUtil {
 			JSONObject criteria = new JSONObject();
 			criteria.put("ibms", true);
 			param.put("criteria", criteria);
-			String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/def/class?projectId=" + RepositoryContainer.RepositoryBase.projectId
+			String post_result = HttpClientUtil.post(Constant.rwd_url + "/rwd/def/class?projectId=" + RepositoryContainer.RepositoryBase.projectId
 					+ "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode, param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			classArray = resultJSON.getJSONArray("data");
@@ -318,7 +319,7 @@ public class RWDDownloadUtil {
 				criteria.put("ibmsClassCode", ibmsClassCode);
 				param.put("criteria", criteria);
 				log.debug("Download object " + ibmsSceneCode + "-" + ibmsClassCode);
-				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/object/query?projectId="
+				String post_result = HttpClientUtil.post(Constant.rwd_url + "/rwd/instance/object/query?projectId="
 						+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode,
 						param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
@@ -340,7 +341,7 @@ public class RWDDownloadUtil {
 				boolean use_group = true;
 				if (use_group) {
 					String post_result = HttpClientUtil.get(
-							Constant.alarm_rest + "alarm-record/selectItemGroupCode" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
+							Constant.alarm_rest_url + "/alarm-record/selectItemGroupCode" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
 									+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode,
 							null);
 					JSONObject resultJSON = JSON.parseObject(post_result);
@@ -356,9 +357,9 @@ public class RWDDownloadUtil {
 						JSONObject classItem = classArray.getJSONObject(i);
 						String ibmsSceneCode = classItem.getString("ibmsSceneCode");
 						String ibmsClassCode = classItem.getString("ibmsClassCode");
-						String post_result = HttpClientUtil.get(Constant.alarm_rest + "alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode
-								+ "?appId=" + "0" + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryBase.projectId
-								+ "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode, null);
+						String post_result = HttpClientUtil.get(Constant.alarm_rest_url + "/alarm-config/itemList/" + ibmsSceneCode + "/"
+								+ ibmsClassCode + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
+								+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode, null);
 						JSONObject resultJSON = JSON.parseObject(post_result);
 						JSONArray Content = resultJSON.getJSONArray("Content");
 						for (int ii = 0; ii < Content.size(); ii++) {
@@ -375,7 +376,7 @@ public class RWDDownloadUtil {
 				criteria.put("userId", "systemId");
 				criteria.put("projectId", RepositoryContainer.RepositoryBase.projectId);
 				criteria.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
-				String post_result = HttpClientUtil.post(Constant.alarm_rest + "alarm/queryItem", criteria.toJSONString());
+				String post_result = HttpClientUtil.post(Constant.alarm_rest_url + "/alarm/queryItem", criteria.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
 				JSONArray Content = resultJSON.getJSONArray("Content");
 				for (int ii = 0; ii < Content.size(); ii++) {
@@ -406,14 +407,14 @@ public class RWDDownloadUtil {
 					String ibmsSceneCode = classItem.getString("ibmsSceneCode");
 					String ibmsClassCode = classItem.getString("ibmsClassCode");
 					String itemListResultString = HttpClientUtil
-							.get(Constant.alarm_rest + "alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode, null);
+							.get(Constant.alarm_rest_url + "/alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode, null);
 					JSONObject itemListResultJSON = JSON.parseObject(itemListResultString);
 					JSONArray itemListResultContent = itemListResultJSON.getJSONArray("Content");
 					for (int ii = 0; ii < itemListResultContent.size(); ii++) {
 						JSONObject itemAlarmType = itemListResultContent.getJSONObject(ii);
 						String itemId = itemAlarmType.getString("id");
 						String alarmDefineListString = HttpClientUtil
-								.get(Constant.alarm_rest + "alarm-config/configPage" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
+								.get(Constant.alarm_rest_url + "/alarm-config/configPage" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
 										+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode
 										+ "&ibmsSceneCode=" + ibmsSceneCode + "&ibmsClassCode=" + ibmsClassCode + "&itemId=" + itemId, null);
 						JSONObject alarmDefineListJSON = JSON.parseObject(alarmDefineListString);
@@ -438,7 +439,7 @@ public class RWDDownloadUtil {
 				param.put("appId", "datautils");
 				param.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
 				param.put("projectId", RepositoryContainer.RepositoryBase.projectId);
-				String post_result = HttpClientUtil.post(Constant.alarm_rest + "alarm/queryConfig", param.toJSONString());
+				String post_result = HttpClientUtil.post(Constant.alarm_rest_url + "/alarm/queryConfig", param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
 				alarmConfigArray = resultJSON.getJSONArray("Content");
 			}
@@ -512,7 +513,7 @@ public class RWDDownloadUtil {
 			criteria.put("userId", "systemId");
 			criteria.put("projectId", RepositoryContainer.RepositoryBase.projectId);
 			criteria.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
-			String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "logicalGrouping/list", criteria.toJSONString());
+			String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "/logicalGrouping/list", criteria.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			classArray = resultJSON.getJSONArray("Content");
 			classArray = classArray == null ? new JSONArray() : classArray;
@@ -549,7 +550,7 @@ public class RWDDownloadUtil {
 					criteria.put("projectId", RepositoryContainer.RepositoryBase.projectId);
 					criteria.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
 					criteria.put("logicalGroupingId", logicalGroupingId);
-					String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "logicalObject/listPage", criteria.toJSONString());
+					String post_result = HttpClientUtil.post(Constant.zkt_monitor_url + "/logicalObject/listPage", criteria.toJSONString());
 					JSONObject resultJSON = JSON.parseObject(post_result);
 					JSONArray Content = resultJSON.getJSONArray("Content");
 					infoArray.addAll(Content);

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -864,7 +864,7 @@ public class RWDLoadUtil {
 			param.put("userId", "0");
 			param.put("appId", "0");
 			param.put("projectId", projectId);
-			String post_result = HttpClientUtil.post(Constant.zkt_control_url + "tab/model/query", param.toJSONString());
+			String post_result = HttpClientUtil.post(Constant.zkt_control_url + "/tab/model/query", param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			JSONArray Content = (JSONArray) resultJSON.get("Content");
 			JSONArray array = new JSONArray();
@@ -891,7 +891,7 @@ public class RWDLoadUtil {
 			param.put("appId", "0");
 			param.put("projectId", projectId);
 			param.put("year", "" + year);
-			String post_result = HttpClientUtil.post(Constant.zkt_control_url + "calendar/binding/query", param.toJSONString());
+			String post_result = HttpClientUtil.post(Constant.zkt_control_url + "/calendar/binding/query", param.toJSONString());
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			JSONObject Item = (JSONObject) resultJSON.get("Item");
 			JSONArray arrayToday = new JSONArray();