|
@@ -62,8 +62,8 @@ public class RWDAlarmUtil {
|
|
|
JSONObject result = new JSONObject();
|
|
|
String alarmId = (String) paramObject.get("alarmId");
|
|
|
try {
|
|
|
- if (Constant.alarm_rest_get) {
|
|
|
- String get_url = Constant.alarm_rest_url + "/alarm-record/query";
|
|
|
+ if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
+ String get_url = Constant.alarm_url + "/alarm-record/query";
|
|
|
String getResultString = HttpClientUtil.get(get_url + "/" + alarmId);
|
|
|
JSONObject getResult = JSON.parseObject(getResultString);
|
|
|
JSONObject Item = getResult.getJSONObject("Item");
|
|
@@ -79,7 +79,7 @@ public class RWDAlarmUtil {
|
|
|
JSONArray ids = new JSONArray();
|
|
|
ids.add(alarmId);
|
|
|
postParamInner.put("ids", ids);
|
|
|
- String post_url = Constant.alarm_rest_url + "/alarmToWorkOrder/queryOrderStateByAlarmIds";
|
|
|
+ String post_url = Constant.alarm_url + "/alarmToWorkOrder/queryOrderStateByAlarmIds";
|
|
|
String postResultString = HttpClientUtil.post(post_url, postParamInner.toJSONString());
|
|
|
JSONObject postResult = JSON.parseObject(postResultString);
|
|
|
JSONArray Content = (JSONArray) postResult.get("Content");
|
|
@@ -107,8 +107,8 @@ public class RWDAlarmUtil {
|
|
|
try {
|
|
|
JSONObject params = (JSONObject) paramObject.get("params");
|
|
|
JSONArray Content;
|
|
|
- if (Constant.alarm_rest_get) {
|
|
|
- String get_url = Constant.alarm_rest_url + "/alarm-record/page";
|
|
|
+ if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
+ String get_url = Constant.alarm_url + "/alarm-record/page";
|
|
|
StringBuffer sb = new StringBuffer();
|
|
|
sb.append("?appId=" + "0" + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode="
|
|
|
+ RepositoryContainer.RepositoryBase.groupCode);
|
|
@@ -152,7 +152,7 @@ public class RWDAlarmUtil {
|
|
|
Content = getResult.getJSONArray("Content");
|
|
|
result.put("count", getResult.get("Count"));
|
|
|
} else {
|
|
|
- String post_url = Constant.alarm_rest_url + "/alarm/queryAlarmList";
|
|
|
+ String post_url = Constant.alarm_url + "/alarm/queryAlarmList";
|
|
|
JSONObject postParam = new JSONObject();
|
|
|
postParam.put("appId", "0");
|
|
|
postParam.put("userId", "systemId");
|
|
@@ -532,11 +532,11 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
|
|
|
JSONArray Content;
|
|
|
- if (Constant.alarm_rest_get) {
|
|
|
+ if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
Content = new JSONArray();
|
|
|
int[] treatState_array = { 1, 2 };
|
|
|
for (int treatState : treatState_array) {
|
|
|
- String get_url = Constant.alarm_rest_url + "/alarm-record/page" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
|
|
|
+ String get_url = Constant.alarm_url + "/alarm-record/page" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
|
|
|
+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode
|
|
|
+ "&size=65535¤t=1&treatState=" + treatState;
|
|
|
String getResultString = HttpClientUtil.get(get_url);
|
|
@@ -562,7 +562,7 @@ public class RWDAlarmUtil {
|
|
|
postParamInner.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
postParamInner.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
postParamInner.put("ids", ids);
|
|
|
- String post_url = Constant.alarm_rest_url + "/alarmToWorkOrder/queryOrderStateByAlarmIds";
|
|
|
+ String post_url = Constant.alarm_url + "/alarmToWorkOrder/queryOrderStateByAlarmIds";
|
|
|
String postResultString = HttpClientUtil.post(post_url, postParamInner.toJSONString());
|
|
|
JSONObject postResult = JSON.parseObject(postResultString);
|
|
|
JSONArray ContentOrderState = (JSONArray) postResult.get("Content");
|
|
@@ -577,7 +577,7 @@ public class RWDAlarmUtil {
|
|
|
Content.addAll(ContentInner);
|
|
|
}
|
|
|
} else {
|
|
|
- String post_url = Constant.alarm_rest_url + "/alarm/queryAlarmList";
|
|
|
+ String post_url = Constant.alarm_url + "/alarm/queryAlarmList";
|
|
|
JSONObject postParam = new JSONObject();
|
|
|
postParam.put("userId", "systemId");
|
|
|
postParam.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
@@ -610,7 +610,7 @@ public class RWDAlarmUtil {
|
|
|
SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
|
|
Date currTime = new Date();
|
|
|
JSONObject paramJSON = JSON.parseObject(param);
|
|
|
- if (Constant.alarm_rest_get) {
|
|
|
+ if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
{
|
|
|
JSONObject handleJSON = new JSONObject();
|
|
|
handleJSON.put("id", paramJSON.get("id"));
|
|
@@ -623,8 +623,8 @@ public class RWDAlarmUtil {
|
|
|
if (paramJSON.containsKey("nature")) {
|
|
|
handleJSON.put("nature", paramJSON.get("nature"));
|
|
|
}
|
|
|
- log.warn(Constant.alarm_rest_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
|
|
|
- String post_result = HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());
|
|
|
+ log.warn(Constant.alarm_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.put(Constant.alarm_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());
|
|
|
result = JSON.parseObject(post_result);
|
|
|
}
|
|
|
if (paramJSON.containsKey("comment") && paramJSON.containsKey("userId")) {
|
|
@@ -635,8 +635,8 @@ public class RWDAlarmUtil {
|
|
|
dtoJSON.put("commentTime", sdf.format(currTime));
|
|
|
commentJSON.put("id", paramJSON.get("id"));
|
|
|
commentJSON.put("alarmRecordCommentDto", dtoJSON);
|
|
|
- log.warn(Constant.alarm_rest_url + "/alarm-record/updateComment" + "\n" + commentJSON.toJSONString());
|
|
|
- HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/updateComment", commentJSON.toJSONString());
|
|
|
+ log.warn(Constant.alarm_url + "/alarm-record/updateComment" + "\n" + commentJSON.toJSONString());
|
|
|
+ HttpClientUtil.put(Constant.alarm_url + "/alarm-record/updateComment", commentJSON.toJSONString());
|
|
|
dtoJSON.put("commentTime", sdf_.format(currTime));
|
|
|
ProcessAlarm_comment((String) paramJSON.get("id"), dtoJSON);
|
|
|
}
|
|
@@ -661,7 +661,7 @@ public class RWDAlarmUtil {
|
|
|
SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
|
|
Date currTime = new Date();
|
|
|
JSONObject paramJSON = JSON.parseObject(param);
|
|
|
- if (Constant.alarm_rest_get) {
|
|
|
+ if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
{
|
|
|
JSONObject handleJSON = new JSONObject();
|
|
|
handleJSON.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
@@ -670,8 +670,8 @@ public class RWDAlarmUtil {
|
|
|
handleJSON.put("userId", paramJSON.get("userId"));
|
|
|
handleJSON.put("id", paramJSON.get("id"));
|
|
|
handleJSON.put("alarmDescribe", "null");
|
|
|
- log.warn(Constant.alarm_rest_url + "/alarmToWorkOrder/transfer" + "\n" + handleJSON.toJSONString());
|
|
|
- String post_result = HttpClientUtil.post(Constant.alarm_rest_url + "/alarmToWorkOrder/transfer", handleJSON.toJSONString());
|
|
|
+ log.warn(Constant.alarm_url + "/alarmToWorkOrder/transfer" + "\n" + handleJSON.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.post(Constant.alarm_url + "/alarmToWorkOrder/transfer", handleJSON.toJSONString());
|
|
|
result = JSON.parseObject(post_result);
|
|
|
}
|
|
|
{
|
|
@@ -679,8 +679,8 @@ public class RWDAlarmUtil {
|
|
|
handleJSON.put("id", paramJSON.get("id"));
|
|
|
handleJSON.put("treatMode", 2);
|
|
|
handleJSON.put("treatState", 2);
|
|
|
- log.warn(Constant.alarm_rest_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
|
|
|
- String post_result = HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());
|
|
|
+ log.warn(Constant.alarm_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
|
|
|
+ String post_result = HttpClientUtil.put(Constant.alarm_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());
|
|
|
result = JSON.parseObject(post_result);
|
|
|
}
|
|
|
if (paramJSON.containsKey("comment") && paramJSON.containsKey("userId")) {
|
|
@@ -691,8 +691,8 @@ public class RWDAlarmUtil {
|
|
|
dtoJSON.put("commentTime", sdf.format(currTime));
|
|
|
commentJSON.put("id", paramJSON.get("id"));
|
|
|
commentJSON.put("alarmRecordCommentDto", dtoJSON);
|
|
|
- log.warn(Constant.alarm_rest_url + "/alarm-record/updateComment" + "\n" + commentJSON.toJSONString());
|
|
|
- HttpClientUtil.put(Constant.alarm_rest_url + "/alarm-record/updateComment", commentJSON.toJSONString());
|
|
|
+ log.warn(Constant.alarm_url + "/alarm-record/updateComment" + "\n" + commentJSON.toJSONString());
|
|
|
+ HttpClientUtil.put(Constant.alarm_url + "/alarm-record/updateComment", commentJSON.toJSONString());
|
|
|
|
|
|
dtoJSON.put("commentTime", sdf_.format(currTime));
|
|
|
ProcessAlarm_comment((String) paramJSON.get("id"), dtoJSON);
|