|
@@ -18,7 +18,6 @@ import com.persagy.ibms.core.data.SceneDataPrimitive;
|
|
|
import com.persagy.ibms.core.data.SceneDataSet;
|
|
|
import com.persagy.ibms.core.data.SceneDataValue;
|
|
|
import com.persagy.ibms.core.util.LogUtil;
|
|
|
-import com.persagy.ibms.core.util.PathUtil;
|
|
|
import com.persagy.ibms.core.util.RWDUtil;
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -65,6 +64,7 @@ public class RWDAlarmUtil {
|
|
|
alarmColChange.add("status");
|
|
|
alarmColChange.add("treatState");
|
|
|
alarmColChange.add("treatMode");
|
|
|
+ alarmColChange.add("nature");
|
|
|
}
|
|
|
|
|
|
public static JSONObject get_alarm_detail(JSONObject paramObject) {
|
|
@@ -523,14 +523,15 @@ public class RWDAlarmUtil {
|
|
|
SceneDataObject sdoAlarm = RWDUtil.object2sod(alarm);
|
|
|
chixushijian(sdf, currentTime, sdoAlarm);
|
|
|
if (existIndex != -1) {
|
|
|
- SceneDataObject sdoInner = alarmList.value_array.set.get(existIndex);
|
|
|
+ SceneDataObject sdoExist = alarmList.value_array.set.get(existIndex);
|
|
|
for (String key : sdoAlarm.keySet()) {
|
|
|
SceneDataValue sdvInner = sdoAlarm.get(key);
|
|
|
if (sdvInner == null || sdvInner.value_prim == null || sdvInner.value_prim.value == null) {
|
|
|
continue;
|
|
|
}
|
|
|
- if (!sdvInner.value_prim.value.equals(sdoInner.get(key))) {
|
|
|
- sdoInner.put(key, sdoAlarm.get(key));
|
|
|
+ if (sdoExist.get(key) == null || sdoExist.get(key).value_prim == null
|
|
|
+ || !sdvInner.value_prim.value.equals(sdoExist.get(key).value_prim.value)) {
|
|
|
+ sdoExist.put(key, sdoAlarm.get(key));
|
|
|
colChangeMap.put(key, true);
|
|
|
}
|
|
|
}
|
|
@@ -575,13 +576,6 @@ public class RWDAlarmUtil {
|
|
|
SceneDataObject objSDV = Repository.id2sdv.get(objId);
|
|
|
SceneDataValue sv_alarmList = objSDV.get("报警列表");
|
|
|
SceneDataValue sv_alarmCount = objSDV.get("报警数量");
|
|
|
- try {
|
|
|
- String path_alarmList = PathUtil.getDataPath(sv_alarmList);
|
|
|
- String path_alarmCount = PathUtil.getDataPath(sv_alarmCount);
|
|
|
- log.warn(path_alarmList);
|
|
|
- log.warn(path_alarmCount);
|
|
|
- } catch (Exception e) {
|
|
|
- }
|
|
|
if (alarmListRowChange) {
|
|
|
// Repository.ComputeOccur(sv_alarmList);
|
|
|
Repository.addWaitCompute(sv_alarmList);
|