Commit 0d64c701 authored by tangwei's avatar tangwei

修改bug

parent 6549746f
...@@ -223,7 +223,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -223,7 +223,7 @@ public class MonitorFanIdxController extends BaseController {
StationBasic stationBasic = stationBasicMapper.selectById(stationId); StationBasic stationBasic = stationBasicMapper.selectById(stationId);
String gatewayId = stationBasic.getFanGatewayId(); String gatewayId = stationBasic.getFanGatewayId();
String[] columnList = new String[]{"日发电量", "月发电量", "年发电量"}; String[] columnList = new String[]{"日发电量", "月发电量", "年发电量"};
String[] columnLists = new String[]{"瞬时风速"}; String[] columnLists = new String[]{"30秒平均风速"};
Map<String, Object> columnMap = new HashMap<>(); Map<String, Object> columnMap = new HashMap<>();
for (String column : columnList) { for (String column : columnList) {
...@@ -232,7 +232,13 @@ public class MonitorFanIdxController extends BaseController { ...@@ -232,7 +232,13 @@ public class MonitorFanIdxController extends BaseController {
} }
for (String column : columnLists) { for (String column : columnLists) {
Double result = commonServiceImpl.getAvgvalueByIndicatior(gatewayId, column); Double result = commonServiceImpl.getAvgvalueByIndicatior(gatewayId, column);
columnMap.put(column, String.format("%.2f", result));
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("30秒平均风速"));
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
List<ESEquipments> result2 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
columnMap.put(column, String.format("%.2f", result2.get(0).getValueF()));
} }
Map<String, List<String>> queryCondtion1 = new HashMap<>(); Map<String, List<String>> queryCondtion1 = new HashMap<>();
......
...@@ -651,10 +651,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -651,10 +651,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
Map<String,Object> map1 = new HashMap<>(); Map<String,Object> map1 = new HashMap<>();
Map<String,Object> map2 = new HashMap<>(); Map<String,Object> map2 = new HashMap<>();
map1.put("data", values); map1.put("data", values);
if (StringUtils.isNotEmpty(gatewayId)){ // if (StringUtils.isNotEmpty(gatewayId)){
map2.put("data", valueList); // map2.put("data", valueList);
seriesData.add(map2); // seriesData.add(map2);
} // }
seriesData.add(map1); seriesData.add(map1);
map.put("seriesData", seriesData); map.put("seriesData", seriesData);
map.put("axisData",time); map.put("axisData",time);
......
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