diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index a4d4f50f4..6aa0fe9d0 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -27,6 +27,8 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.thirdparty.amap.service.AMapService; +import com.jsowell.thirdparty.common.NotificationDTO; +import com.jsowell.thirdparty.common.NotificationService; import com.jsowell.thirdparty.platform.service.impl.GuiZhouPlatformServiceImpl; import com.jsowell.thirdparty.platform.service.impl.JiLinPlatformServiceImpl; import com.jsowell.thirdparty.platform.service.impl.SiChuanPlatformServiceImpl; @@ -67,6 +69,9 @@ public class JsowellTask { @Autowired private RedisCache redisCache; + @Autowired + private NotificationService notificationService; + @Autowired private AMapService aMapService; @@ -235,50 +240,75 @@ public class JsowellTask { log.debug("PRE环境不执行"); return; } - // 查询出要推送的站点(贵州、) - try { - String thirdPartyType = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(); + + List thirdPartyTypeList = Lists.newArrayList(ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(), + ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(), + ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode() + ); + + for (String thirdPartyType : thirdPartyTypeList) { List stationInfoVOS = thirdPartyStationRelationService.selectStationList(thirdPartyType); + if (CollectionUtils.isEmpty(stationInfoVOS)) { + continue; + } List stationIdList = stationInfoVOS.stream() .map(StationInfoVO::getStationId) .collect(Collectors.toList()); - GuiZhouPlatformServiceImpl guiZhouPlatformService = new GuiZhouPlatformServiceImpl(); - guiZhouPlatformService.notificationPowerInfo(stationIdList); - } catch (Exception e) { - log.error("贵州省平台推送充电站实时功率失败", e); + for (String stationId : stationIdList) { + NotificationDTO dto = new NotificationDTO(); + dto.setStationId(stationId); + dto.setPlatformType(thirdPartyType); + notificationService.notificationStationPowerInfo(dto); + } } + + // 查询出要推送的站点(贵州、) + // try { + // String thirdPartyType = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(); + // List stationInfoVOS = thirdPartyStationRelationService.selectStationList(thirdPartyType); + // + // List stationIdList = stationInfoVOS.stream() + // .map(StationInfoVO::getStationId) + // .collect(Collectors.toList()); + // + // GuiZhouPlatformServiceImpl guiZhouPlatformService = new GuiZhouPlatformServiceImpl(); + // guiZhouPlatformService.notificationPowerInfo(stationIdList); + // } catch (Exception e) { + // log.error("贵州省平台推送充电站实时功率失败", e); + // } + //四川省平台推送充电站实时功率 - try { - String thirdPartyType2 = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); - List stationInfoVOS2 = thirdPartyStationRelationService.selectStationList(thirdPartyType2); - - List stationIdList2 = stationInfoVOS2.stream() - .map(StationInfoVO::getStationId) - .collect(Collectors.toList()); - - SiChuanPlatformServiceImpl sichuanPlatformService = new SiChuanPlatformServiceImpl(); - sichuanPlatformService.notificationPowerInfo(stationIdList2); - } catch (Exception e) { - log.error("四川省平台推送充电站实时功率失败", e); - } + // try { + // String thirdPartyType2 = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); + // List stationInfoVOS2 = thirdPartyStationRelationService.selectStationList(thirdPartyType2); + // + // List stationIdList2 = stationInfoVOS2.stream() + // .map(StationInfoVO::getStationId) + // .collect(Collectors.toList()); + // + // SiChuanPlatformServiceImpl sichuanPlatformService = new SiChuanPlatformServiceImpl(); + // sichuanPlatformService.notificationPowerInfo(stationIdList2); + // } catch (Exception e) { + // log.error("四川省平台推送充电站实时功率失败", e); + // } // 吉林省平台推送充电站实时功率 - try { - String thirdPartyType3 = ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode(); - List stationInfoVOS3 = thirdPartyStationRelationService.selectStationList(thirdPartyType3); - - List stationIdList3 = stationInfoVOS3.stream() - .map(StationInfoVO::getStationId) - .collect(Collectors.toList()); - - JiLinPlatformServiceImpl jiLinPlatformService = new JiLinPlatformServiceImpl(); - jiLinPlatformService.notificationPowerInfo(stationIdList3); - } catch (Exception e) { - log.error("吉林省平台推送充电站实时功率失败", e); - } + // try { + // String thirdPartyType3 = ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode(); + // List stationInfoVOS3 = thirdPartyStationRelationService.selectStationList(thirdPartyType3); + // + // List stationIdList3 = stationInfoVOS3.stream() + // .map(StationInfoVO::getStationId) + // .collect(Collectors.toList()); + // + // JiLinPlatformServiceImpl jiLinPlatformService = new JiLinPlatformServiceImpl(); + // jiLinPlatformService.notificationPowerInfo(stationIdList3); + // } catch (Exception e) { + // log.error("吉林省平台推送充电站实时功率失败", e); + // } }