|
@@ -147,6 +147,7 @@ public class AlarmHandleServiceImpl {
|
|
String funcId = jsonObject.getString("funcId");
|
|
String funcId = jsonObject.getString("funcId");
|
|
// 采集值
|
|
// 采集值
|
|
String value = jsonObject.getString("value");
|
|
String value = jsonObject.getString("value");
|
|
|
|
+ log.debug("设备id: {}, 报警类型: {}, 监测指标:{},采集值:{}", meterId, itemCode, funcId, value);
|
|
// 处理iot数据
|
|
// 处理iot数据
|
|
HashMap<String, Object> paramMap = new HashMap<>();
|
|
HashMap<String, Object> paramMap = new HashMap<>();
|
|
JSONArray funcIdArray = JSON.parseArray(funcId);
|
|
JSONArray funcIdArray = JSON.parseArray(funcId);
|
|
@@ -190,7 +191,6 @@ public class AlarmHandleServiceImpl {
|
|
*/
|
|
*/
|
|
private void triggerOrEndAlarm(String dataTime, String meterId, String itemCode, HashMap<String, Object> paramMap)
|
|
private void triggerOrEndAlarm(String dataTime, String meterId, String itemCode, HashMap<String, Object> paramMap)
|
|
throws Exception {
|
|
throws Exception {
|
|
- log.debug("判断是否满足报警条件:设备id -> {}, 报警类型 -> {}", meterId, itemCode);
|
|
|
|
// 获取设备的报警条件
|
|
// 获取设备的报警条件
|
|
ObjConditionInfo objConditionInfo = alarmRedisCache.getAlarmConditionsByObjId(meterId);
|
|
ObjConditionInfo objConditionInfo = alarmRedisCache.getAlarmConditionsByObjId(meterId);
|
|
if (objConditionInfo == null || CollectionUtils.isEmpty(objConditionInfo.getConditions())) {
|
|
if (objConditionInfo == null || CollectionUtils.isEmpty(objConditionInfo.getConditions())) {
|