|
@@ -41,7 +41,8 @@ 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.instance("zkt_monitor").post(Constant.zkt_monitor_url + "/generalDictionary/list",
|
|
|
+ param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
classArray = resultJSON.getJSONArray("Content");
|
|
|
if (classArray != null && classArray.size() == 1) {
|
|
@@ -133,8 +134,9 @@ 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.RepositoryProject.projectId
|
|
|
- + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode, param.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.instance("rwd").post_compress(Constant.rwd_url + "/rwd/def/class?projectId="
|
|
|
+ + RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
+ param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
classArray = resultJSON.getJSONArray("data");
|
|
|
classArray = classArray == null ? new JSONArray() : classArray;
|
|
@@ -150,7 +152,7 @@ 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="
|
|
|
+ String post_result = HttpClientUtil.instance("rwd").post_compress(Constant.rwd_url + "/rwd/def/funcid?projectId="
|
|
|
+ RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
@@ -186,7 +188,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.instance("rwd").post_compress(Constant.rwd_url + "/rwd/instance/object/query?projectId="
|
|
|
+ RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
@@ -218,7 +220,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.instance("rwd").post_compress(Constant.rwd_url + "/rwd/instance/relation/query?projectId="
|
|
|
+ RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
@@ -305,8 +307,9 @@ public class RWDDownloadUtil {
|
|
|
pathInner.add("产品模块");
|
|
|
JSONObject param = new JSONObject();
|
|
|
param.put("path", pathInner);
|
|
|
- String post_result = HttpClientUtil.post(Constant.rwd_url + "/post?projectId=" + RepositoryContainer.RepositoryProject.projectId
|
|
|
- + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode, param.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.instance("zkt_dmp").post_compress(Constant.rwd_url + "/post?projectId="
|
|
|
+ + RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
+ param.toJSONString());
|
|
|
sceneArray = JSON.parseArray(post_result);
|
|
|
sceneArray = sceneArray == null ? new JSONArray() : sceneArray;
|
|
|
FileUtil.Save(path + Constant.getSeperator() + "sceneArray.json", FastJsonUtil.toFormatString(sceneArray));
|
|
@@ -317,8 +320,9 @@ 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.RepositoryProject.projectId
|
|
|
- + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode, param.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.instance("zkt_dmp").post_compress(Constant.rwd_url + "/rwd/def/class?projectId="
|
|
|
+ + RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
+ param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
classArray = resultJSON.getJSONArray("data");
|
|
|
classArray = classArray == null ? new JSONArray() : classArray;
|
|
@@ -336,7 +340,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.instance("zkt_dmp").post_compress(Constant.rwd_url + "/rwd/instance/object/query?projectId="
|
|
|
+ RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode,
|
|
|
param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
@@ -357,9 +361,10 @@ public class RWDDownloadUtil {
|
|
|
if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
boolean use_group = true;
|
|
|
if (use_group) {
|
|
|
- String post_result = HttpClientUtil.get(Constant.alarm_url + "/alarm-record/selectItemGroupCode" + "?appId=" + "0" + "&userId="
|
|
|
- + "systemId" + "&projectId=" + RepositoryContainer.RepositoryProject.projectId + "&groupCode="
|
|
|
- + RepositoryContainer.RepositoryProject.groupCode);
|
|
|
+ String post_result = HttpClientUtil.instance("alarm")
|
|
|
+ .get(Constant.alarm_url + "/alarm-record/selectItemGroupCode" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
|
|
|
+ + RepositoryContainer.RepositoryProject.projectId + "&groupCode="
|
|
|
+ + RepositoryContainer.RepositoryProject.groupCode);
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
JSONArray Content = resultJSON.getJSONArray("Item");
|
|
|
for (int ii = 0; ii < Content.size(); ii++) {
|
|
@@ -373,9 +378,10 @@ 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_url + "/alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode
|
|
|
- + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryProject.projectId
|
|
|
- + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode);
|
|
|
+ String post_result = HttpClientUtil.instance("alarm")
|
|
|
+ .get(Constant.alarm_url + "/alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode + "?appId=" + "0"
|
|
|
+ + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryProject.projectId + "&groupCode="
|
|
|
+ + RepositoryContainer.RepositoryProject.groupCode);
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
JSONArray Content = resultJSON.getJSONArray("Content");
|
|
|
for (int ii = 0; ii < Content.size(); ii++) {
|
|
@@ -392,7 +398,7 @@ public class RWDDownloadUtil {
|
|
|
criteria.put("userId", "systemId");
|
|
|
criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
- String post_result = HttpClientUtil.post(Constant.alarm_url + "/alarm/queryItem", criteria.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.instance("alarm").post(Constant.alarm_url + "/alarm/queryItem", criteria.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
JSONArray Content = resultJSON.getJSONArray("Content");
|
|
|
for (int ii = 0; ii < Content.size(); ii++) {
|
|
@@ -422,17 +428,18 @@ public class RWDDownloadUtil {
|
|
|
JSONObject classItem = classArray.getJSONObject(i);
|
|
|
String ibmsSceneCode = classItem.getString("ibmsSceneCode");
|
|
|
String ibmsClassCode = classItem.getString("ibmsClassCode");
|
|
|
- String itemListResultString = HttpClientUtil
|
|
|
+ String itemListResultString = HttpClientUtil.instance("alarm")
|
|
|
.get(Constant.alarm_url + "/alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode);
|
|
|
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_url + "/alarm-config/configPage" + "?appId=" + "0"
|
|
|
- + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryProject.projectId + "&groupCode="
|
|
|
- + RepositoryContainer.RepositoryProject.groupCode + "&ibmsSceneCode=" + ibmsSceneCode + "&ibmsClassCode="
|
|
|
- + ibmsClassCode + "&itemId=" + itemId);
|
|
|
+ String alarmDefineListString = HttpClientUtil.instance("alarm")
|
|
|
+ .get(Constant.alarm_url + "/alarm-config/configPage" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
|
|
|
+ + RepositoryContainer.RepositoryProject.projectId + "&groupCode="
|
|
|
+ + RepositoryContainer.RepositoryProject.groupCode + "&ibmsSceneCode=" + ibmsSceneCode + "&ibmsClassCode="
|
|
|
+ + ibmsClassCode + "&itemId=" + itemId);
|
|
|
JSONObject alarmDefineListJSON = JSON.parseObject(alarmDefineListString);
|
|
|
JSONArray alarmDefineListContent = alarmDefineListJSON.getJSONArray("Content");
|
|
|
for (int iii = 0; iii < alarmDefineListContent.size(); iii++) {
|
|
@@ -455,7 +462,7 @@ public class RWDDownloadUtil {
|
|
|
param.put("appId", "datautils");
|
|
|
param.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
param.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
- String post_result = HttpClientUtil.post(Constant.alarm_url + "/alarm/queryConfig", param.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.instance("alarm").post(Constant.alarm_url + "/alarm/queryConfig", param.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
alarmConfigArray = resultJSON.getJSONArray("Content");
|
|
|
}
|
|
@@ -514,7 +521,7 @@ public class RWDDownloadUtil {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- private static JSONArray post_by_page(String url, JSONObject criteria_base, int page_size) throws Exception {
|
|
|
+ private static JSONArray post_by_page(String name, String url, JSONObject criteria_base, int page_size) throws Exception {
|
|
|
JSONArray result;
|
|
|
while (true) {
|
|
|
Integer Count = null;
|
|
@@ -528,7 +535,7 @@ public class RWDDownloadUtil {
|
|
|
}
|
|
|
criteria.put("size", page_size);
|
|
|
criteria.put("page", page_current);
|
|
|
- String post_result = HttpClientUtil.post(url, criteria.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.instance(name).post(url, criteria.toJSONString());
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
JSONArray ContentInner = (JSONArray) resultJSON.get("Content");
|
|
|
Content_this_time.addAll(ContentInner);
|
|
@@ -577,8 +584,7 @@ public class RWDDownloadUtil {
|
|
|
criteria.put("userId", "systemId");
|
|
|
criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
- String url = Constant.zkt_monitor_url + "/logicalGrouping/list";
|
|
|
- classArray = post_by_page(url, criteria, page_size);
|
|
|
+ classArray = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalGrouping/list", criteria, page_size);
|
|
|
FileUtil.Save(path + Constant.getSeperator() + "groupArray.json", FastJsonUtil.toFormatString(classArray));
|
|
|
}
|
|
|
Map<String, Map<String, List<String>>> idListMapMap = new ConcurrentHashMap<String, Map<String, List<String>>>();
|
|
@@ -612,7 +618,7 @@ public class RWDDownloadUtil {
|
|
|
criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
criteria.put("logicalGroupingId", logicalGroupingId);
|
|
|
- JSONArray Content = post_by_page(Constant.zkt_monitor_url + "/logicalObject/listPage", criteria, page_size);
|
|
|
+ JSONArray Content = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalObject/listPage", criteria, page_size);
|
|
|
for (int i = 0; i < Content.size(); i++) {
|
|
|
JSONObject ContentItem = (JSONObject) Content.get(i);
|
|
|
ContentItem.put("logicalGroupingId", logicalGroupingId);
|