修改社会贡献代码

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.injector.methods.SelectOne;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
@@ -83,7 +85,7 @@ public class MonitoringServiceImpl {
                 Region region = regionList.get(i);
                 List<StationBasic> list = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("belong_area",region.getRegionCode()));
                 list.forEach(stationBasic -> {
-                    if (!ObjectUtils.isEmpty(stationBasic.getGatewayId()) && !ObjectUtils.isEmpty(stationBasic.getStationNumber())) {
+                    if (!ObjectUtils.isEmpty(stationBasic.getFanGatewayId()) && !ObjectUtils.isEmpty(stationBasic.getStationNumber())) {
                         regionNationWideDto.setJsJoin(true);
                     }
                     if(stationBasic.getStationType().equals("FDZ")){
@@ -112,7 +114,7 @@ public class MonitoringServiceImpl {
                 regionNationWideDto.setStaitionType(stationBasic.getStationType());
                 String speendOrirradiate = "";
                 if (stationBasic.getStationType().equals("FDZ")) {
-                    speendOrirradiate = String.valueOf(getIndicatoralueAvage(stationBasic.getGatewayId(), "30秒平均风速"));
+                    speendOrirradiate = String.valueOf(getIndicatoralueAvage(stationBasic.getFanGatewayId(), "30秒平均风速"));
                     regionNationWideDto.setSpeendOrirradiate(speendOrirradiate);
                 }else{
                     regionNationWideDto.setSpeendOrirradiate(String.valueOf(Math.random()*1000));
@@ -170,7 +172,7 @@ public class MonitoringServiceImpl {
         //获取所有网关id不为空的数据
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("gateway_id"));
         stationBasicList.forEach(stationBasic -> {
-            totalSocialContribution.updateAndGet(v -> v + (Double) monitorFanIndicatorImpl.getIndicatoralueTotal(stationBasic.getGatewayId(), "年发电量"));
+            totalSocialContribution.updateAndGet(v -> v + (Double) monitorFanIndicatorImpl.getIndicatoralueTotal(stationBasic.getFanGatewayId(), "年发电量"));
         });
         SocialContributionDto co2 = new SocialContributionDto();
         SocialContributionDto coal = new SocialContributionDto();