Commit f8fec243 authored by tianyiming's avatar tianyiming

直流中心bug修改

parent e42c19db
...@@ -2139,7 +2139,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -2139,7 +2139,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
Map<String, Object> tempMap = new HashMap<>(); Map<String, Object> tempMap = new HashMap<>();
tempMap.put("name", y.get("name")); tempMap.put("name", y.get("name"));
tempMap.put("code", y.get("code")); tempMap.put("code", y.get("code"));
tempMap.put("total", totalMap.get(y.get("code"))); tempMap.put("total", Long.valueOf(totalMap.get(y.get("code")).toString())- Long.valueOf(alarmNumMap.get(y.get("code")).toString()));
tempMap.put("alarmNum", alarmNumMap.get(y.get("code"))); tempMap.put("alarmNum", alarmNumMap.get(y.get("code")));
list.add(tempMap); list.add(tempMap);
}); });
......
...@@ -1525,6 +1525,8 @@ ...@@ -1525,6 +1525,8 @@
idx_biz_station_info fs idx_biz_station_info fs
LEFT JOIN wl_equipment_specific_alarm wesi ON wesi.station_code = fs.`code` LEFT JOIN wl_equipment_specific_alarm wesi ON wesi.station_code = fs.`code`
AND wesi.`status` = 1 AND wesi.`status` = 1
WHERE
fs.`online` = 1
GROUP BY GROUP BY
fs.id, fs.id,
wesi.equipment_specific_id wesi.equipment_specific_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment