|
@@ -331,27 +331,37 @@ public class RWDDownloadUtil {
|
|
|
{
|
|
|
Map<String, String> alarmTypeMap = new HashMap<String, String>();
|
|
|
if (Constant.alarm_rest_get) {
|
|
|
- for (int i = 0; i < classArray.size(); i++) {
|
|
|
- JSONObject classItem = classArray.getJSONObject(i);
|
|
|
- String ibmsSceneCode = classItem.getString("ibmsSceneCode");
|
|
|
- String ibmsClassCode = classItem.getString("ibmsClassCode");
|
|
|
- JSONObject criteria = new JSONObject();
|
|
|
- criteria.put("appId", "0");
|
|
|
- criteria.put("userId", "systemId");
|
|
|
- criteria.put("projectId", RepositoryContainer.RepositoryBase.projectId);
|
|
|
- criteria.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
|
|
|
+ boolean use_group = true;
|
|
|
+ if (use_group) {
|
|
|
String post_result = HttpClientUtil.get(
|
|
|
- Constant.alarm_rest + "alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode + "?projectId="
|
|
|
+ Constant.alarm_rest + "alarm-record/selectItemGroupCode" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
|
|
|
+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode,
|
|
|
null);
|
|
|
JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
- JSONArray Content = resultJSON.getJSONArray("Content");
|
|
|
+ JSONArray Content = resultJSON.getJSONArray("Item");
|
|
|
for (int ii = 0; ii < Content.size(); ii++) {
|
|
|
JSONObject ContentItem = Content.getJSONObject(ii);
|
|
|
- String itemCode = ContentItem.getString("itemCode");
|
|
|
- String name = ContentItem.getString("name");
|
|
|
+ String itemCode = ContentItem.getString("itemGroupCode");
|
|
|
+ String name = ContentItem.getString("itemGroupName");
|
|
|
alarmTypeMap.put(itemCode, name);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ for (int i = 0; i < classArray.size(); i++) {
|
|
|
+ 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);
|
|
|
+ JSONObject resultJSON = JSON.parseObject(post_result);
|
|
|
+ JSONArray Content = resultJSON.getJSONArray("Content");
|
|
|
+ for (int ii = 0; ii < Content.size(); ii++) {
|
|
|
+ JSONObject ContentItem = Content.getJSONObject(ii);
|
|
|
+ String itemCode = ContentItem.getString("itemCode");
|
|
|
+ String name = ContentItem.getString("name");
|
|
|
+ alarmTypeMap.put(itemCode, name);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
JSONObject criteria = new JSONObject();
|
|
@@ -397,7 +407,7 @@ public class RWDDownloadUtil {
|
|
|
JSONObject itemAlarmType = itemListResultContent.getJSONObject(ii);
|
|
|
String itemId = itemAlarmType.getString("id");
|
|
|
String alarmDefineListString = HttpClientUtil
|
|
|
- .get(Constant.alarm_rest + "alarm-config/configPage" + "?userId=systemId&appId=0" + "&projectId="
|
|
|
+ .get(Constant.alarm_rest + "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);
|