|
|
@@ -575,8 +575,8 @@ public class IotBoardServiceImpl implements IotBoardService {
|
|
|
Map<String, Object> objectMap = optional.get();
|
|
|
int index = resultList.indexOf(objectMap);
|
|
|
objectMap.put("historyAlarm", (int) objectMap.get("historyAlarm") + value.size());
|
|
|
- objectMap.put("currentAlarm", (int) objectMap.get("currentAlarm") + currentAlarm);
|
|
|
- objectMap.put("unDealAlarm", (int) objectMap.get("unDealAlarm") + unDealAlarm);
|
|
|
+ objectMap.put("currentAlarm", (int) objectMap.get("currentAlarm") + (int) currentAlarm);
|
|
|
+ objectMap.put("unDealAlarm", (int) objectMap.get("unDealAlarm") + (int) unDealAlarm);
|
|
|
|
|
|
List<AppAlarmDataPageVo> dataList = (List<AppAlarmDataPageVo>) objectMap.get("currentAlarmData");
|
|
|
dataList.addAll(getAlarmDataList(value, listEntry.getKey().toString(), cacheList, needAlarm));
|