Commit 53910120 authored by tianyiming's avatar tianyiming

修改bug

parent 2f5ba888
...@@ -307,7 +307,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE ...@@ -307,7 +307,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
* *
* @return * @return
*/ */
Map<String, Object> getFireSystemInfo(HashMap<String, Object> hashMap); List<Map<String, Object>> getFireSystemInfo(HashMap<String, Object> hashMap);
/** /**
* 获取系统近一月告警设备top5 * 获取系统近一月告警设备top5
......
...@@ -1267,10 +1267,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1267,10 +1267,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override @Override
public Map<String, Object> getSystemStatus(HashMap<String, Object> hashMap) { public Map<String, Object> getSystemStatus(HashMap<String, Object> hashMap) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
Map<String, Object> map = fireFightingSystemMapper.getFireSystemInfo(hashMap); List<Map<String, Object>> map = fireFightingSystemMapper.getFireSystemInfo(hashMap);
if (!map.isEmpty()) { if (!map.isEmpty()) {
ArrayList<Object> status = new ArrayList<>(); ArrayList<Object> status = new ArrayList<>();
status.add(map.get("status")); status.add(map.get(0).get("status"));
resultMap.put("values", status); resultMap.put("values", status);
resultMap.put("labels", status); resultMap.put("labels", status);
} }
...@@ -1280,9 +1280,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1280,9 +1280,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override @Override
public Map<String, Object> getSystemName(HashMap<String, Object> hashMap) { public Map<String, Object> getSystemName(HashMap<String, Object> hashMap) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
Map<String, Object> map = fireFightingSystemMapper.getFireSystemInfo(hashMap); List<Map<String, Object>> map = fireFightingSystemMapper.getFireSystemInfo(hashMap);
if (!map.isEmpty()) { if (!map.isEmpty()) {
resultMap.put("name", map.get("name")); resultMap.put("name", map.get(0).get("name"));
} }
return resultMap; return resultMap;
} }
......
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