From e8f30d5ff0492ac2f55636ce9a5d03b49fba6ed8 Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Mon, 26 Jan 2026 02:39:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=99=A4receiver=E5=92=8Csen?= =?UTF-8?q?der=E5=9C=A8redis=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A5=E5=A4=96=E5=85=B6=E4=BB=96=E7=9A=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=B0=A4=E5=85=B6?= =?UTF-8?q?=E6=98=AFaurora=E7=9B=B8=E5=85=B3=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SyncTrendsStatsService.java | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java index 4ec667c..ce74c60 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/SyncTrendsStatsService.java @@ -173,10 +173,10 @@ public class SyncTrendsStatsService { log.info("end sync trends stats"); // - log.info("begin to sync aurora trends stats"); - AuroraDeviceTrendStats deviceTrendsStatsAlter = new AuroraDeviceTrendStats(); - handleExternalSync(apikey,now, Long.valueOf(iter),deviceTrendsStatsAlter); - DataSourceContextHolder.clearCurrentDataSourceKey(); +// log.info("begin to sync aurora trends stats"); +// AuroraDeviceTrendStats deviceTrendsStatsAlter = new AuroraDeviceTrendStats(); +// handleExternalSync(apikey,now, Long.valueOf(iter),deviceTrendsStatsAlter); +// DataSourceContextHolder.clearCurrentDataSourceKey(); }); } @@ -264,65 +264,65 @@ public class SyncTrendsStatsService { */ @Scheduled(cron = "${schedule.cron.expression}") public void syncAuroraTrendsData() { - String requestId =UUID.randomUUID().toString(); - MDC.put("requestId", requestId); - ZonedDateTime todayMidnight = getMidnightInTokyo(); - ZonedDateTime yesterdayMidnight = todayMidnight.minusDays(1); - - List companyIdList=new ArrayList<>(); - String sql="\t\tSELECT\n" + - "\t\t\tbcom.id,\n" + - "\t\t\tbcom.company_name companyName\n" + - "\t\tFROM\n" + - "\t\t\tdata_center_aeon_admin.basic_company bcom\n" + - "\t\tWHERE bcom.flag != 1"; - - jdbcTemplate.query(sql,rs->{ - companyIdList.add(rs.getInt("id")); - }); - - companyIdList.stream().forEach(iter->{ - //Get Top company's Apikey, for further query Aurora info use. - Long topCompanyId = dataSourceInterceptor.getTopCompanyId(iter.toString()); - String apikey=basicCompanyMapperExt.getApikeyByCompanyId(topCompanyId).getApikey(); - DeviceTrendsStatsInfoAuroraDTO resultDTO = fetchDataFromAurora(apikey,yesterdayMidnight, todayMidnight, Long.valueOf(iter)); - DataSourceContextHolder.setCurrentDataSourceKey("dataSourceForCompany_" + iter); - - if (resultDTO != null) { - AuroraTrendsStatsTotal auroraTrendsStatsTotal = new AuroraTrendsStatsTotal(); - auroraTrendsStatsTotal.setReceiverDeviceId(0L); - if (resultDTO.getRecieverDeviceIdDelta() != null){ - auroraTrendsStatsTotal.setSenderDeviceId(resultDTO.getSenderDeviceIdDelta()); - }else { - auroraTrendsStatsTotal.setSenderDeviceId(0L); - } - if (resultDTO.getSenderDispatchDelta() != null){ - auroraTrendsStatsTotal.setDispatch(resultDTO.getSenderDispatchDelta()); - }else { - auroraTrendsStatsTotal.setDispatch(0L); - } - if (resultDTO.getSenderAlertDelta() != null){ - auroraTrendsStatsTotal.setAlert(Long.valueOf(resultDTO.getSenderAlertDelta())); - }else { - auroraTrendsStatsTotal.setAlert(0L); - } - if (resultDTO.getSenderAlertCancelDelta() != null){ - auroraTrendsStatsTotal.setAlertCancel(Long.valueOf(resultDTO.getSenderAlertCancelDelta())); - }else{ - auroraTrendsStatsTotal.setAlertCancel(0L); - } - if (resultDTO.getBuildingIdCount() != null){ - auroraTrendsStatsTotal.setSenderBuilding(Long.valueOf(resultDTO.getBuildingIdCount())); - }else{ - auroraTrendsStatsTotal.setSenderBuilding(0L); - } - auroraTrendsStatsTotal.setCreatedDate(Date.from(yesterdayMidnight.toInstant())); - this.auroraTrendsStatsTotalMapper.insert(auroraTrendsStatsTotal); - } - DataSourceContextHolder.clearCurrentDataSourceKey(); - }); - - MDC.clear(); +// String requestId =UUID.randomUUID().toString(); +// MDC.put("requestId", requestId); +// ZonedDateTime todayMidnight = getMidnightInTokyo(); +// ZonedDateTime yesterdayMidnight = todayMidnight.minusDays(1); +// +// List companyIdList=new ArrayList<>(); +// String sql="\t\tSELECT\n" + +// "\t\t\tbcom.id,\n" + +// "\t\t\tbcom.company_name companyName\n" + +// "\t\tFROM\n" + +// "\t\t\tdata_center_aeon_admin.basic_company bcom\n" + +// "\t\tWHERE bcom.flag != 1"; +// +// jdbcTemplate.query(sql,rs->{ +// companyIdList.add(rs.getInt("id")); +// }); +// +// companyIdList.stream().forEach(iter->{ +// //Get Top company's Apikey, for further query Aurora info use. +// Long topCompanyId = dataSourceInterceptor.getTopCompanyId(iter.toString()); +// String apikey=basicCompanyMapperExt.getApikeyByCompanyId(topCompanyId).getApikey(); +// DeviceTrendsStatsInfoAuroraDTO resultDTO = fetchDataFromAurora(apikey,yesterdayMidnight, todayMidnight, Long.valueOf(iter)); +// DataSourceContextHolder.setCurrentDataSourceKey("dataSourceForCompany_" + iter); +// +// if (resultDTO != null) { +// AuroraTrendsStatsTotal auroraTrendsStatsTotal = new AuroraTrendsStatsTotal(); +// auroraTrendsStatsTotal.setReceiverDeviceId(0L); +// if (resultDTO.getRecieverDeviceIdDelta() != null){ +// auroraTrendsStatsTotal.setSenderDeviceId(resultDTO.getSenderDeviceIdDelta()); +// }else { +// auroraTrendsStatsTotal.setSenderDeviceId(0L); +// } +// if (resultDTO.getSenderDispatchDelta() != null){ +// auroraTrendsStatsTotal.setDispatch(resultDTO.getSenderDispatchDelta()); +// }else { +// auroraTrendsStatsTotal.setDispatch(0L); +// } +// if (resultDTO.getSenderAlertDelta() != null){ +// auroraTrendsStatsTotal.setAlert(Long.valueOf(resultDTO.getSenderAlertDelta())); +// }else { +// auroraTrendsStatsTotal.setAlert(0L); +// } +// if (resultDTO.getSenderAlertCancelDelta() != null){ +// auroraTrendsStatsTotal.setAlertCancel(Long.valueOf(resultDTO.getSenderAlertCancelDelta())); +// }else{ +// auroraTrendsStatsTotal.setAlertCancel(0L); +// } +// if (resultDTO.getBuildingIdCount() != null){ +// auroraTrendsStatsTotal.setSenderBuilding(Long.valueOf(resultDTO.getBuildingIdCount())); +// }else{ +// auroraTrendsStatsTotal.setSenderBuilding(0L); +// } +// auroraTrendsStatsTotal.setCreatedDate(Date.from(yesterdayMidnight.toInstant())); +// this.auroraTrendsStatsTotalMapper.insert(auroraTrendsStatsTotal); +// } +// DataSourceContextHolder.clearCurrentDataSourceKey(); +// }); +// +// MDC.clear(); } /**