大屏-区域功率曲线显示异常问题处理。

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java

@@ -960,8 +960,8 @@ public Map<String,Object> gettimedateyfd( ){
 //        String gfGatewayIds="";
 //        List<String> fdGatewayId = stationBasicListfd.stream().map(StationBasic::getBoosterGatewayId).collect(Collectors.toList());
 //        List<String> gfGatewayId = stationBasicListgf.stream().map(StationBasic::getBoosterGatewayId).collect(Collectors.toList());
-        String fdGatewayIds= stationBasicListfd.stream().map(StationBasic::getBoosterGatewayId).collect(Collectors.joining(","));
-        String gfGatewayIds=stationBasicListgf.stream().map(StationBasic::getBoosterGatewayId).collect(Collectors.joining(","));
+        String fdGatewayIds= stationBasicListfd.stream().map(stationBasic -> "'"+stationBasic.getBoosterGatewayId()+"'").collect(Collectors.joining(","));
+        String gfGatewayIds=stationBasicListgf.stream().map(stationBasic -> "'"+stationBasic.getBoosterGatewayId()+"'").collect(Collectors.joining(","));
 
         List<StationBasic> stationBasicListAll=new ArrayList<>();
         stationBasicListAll.addAll(stationBasicListfd);
@@ -979,13 +979,13 @@ public Map<String,Object> gettimedateyfd( ){
         Map<String, Object> activePowerInfo = new HashMap<>();
         List<IndicatorData> activePowerListFD = new ArrayList<>();
         List<IndicatorData> activePowerListGF = new ArrayList<>();
-        Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
-        Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
-        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        String startTime = sdf.format(currentDayStartTime);
-        String endTime= sdf.format(currentDayEndTime);
+//        Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+//        Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+//        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+//        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+//        String startTime = sdf.format(currentDayStartTime);
+//        String endTime= sdf.format(currentDayEndTime);
 
 
 
@@ -993,14 +993,14 @@ public Map<String,Object> gettimedateyfd( ){
 //        String endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
 
 
-        activePowerListFD = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeqg(CommonConstans.xiazaoActivePowerPoint, startTime, endTime, fdGatewayIds);
+        activePowerListFD = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.xiazaoActivePowerPoint, fdGatewayIds);
 
-        activePowerListGF = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeqg(CommonConstans.taiheActivePowerPoint, startTime, endTime, gfGatewayIds);
+        activePowerListGF = indicatorDataMapper.selectDataByequipmentIndexNameAndtimeqgNew(CommonConstans.taiheActivePowerPoint, gfGatewayIds);
         System.out.println(JSON.toJSONString(activePowerListFD));
         for (int i = 0; i < activePowerListFD.size(); i++) {
             IndicatorData indicatorData = activePowerListFD.get(i);
             IndicatorData indicatorData2 = activePowerListGF.get(i);
-            time.add(indicatorData.getXtime());
+            time.add(cn.hutool.core.date.DateUtil.format(indicatorData.getCreatedTime(), "HH:mm"));
             // Double vl=   indicatorData.getValueF()+indicatorData2.getValueF() * CommonConstans.kwToMv;
             Double vl=  Double.valueOf(String.format(CommonConstans.Twodecimalplaces, indicatorData.getValueF()))+
                     Double.valueOf(String.format(CommonConstans.Twodecimalplaces, indicatorData2.getValueF() * CommonConstans.kwToMv));