1.大屏监盘全国发电量趋势、区域发电量趋势接口调整为部盾数据源。

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/BudunDayGenTrendDto.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import lombok.Data;
+
+@Data
+public class BudunDayGenTrendDto {
+    private String reporting_date;
+    private Double current_generating_capacity;
+    private Double last_generating_capacity;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/util/Constants.java

@@ -80,6 +80,7 @@ public class Constants {
     public static final String get_hours_num_top="method=scene_screen.data_interface.get_hours_num_top";
     public static final String get_generated_quota_trend="method=scene_screen.data_interface.get_generated_quota_trend";
     public static final String get_province_station_item="method=scene_screen.data_interface.get_province_station_item";
+    public static final String get_day_generation_trend="method=scene_screen.data_interface.get_day_generation_trend";
     public static final String resovleRule_data = "data";
     public static final String areaChinese="区域";
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.SeriesData;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,4 +31,5 @@ public interface MonitorService {
     Map<String, Object> gettimedateyfdqs();
     Map<String, Object> gettimedateyfd(String areaName);
      Map<String, Object> gettimedateqyyfd(String areaName);
+    SeriesData getSeriesDataqg();
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.StationType;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.BudunDayGenTrendDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.BudunMonthTrendDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.BundunCompleteDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
@@ -17,8 +18,10 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
 import com.yeejoin.amos.boot.module.jxiop.api.util.HttpRequestUtil;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.SeriesData;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.StationCacheInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.MonitorService;
+import com.yeejoin.amos.boot.module.jxiop.biz.utils.DateUtil;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.elasticsearch.search.aggregations.Aggregation;
@@ -33,6 +36,7 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import java.io.PipedReader;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -174,7 +178,8 @@ public class MonitorServiceImpl implements MonitorService {
         }
         return mapjn;
     }
-@Override
+
+    @Override
     public Map<String, Object> gettimedateyfdqs() {
         String requestUrl = Constants.BASE_URL + "?" + Constants.get_generated_quota_trend;
         List<BundunCompleteDto> bundunCompleteDtoList = httpRequestUtil.getResPonse(requestUrl, Constants.REQUEST_GET, "", Constants.resovleRule_data, BundunCompleteDto.class);
@@ -228,4 +233,79 @@ public class MonitorServiceImpl implements MonitorService {
         return mapjn;
 
     }
+
+    @Override
+    public SeriesData getSeriesDataqg() {
+        String requestUrl = Constants.BASE_URL + "?" + Constants.get_day_generation_trend;
+        List<BudunDayGenTrendDto> budunDayGenTrendDtoList = httpRequestUtil.getResPonse(requestUrl, Constants.REQUEST_GET, "", Constants.resovleRule_data, BudunDayGenTrendDto.class);
+        List<Map<String,Object>> list=new ArrayList<>();
+        List<String> listdate = new ArrayList<>();
+        List<Double> listjn= new ArrayList<>();
+        List<Double> listqn= new ArrayList<>();
+        String currentYear = LocalDate.now().getYear()+"-";
+        budunDayGenTrendDtoList.forEach(bundunDayGenTrendDto -> {
+         listjn.add(bundunDayGenTrendDto.getCurrent_generating_capacity());
+         listqn.add(bundunDayGenTrendDto.getLast_generating_capacity());
+         listdate.add(bundunDayGenTrendDto.getReporting_date().replace(currentYear,""));
+        });
+        Map<String, Object> mapjn = new HashMap<>();
+        mapjn.put("data", listjn);
+        mapjn.put("name", "当前值");
+        Map<String, Object> mapqn = new HashMap<>();
+        mapqn.put("data", listqn);
+        mapqn.put("name", "同期值");
+        list.add(mapjn);
+        list.add(mapqn);
+        SeriesData seriesData = new SeriesData();
+        seriesData.setSeriesData(list);
+        //获取日期
+
+        seriesData.setAxisData(listdate);
+        try {
+            emqKeeper.getMqttClient().publish("countryFd", JSON.toJSONString(seriesData).getBytes(), 0, false);
+        } catch (MqttException e) {
+            e.printStackTrace();
+        }
+
+        return seriesData;
+    }
+
+    public SeriesData getSeriesDataqy( String areaCode){
+        MapRegion mapRegion = mapRegionMapper.selectOne(new QueryWrapper<MapRegion>().eq("areaCode",areaCode));
+        String areaName="";
+        if(!ObjectUtils.isEmpty(mapRegion)&&!ObjectUtils.isEmpty(mapRegion.getName())&&!mapRegion.getName().contains(Constants.areaChinese)){
+        areaName = mapRegion.getName().replace(Constants.areaChinese,"");
+        }
+        String requestUrl = Constants.BASE_URL + "?" + Constants.get_day_generation_trend+"&areaName="+areaName;
+        List<BudunDayGenTrendDto> budunDayGenTrendDtoList = httpRequestUtil.getResPonse(requestUrl, Constants.REQUEST_GET, "", Constants.resovleRule_data, BudunDayGenTrendDto.class);
+        List<Map<String,Object>> list=new ArrayList<>();
+        List<String> listdate = new ArrayList<>();
+        List<Double> listjn= new ArrayList<>();
+        List<Double> listqn= new ArrayList<>();
+        String currentYear = LocalDate.now().getYear()+"-";
+        budunDayGenTrendDtoList.forEach(bundunDayGenTrendDto -> {
+            listjn.add(bundunDayGenTrendDto.getCurrent_generating_capacity());
+            listqn.add(bundunDayGenTrendDto.getLast_generating_capacity());
+            listdate.add(bundunDayGenTrendDto.getReporting_date().replace(currentYear,""));
+        });
+        Map<String, Object> mapjn = new HashMap<>();
+        mapjn.put("data", listjn);
+        mapjn.put("name", "当前值");
+        Map<String, Object> mapqn = new HashMap<>();
+        mapqn.put("data", listqn);
+        mapqn.put("name", "同期值");
+        list.add(mapjn);
+        list.add(mapqn);
+        SeriesData seriesData = new SeriesData();
+        seriesData.setSeriesData(list);
+        seriesData.setAxisData(listdate);
+        try {
+            emqKeeper.getMqttClient().publish("qy/fdqs/"+areaCode, JSON.toJSONString(seriesData).getBytes(),1,true);
+        } catch (MqttException e) {
+            e.printStackTrace();
+        }
+
+        return seriesData;
+
+    }
 }