|
@@ -473,21 +473,22 @@ public class RWDDownloadUtil {
|
|
|
{
|
|
|
Map<String, String> alarmTypeMap = new ConcurrentHashMap<String, String>();
|
|
|
if (Constant.alarm_service_name.equalsIgnoreCase("ibms-alarm")) {
|
|
|
- boolean use_group = true;
|
|
|
- if (use_group) {
|
|
|
- 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++) {
|
|
|
- JSONObject ContentItem = Content.getJSONObject(ii);
|
|
|
- String itemCode = ContentItem.getString("itemGroupCode");
|
|
|
- String name = ContentItem.getString("itemGroupName");
|
|
|
- alarmTypeMap.put(itemCode, name);
|
|
|
- }
|
|
|
- } else {
|
|
|
+ // boolean use_group = false;
|
|
|
+ // if (use_group) {
|
|
|
+ // 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++) {
|
|
|
+ // JSONObject ContentItem = Content.getJSONObject(ii);
|
|
|
+ // 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");
|