Browse Source

改用itemGroupCode

menglu 3 years ago
parent
commit
06c3aae3d9

+ 6 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -52,10 +52,10 @@ public class RWDAlarmUtil {
 			JSONObject params = (JSONObject) paramObject.get("params");
 			JSONArray Content;
 			if (Constant.alarm_rest_get) {
-				String get_url = Constant.alarm_rest + "alarm-record/page?";
+				String get_url = Constant.alarm_rest + "alarm-record/page";
 				StringBuffer sb = new StringBuffer();
-				sb.append("projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode);
-				sb.append("&userId=" + "systemId");
+				sb.append("?appId=" + "0" + "&userId=" + "systemId" + "&projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode="
+						+ RepositoryContainer.RepositoryBase.groupCode);
 				sb.append("&searchCount=" + "true");
 				if (params.containsKey("报警级别")) {
 					sb.append("&level=" + params.get("报警级别"));
@@ -95,6 +95,7 @@ public class RWDAlarmUtil {
 			} else {
 				String post_url = Constant.alarm_rest + "alarm/queryAlarmList";
 				JSONObject postParam = new JSONObject();
+				postParam.put("appId", "0");
 				postParam.put("userId", "systemId");
 				postParam.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
 				postParam.put("projectId", RepositoryContainer.RepositoryBase.projectId);
@@ -363,8 +364,8 @@ public class RWDAlarmUtil {
 
 		JSONArray Content;
 		if (Constant.alarm_rest_get) {
-			String get_url = Constant.alarm_rest + "/alarm-record/list?projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode="
-					+ RepositoryContainer.RepositoryBase.groupCode;
+			String get_url = Constant.alarm_rest + "/alarm-record/list" + "?appId=" + "0" + "&userId=" + "systemId" + "&projectId="
+					+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode;
 			String getResultString = HttpClientUtil.get(get_url, null);
 			JSONObject getResult = JSON.parseObject(getResultString);
 			Content = (JSONArray) getResult.get("Item");

+ 24 - 14
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -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);