Commit 296dae06 authored by caotao's avatar caotao

1.监盘区域发电趋势图数据展示错误问题修改。

parent 3457cfb9
...@@ -318,9 +318,8 @@ public class MonitoringMapController extends BaseController { ...@@ -318,9 +318,8 @@ public class MonitoringMapController extends BaseController {
wrapper.eq(areaCode!=null,StationBasic::getAreaCode,areaCode); wrapper.eq(areaCode!=null,StationBasic::getAreaCode,areaCode);
List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper); List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
// 2023年11月8日 12点51分 库中存储的历史数据存在问题逻辑由原来的通过网关id查询数据修改为场站id
List<String> ids = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList()); List<String> ids = stationBasics.stream().map(stationBasic -> String.valueOf(stationBasic.getSequenceNbr())).collect(Collectors.toList());
SeriesData map= largeScreenImpl.getSeriesDataqy( new Date(),ids, areaCode); SeriesData map= largeScreenImpl.getSeriesDataqy( new Date(),ids, areaCode);
......
...@@ -508,7 +508,7 @@ public class LargeScreenImpl { ...@@ -508,7 +508,7 @@ public class LargeScreenImpl {
public List<Double> gettimedateqy( Date date,List<String> gatewayId){ public List<Double> gettimedateqy( Date date,List<String> stationId){
SimpleDateFormat myFmt2=new SimpleDateFormat("yyyyMM"); SimpleDateFormat myFmt2=new SimpleDateFormat("yyyyMM");
String monthy= myFmt2.format(date); String monthy= myFmt2.format(date);
...@@ -517,7 +517,7 @@ public class LargeScreenImpl { ...@@ -517,7 +517,7 @@ public class LargeScreenImpl {
value.add(RSD); value.add(RSD);
Map<String,List<String>> map=new HashMap<>(); Map<String,List<String>> map=new HashMap<>();
map.put("equipmentIndexName.keyword",value); map.put("equipmentIndexName.keyword",value);
map.put("gatewayId.keyword", gatewayId); map.put("stationId.keyword", stationId);
List<String> value1=new ArrayList<>(); List<String> value1=new ArrayList<>();
value1.add(monthy); value1.add(monthy);
map.put("moon.keyword",value1); map.put("moon.keyword",value1);
......
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