|
@@ -74,8 +74,8 @@ public class RWDAlarmUtil {
|
|
|
JSONObject postParamInner = new JSONObject();
|
|
|
postParamInner.put("appId", "0");
|
|
|
postParamInner.put("userId", "systemId");
|
|
|
- postParamInner.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
- postParamInner.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
+ postParamInner.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
+ postParamInner.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
JSONArray ids = new JSONArray();
|
|
|
ids.add(alarmId);
|
|
|
postParamInner.put("ids", ids);
|
|
@@ -110,8 +110,8 @@ public class RWDAlarmUtil {
|
|
|
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);
|
|
|
+ sb.append("?appId=" + "0" + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryProject.projectId + "&groupCode="
|
|
|
+ + RepositoryContainer.RepositoryProject.groupCode);
|
|
|
sb.append("&searchCount=" + "true");
|
|
|
if (params.containsKey("报警级别")) {
|
|
|
sb.append("&level=" + params.get("报警级别"));
|
|
@@ -154,8 +154,8 @@ public class RWDAlarmUtil {
|
|
|
JSONObject postParam = new JSONObject();
|
|
|
postParam.put("appId", "0");
|
|
|
postParam.put("userId", "systemId");
|
|
|
- postParam.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
- postParam.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
+ postParam.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
+ postParam.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
if (params.containsKey("报警级别")) {
|
|
|
postParam.put("level", params.get("报警级别"));
|
|
|
}
|
|
@@ -436,7 +436,7 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
|
|
|
public static synchronized void ProcessAlarm_comment(String id, JSONObject dtoJSON) {
|
|
|
- SceneDataSet alarmList = RepositoryContainer.RepositoryBase.alarmArray;
|
|
|
+ SceneDataSet alarmList = RepositoryContainer.RepositoryProject.alarmArray;
|
|
|
for (int i = 0; i < alarmList.set.size(); i++) {
|
|
|
SceneDataObject sdoInner = (SceneDataObject) alarmList.set.get(i);
|
|
|
String idInner = (String) sdoInner.get("id").value_prim.value;
|
|
@@ -456,15 +456,15 @@ public class RWDAlarmUtil {
|
|
|
String objId = (String) alarm.get("objId");
|
|
|
String treatState = alarm.get("treatState").toString();
|
|
|
{
|
|
|
- SceneDataValue alarmList = RepositoryContainer.RepositoryBase.id2alarmList.get(objId);
|
|
|
- SceneDataValue alarmCount = RepositoryContainer.RepositoryBase.id2alarmCount.get(objId);
|
|
|
+ SceneDataValue alarmList = RepositoryContainer.RepositoryProject.id2alarmList.get(objId);
|
|
|
+ SceneDataValue alarmCount = RepositoryContainer.RepositoryProject.id2alarmCount.get(objId);
|
|
|
if (alarmList == null) {
|
|
|
SceneDataValue sv_alarmList = new SceneDataValue(null, null, "报警列表", null);
|
|
|
sv_alarmList.finish = true;
|
|
|
sv_alarmList.value_array = new SceneDataSet(false);
|
|
|
sv_alarmList.value_array.set = new ArrayList<SceneDataObject>();
|
|
|
sv_alarmList.value_array.setRowChange(true);
|
|
|
- RepositoryContainer.RepositoryBase.id2alarmList.putIfAbsent(objId, sv_alarmList);
|
|
|
+ RepositoryContainer.RepositoryProject.id2alarmList.putIfAbsent(objId, sv_alarmList);
|
|
|
}
|
|
|
if (alarmCount == null) {
|
|
|
SceneDataValue sv_alarmCount = new SceneDataValue(null, null, "报警数量", null);
|
|
@@ -472,10 +472,10 @@ public class RWDAlarmUtil {
|
|
|
sv_alarmCount.value_prim = new SceneDataPrimitive();
|
|
|
sv_alarmCount.value_prim.value = 0;
|
|
|
sv_alarmCount.value_prim.change = true;
|
|
|
- RepositoryContainer.RepositoryBase.id2alarmCount.putIfAbsent(objId, sv_alarmCount);
|
|
|
+ RepositoryContainer.RepositoryProject.id2alarmCount.putIfAbsent(objId, sv_alarmCount);
|
|
|
}
|
|
|
- alarmList = RepositoryContainer.RepositoryBase.id2alarmList.get(objId);
|
|
|
- alarmCount = RepositoryContainer.RepositoryBase.id2alarmCount.get(objId);
|
|
|
+ alarmList = RepositoryContainer.RepositoryProject.id2alarmList.get(objId);
|
|
|
+ alarmCount = RepositoryContainer.RepositoryProject.id2alarmCount.get(objId);
|
|
|
|
|
|
// 从设备下删除
|
|
|
int existIndex = -1;
|
|
@@ -489,8 +489,8 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
// 从报警列表下删除
|
|
|
List<Integer> existIndexList = new ArrayList<Integer>();
|
|
|
- for (int index_alarm = 0; index_alarm < RepositoryContainer.RepositoryBase.alarmArray.set.size(); index_alarm++) {
|
|
|
- SceneDataObject alarmItem = RepositoryContainer.RepositoryBase.alarmArray.set.get(index_alarm);
|
|
|
+ for (int index_alarm = 0; index_alarm < RepositoryContainer.RepositoryProject.alarmArray.set.size(); index_alarm++) {
|
|
|
+ SceneDataObject alarmItem = RepositoryContainer.RepositoryProject.alarmArray.set.get(index_alarm);
|
|
|
if (alarmItem.value_object.get("id").value_prim.value.equals(id)) {
|
|
|
existIndexList.add(0, index_alarm);
|
|
|
}
|
|
@@ -501,7 +501,7 @@ public class RWDAlarmUtil {
|
|
|
alarmList.value_array.set.remove(existIndex);
|
|
|
}
|
|
|
for (int removeIndex : existIndexList) {
|
|
|
- RepositoryContainer.RepositoryBase.alarmArray.set.remove(removeIndex);
|
|
|
+ RepositoryContainer.RepositoryProject.alarmArray.set.remove(removeIndex);
|
|
|
}
|
|
|
} else {
|
|
|
// 只替换非空字段
|
|
@@ -521,7 +521,7 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
if (existIndexList.size() > 0) {
|
|
|
for (int removeIndex : existIndexList) {
|
|
|
- SceneDataObject sdoInner = RepositoryContainer.RepositoryBase.alarmArray.set.get(removeIndex);
|
|
|
+ SceneDataObject sdoInner = RepositoryContainer.RepositoryProject.alarmArray.set.get(removeIndex);
|
|
|
for (String key : sdoAlarm.keySet()) {
|
|
|
SceneDataValue sdvInner = sdoAlarm.get(key);
|
|
|
if (sdvInner == null || sdvInner.value_prim == null || sdvInner.value_prim.value == null) {
|
|
@@ -531,15 +531,20 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- RepositoryContainer.RepositoryBase.alarmArray.set.add(sdoAlarm);
|
|
|
+ RepositoryContainer.RepositoryProject.alarmArray.set.add(sdoAlarm);
|
|
|
}
|
|
|
}
|
|
|
alarmCount.value_prim.value = alarmList.value_array.set.size();
|
|
|
+
|
|
|
+ RepositoryImpl Repository = RepositoryContainer.instance;
|
|
|
+ Repository.addWaitCompute(RepositoryContainer.RepositoryProject.alarmArray);
|
|
|
+ Repository.addWaitCompute(alarmList);
|
|
|
+ Repository.addWaitCompute(alarmCount);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
public static synchronized void ProcessOrderDesc(String id, JSONObject alarm_order) {
|
|
|
- for (SceneDataObject sdo : RepositoryContainer.RepositoryBase.alarmArray.set) {
|
|
|
+ for (SceneDataObject sdo : RepositoryContainer.RepositoryProject.alarmArray.set) {
|
|
|
String idInner = (String) sdo.get("id").value_prim.value;
|
|
|
if (idInner.equals(id)) {
|
|
|
for (String key : alarm_order.keySet()) {
|
|
@@ -564,17 +569,17 @@ public class RWDAlarmUtil {
|
|
|
}
|
|
|
|
|
|
public static synchronized int refresh() throws Exception {
|
|
|
- RepositoryContainer.RepositoryBase.alarmArray.set.clear();
|
|
|
- for (String objId : RepositoryContainer.RepositoryBase.id2alarmList.keySet()) {
|
|
|
- RepositoryContainer.RepositoryBase.id2alarmList.get(objId).value_array.set.clear();
|
|
|
- RepositoryContainer.RepositoryBase.id2alarmCount.get(objId).value_prim.value = 0;
|
|
|
+ RepositoryContainer.RepositoryProject.alarmArray.set.clear();
|
|
|
+ for (String objId : RepositoryContainer.RepositoryProject.id2alarmList.keySet()) {
|
|
|
+ RepositoryContainer.RepositoryProject.id2alarmList.get(objId).value_array.set.clear();
|
|
|
+ RepositoryContainer.RepositoryProject.id2alarmCount.get(objId).value_prim.value = 0;
|
|
|
}
|
|
|
|
|
|
JSONArray Content;
|
|
|
if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
Content = new JSONArray();
|
|
|
String get_url = Constant.alarm_url + "/alarm-record/page" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
|
|
|
- + RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode
|
|
|
+ + RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode
|
|
|
+ "&size=65535¤t=1&dealType=0";
|
|
|
String getResultString = HttpClientUtil.get(get_url);
|
|
|
JSONObject getResult = JSON.parseObject(getResultString);
|
|
@@ -596,8 +601,8 @@ public class RWDAlarmUtil {
|
|
|
JSONObject postParamInner = new JSONObject();
|
|
|
postParamInner.put("appId", "0");
|
|
|
postParamInner.put("userId", "systemId");
|
|
|
- postParamInner.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
- postParamInner.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
+ postParamInner.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
+ postParamInner.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
postParamInner.put("ids", ids);
|
|
|
String post_url = Constant.alarm_url + "/alarmToWorkOrder/queryOrderStateByAlarmIds";
|
|
|
String postResultString = HttpClientUtil.post(post_url, postParamInner.toJSONString());
|
|
@@ -616,8 +621,8 @@ public class RWDAlarmUtil {
|
|
|
String post_url = Constant.alarm_url + "/alarm/queryAlarmList";
|
|
|
JSONObject postParam = new JSONObject();
|
|
|
postParam.put("userId", "systemId");
|
|
|
- postParam.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
- postParam.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
+ postParam.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
+ postParam.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
JSONArray treatState = new JSONArray();
|
|
|
treatState.add(1);
|
|
|
treatState.add(2);
|
|
@@ -704,8 +709,8 @@ public class RWDAlarmUtil {
|
|
|
if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
{
|
|
|
JSONObject handleJSON = new JSONObject();
|
|
|
- handleJSON.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
- handleJSON.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
+ handleJSON.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
|
|
|
+ handleJSON.put("projectId", RepositoryContainer.RepositoryProject.projectId);
|
|
|
handleJSON.put("appId", "systemId");
|
|
|
handleJSON.put("userId", paramJSON.get("userId"));
|
|
|
handleJSON.put("id", paramJSON.get("id"));
|