修改网关

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DeviceController.java

@@ -57,7 +57,7 @@ public class DeviceController extends BaseController {
             querysqlcount.append(" and equipmentNumber =").append(equipmentNumber);
             querysql.append(" and equipmentNumber =").append(equipmentNumber);
         }
-        
+
         querysql.append(" ORDER BY time  desc   LIMIT ").append(page.getSize()).append(" OFFSET ").append((page.getCurrent() - 1)*page.getSize());
         //每个分机的指标数据
         List<IndexDto> list = influxDButils.getListData(querysql.toString(),IndexDto.class);

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

@@ -69,7 +69,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")){
@@ -98,7 +98,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));
@@ -148,7 +148,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();