|
@@ -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);
|