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 1bb463e8e..a4d4f50f4 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 @@ -231,42 +231,54 @@ public class JsowellTask { */ public void pushStationRealTimePowerInfo() { String env = SpringUtils.getActiveProfile(); - if (StringUtils.equalsIgnoreCase(env, "pre")) { + if (StringUtils.equalsIgnoreCase(env, "prd")) { log.debug("PRE环境不执行"); return; } // 查询出要推送的站点(贵州、) - String thirdPartyType = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(); - List stationInfoVOS = thirdPartyStationRelationService.selectStationList(thirdPartyType); + try { + String thirdPartyType = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(); + List stationInfoVOS = thirdPartyStationRelationService.selectStationList(thirdPartyType); - List stationIdList = stationInfoVOS.stream() - .map(StationInfoVO::getStationId) - .collect(Collectors.toList()); + List stationIdList = stationInfoVOS.stream() + .map(StationInfoVO::getStationId) + .collect(Collectors.toList()); - GuiZhouPlatformServiceImpl guiZhouPlatformService = new GuiZhouPlatformServiceImpl(); - guiZhouPlatformService.notificationPowerInfo(stationIdList); + GuiZhouPlatformServiceImpl guiZhouPlatformService = new GuiZhouPlatformServiceImpl(); + guiZhouPlatformService.notificationPowerInfo(stationIdList); + } catch (Exception e) { + log.error("贵州省平台推送充电站实时功率失败", e); + } //四川省平台推送充电站实时功率 - String thirdPartyType2 = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); - List stationInfoVOS2 = thirdPartyStationRelationService.selectStationList(thirdPartyType2); + try { + String thirdPartyType2 = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); + List stationInfoVOS2 = thirdPartyStationRelationService.selectStationList(thirdPartyType2); - List stationIdList2 = stationInfoVOS2.stream() - .map(StationInfoVO::getStationId) - .collect(Collectors.toList()); + List stationIdList2 = stationInfoVOS2.stream() + .map(StationInfoVO::getStationId) + .collect(Collectors.toList()); - SiChuanPlatformServiceImpl sichuanPlatformService = new SiChuanPlatformServiceImpl(); - sichuanPlatformService.notificationPowerInfo(stationIdList2); + SiChuanPlatformServiceImpl sichuanPlatformService = new SiChuanPlatformServiceImpl(); + sichuanPlatformService.notificationPowerInfo(stationIdList2); + } catch (Exception e) { + log.error("四川省平台推送充电站实时功率失败", e); + } // 吉林省平台推送充电站实时功率 - String thirdPartyType3 = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); - List stationInfoVOS3 = thirdPartyStationRelationService.selectStationList(thirdPartyType3); + try { + String thirdPartyType3 = ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode(); + List stationInfoVOS3 = thirdPartyStationRelationService.selectStationList(thirdPartyType3); - List stationIdList3 = stationInfoVOS3.stream() - .map(StationInfoVO::getStationId) - .collect(Collectors.toList()); + List stationIdList3 = stationInfoVOS3.stream() + .map(StationInfoVO::getStationId) + .collect(Collectors.toList()); - JiLinPlatformServiceImpl jiLinPlatformService = new JiLinPlatformServiceImpl(); - jiLinPlatformService.notificationPowerInfo(stationIdList3); + JiLinPlatformServiceImpl jiLinPlatformService = new JiLinPlatformServiceImpl(); + jiLinPlatformService.notificationPowerInfo(stationIdList3); + } catch (Exception e) { + log.error("吉林省平台推送充电站实时功率失败", e); + } } @@ -276,72 +288,57 @@ public class JsowellTask { */ public void pushStatisticsInfo() { String env = SpringUtils.getActiveProfile(); - if (StringUtils.equalsIgnoreCase(env, "pre")) { + if (StringUtils.equalsIgnoreCase(env, "prd")) { log.debug("PRE环境不执行"); return; } // 贵州推送充电站统计信息 - String thirdPartyType = ThirdPlatformTypeEnum.GUI_ZHOU_PLATFORM.getTypeCode(); - List stationInfoVOS = thirdPartyStationRelationService.selectStationList(thirdPartyType); + 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(); - for (String stationId : stationIdList) { - guiZhouPlatformService.notificationOperationStatsInfo(stationId); + List stationIdList = stationInfoVOS.stream() + .map(StationInfoVO::getStationId) + .collect(Collectors.toList()); + GuiZhouPlatformServiceImpl guiZhouPlatformService = new GuiZhouPlatformServiceImpl(); + for (String stationId : stationIdList) { + guiZhouPlatformService.notificationOperationStatsInfo(stationId); + } + } catch (Exception e) { + log.error("贵州省平台推送充电站统计信息失败", e); } //四川省平台推送用能统计 - String thirdPartyType2 = ThirdPlatformTypeEnum.SI_CHUAN_PLATFORM.getTypeCode(); - List stationInfoVOS2 = thirdPartyStationRelationService.selectStationList(thirdPartyType2); + 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(); - for (String stationId : stationIdList2) { - sichuanPlatformService.notificationOperationStatsInfo(stationId); + List stationIdList2 = stationInfoVOS2.stream() + .map(StationInfoVO::getStationId) + .collect(Collectors.toList()); + SiChuanPlatformServiceImpl sichuanPlatformService = new SiChuanPlatformServiceImpl(); + for (String stationId : stationIdList2) { + sichuanPlatformService.notificationOperationStatsInfo(stationId); + } + } catch (Exception e) { + log.error("四川省平台推送用能统计失败", e); } // 吉林省平台推送充电站用能统计 - 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(); - for (String stationId : stationIdList3) { - jiLinPlatformService.notificationOperationStatsInfo(stationId); - } - } - - - /** - * 定时任务,实时站点功率推送 - */ - public void realTimePowerPush() { -/* String env = SpringUtils.getActiveProfile(); - if (StringUtils.equalsIgnoreCase(env, "pre")) { - log.debug("PRE环境不执行"); - return; - }*/ - - String thirdPartyType = ThirdPlatformTypeEnum.JI_LIN_PLATFORM.getTypeCode(); - List stationInfoVOS = thirdPartyStationRelationService.selectStationList(thirdPartyType); - - // 获取站点列表 - List stationIdList = stationInfoVOS.stream() - .map(StationInfoVO::getStationId) - .collect(Collectors.toList()); - - JiLinPlatformServiceImpl jilinPlatformService = new JiLinPlatformServiceImpl(); try { - jilinPlatformService.notificationPowerInfo(stationIdList); - }catch (Exception e){ - log.error("实时站点功率推送失败", e); + 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(); + for (String stationId : stationIdList3) { + jiLinPlatformService.notificationOperationStatsInfo(stationId); + } + } catch (Exception e) { + log.error("吉林省平台推送充电站用能统计失败", e); } } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java index 5f837b250..2679f1a53 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java @@ -345,7 +345,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { */ @Override public String notificationStationInfo(String stationId) { - List stationInfos = new ArrayList<>(); +// List stationInfos = new ArrayList<>(); // 通过id查询站点相关信息 PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); // 查询相关配置信息 @@ -457,7 +457,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { if (CollectionUtils.isNotEmpty(pileList)) { info.setEquipmentInfosDTO(pileList); // 充电设备信息列表 } - stationInfos.add(info); +// stationInfos.add(info); // 调用中电联平台接口 String url = urlAddress + "notification_station_info"; @@ -465,7 +465,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { /* JSONObject data = new JSONObject(); data.put("StationInfo", stationInfos);*/ - String jsonString = JSON.toJSONString(stationInfos); + String jsonString = JSON.toJSONString(info); // 获取令牌 @@ -1496,7 +1496,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { supStationPowerInfo.setDataTime(dateTimeNow); supStationPowerInfo.setStationRealTimePower(stationPower); - + log.info("站点{}查询实时功率信息", stationId); // 根据站点id查询桩信息 List pileList = pileBasicInfoService.getPileListByStationId(stationId); if (CollectionUtils.isEmpty(pileList)) {