|
@@ -73,44 +73,27 @@ public class RWDUtil {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
- public static boolean isRunParam(SceneDataObject infoJSON) {
|
|
|
|
|
|
+ public static int getInfoType(SceneDataObject infoJSON) {
|
|
String firstTag = infoJSON.get("firstTag") == null ? null : (String) infoJSON.get("firstTag").value_prim.value;
|
|
String firstTag = infoJSON.get("firstTag") == null ? null : (String) infoJSON.get("firstTag").value_prim.value;
|
|
String secondTag = infoJSON.get("secondTag") == null ? null : (String) infoJSON.get("secondTag").value_prim.value;
|
|
String secondTag = infoJSON.get("secondTag") == null ? null : (String) infoJSON.get("secondTag").value_prim.value;
|
|
- String category = (String) infoJSON.get("category").value_prim.value;
|
|
|
|
- if (category.equals("SEQUENTIAL")) {
|
|
|
|
- if (firstTag != null && (firstTag.contains("运行参数"))) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- if (secondTag != null && (secondTag.contains("运行参数"))) {
|
|
|
|
- return true;
|
|
|
|
|
|
+ if (firstTag != null) {
|
|
|
|
+ if (firstTag.contains("运行参数")) {
|
|
|
|
+ return 1;
|
|
|
|
+ } else if (firstTag.contains("事件记录")) {
|
|
|
|
+ if (secondTag != null && secondTag.contains("报警消息")) {
|
|
|
|
+ return 1;
|
|
|
|
+ } else {
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
|
|
|
+ } else if (firstTag.contains("设定参数")) {
|
|
|
|
+ if (secondTag != null && secondTag.contains("设定反馈值")) {
|
|
|
|
+ return 1;
|
|
|
|
+ } else {
|
|
|
|
+ return 2;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- // String firstTag = (infoJSON["firstTag"] as JValue).Value as String;
|
|
|
|
- // String secondTag = (infoJSON["secondTag"] as JValue).Value as String;
|
|
|
|
- // if (firstTag != null && firstTag.Contains("运行参数") || secondTag != null && secondTag.Contains("运行参数"))
|
|
|
|
- // {
|
|
|
|
- // return true;
|
|
|
|
- // }
|
|
|
|
- // else if (firstTag != null && firstTag.Contains("设定参数") || secondTag != null && secondTag.Contains("设定参数"))
|
|
|
|
- // {
|
|
|
|
- // }
|
|
|
|
- } else if (category.equals("GRADATION")) {
|
|
|
|
- if (firstTag != null && (firstTag.contains("报警消息"))) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- if (secondTag != null && (secondTag.contains("报警消息"))) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- // String firstTag = (infoJSON["firstTag"] as JValue).Value as String;
|
|
|
|
- // String secondTag = (infoJSON["secondTag"] as JValue).Value as String;
|
|
|
|
- // if (firstTag != null && firstTag.Contains("报警消息") || secondTag != null && secondTag.Contains("报警消息"))
|
|
|
|
- // {
|
|
|
|
- // return true;
|
|
|
|
- // }
|
|
|
|
- // else if (firstTag != null && firstTag.Contains("设定参数") || secondTag != null && secondTag.Contains("设定参数"))
|
|
|
|
- // {
|
|
|
|
- // }
|
|
|
|
}
|
|
}
|
|
- return false;
|
|
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
public static boolean isRunParam(List<SceneDataObject> infoArray, String code) {
|
|
public static boolean isRunParam(List<SceneDataObject> infoArray, String code) {
|
|
@@ -119,49 +102,9 @@ public class RWDUtil {
|
|
if (!infoJSON.get("code").value_prim.value.equals(code)) {
|
|
if (!infoJSON.get("code").value_prim.value.equals(code)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- if (isRunParam(infoJSON)) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public static boolean isSetParam(SceneDataObject infoJSON) {
|
|
|
|
- String firstTag = infoJSON.get("firstTag") == null ? null : (String) infoJSON.get("firstTag").value_prim.value;
|
|
|
|
- String secondTag = infoJSON.get("secondTag") == null ? null : (String) infoJSON.get("secondTag").value_prim.value;
|
|
|
|
- String category = (String) infoJSON.get("category").value_prim.value;
|
|
|
|
- if (category.equals("SEQUENTIAL")) {
|
|
|
|
- if (firstTag != null && (firstTag.contains("设定参数"))) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- if (secondTag != null && (secondTag.contains("设定参数"))) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- // String firstTag = (infoJSON["firstTag"] as JValue).Value as String;
|
|
|
|
- // String secondTag = (infoJSON["secondTag"] as JValue).Value as String;
|
|
|
|
- // if (firstTag != null && firstTag.Contains("运行参数") || secondTag != null && secondTag.Contains("运行参数"))
|
|
|
|
- // {
|
|
|
|
- // return true;
|
|
|
|
- // }
|
|
|
|
- // else if (firstTag != null && firstTag.Contains("设定参数") || secondTag != null && secondTag.Contains("设定参数"))
|
|
|
|
- // {
|
|
|
|
- // }
|
|
|
|
- } else if (category.equals("GRADATION")) {
|
|
|
|
- if (firstTag != null && (firstTag.contains("设定参数"))) {
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- if (secondTag != null && (secondTag.contains("设定参数"))) {
|
|
|
|
|
|
+ if (getInfoType(infoJSON) == 1) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
- // String firstTag = (infoJSON["firstTag"] as JValue).Value as String;
|
|
|
|
- // String secondTag = (infoJSON["secondTag"] as JValue).Value as String;
|
|
|
|
- // if (firstTag != null && firstTag.Contains("报警消息") || secondTag != null && secondTag.Contains("报警消息"))
|
|
|
|
- // {
|
|
|
|
- // return true;
|
|
|
|
- // }
|
|
|
|
- // else if (firstTag != null && firstTag.Contains("设定参数") || secondTag != null && secondTag.Contains("设定参数"))
|
|
|
|
- // {
|
|
|
|
- // }
|
|
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
@@ -172,7 +115,7 @@ public class RWDUtil {
|
|
if (!infoJSON.get("code").value_prim.value.equals(code)) {
|
|
if (!infoJSON.get("code").value_prim.value.equals(code)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- if (isSetParam(infoJSON)) {
|
|
|
|
|
|
+ if (getInfoType(infoJSON) == 2) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|