Commit 667d7fd7 authored by tangwei's avatar tangwei

修改bug

parent fd28d54d
...@@ -838,14 +838,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -838,14 +838,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum)); queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
} }
queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList(frontModule));
Map<String, String> likeMap = new HashMap<>(); Map<String, String> likeMap = new HashMap<>();
likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule); likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
if (stationType.equals("FDZ")) { if (stationType.equals("FDZ")) {
queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList(systemType)); queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList(systemType));
} else { } else {
likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, systemType); likeMap.put(CommonConstans.QueryStringSystemType, systemType);
} }
List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap); List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
List<Map<String, Object>> statusMaps = new ArrayList<>(); List<Map<String, Object>> statusMaps = new ArrayList<>();
for (ESEquipments listDatum : indicatorsDtoList) { for (ESEquipments listDatum : indicatorsDtoList) {
......
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