Browse Source

报警类型使用分组名和分组码

menglu 3 years ago
parent
commit
235d073128

+ 11 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -136,7 +136,17 @@ public class RWDAlarmUtil {
 					sb.append("&dealType=1");
 				}
 				if (params.containsKey("报警类型")) {
-					sb.append("&itemCode=" + params.getString("报警类型"));
+					Map<String, String> alarmTypeName2Code = new ConcurrentHashMap<String, String>();
+					for (SceneDataObject sdo : RepositoryContainer.instance.ZKTAlarmTypeArray.set) {
+						String name = (String) sdo.get("name").value_prim.value;
+						String code = (String) sdo.get("code").value_prim.value;
+						alarmTypeName2Code.put(name, code);
+					}
+					String itemGourpCode = alarmTypeName2Code.get(params.getString("报警类型"));
+					if (itemGourpCode != null) {
+						sb.append("&itemGroupCode=" + itemGourpCode);
+					}
+					// sb.append("&itemCode=" + params.getString("报警类型"));
 					// sb.append("&itemName=" + params.getString("报警类型"));
 					// sb.append("&itemName=" + URLEncoder.encode(params.getString("报警类型"), "utf-8"));
 				}

+ 4 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -521,6 +521,10 @@ public class RWDDownloadUtil {
 							JSONObject ContentItem = Content.getJSONObject(ii);
 							String itemCode = ContentItem.getString("itemCode");
 							String name = ContentItem.getString("name");
+							if (ContentItem.containsKey("itemGroupCode") && ContentItem.containsKey("itemGroupName")) {
+								itemCode = ContentItem.getString("itemGroupCode");
+								name = ContentItem.getString("itemGroupName");
+							}
 							alarmTypeMap.put(itemCode, name);
 						}
 					}