From 745663af3e1398aae07c1dfbd026acfc11305e1f Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 03 八月 2024 13:31:07 +0800 Subject: [PATCH] 优云点位在线率 --- ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java index 82ab3e2..15ded93 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java @@ -28,6 +28,7 @@ /** * 璁$畻杞﹁締鏃堕挓鍑嗙‘鎬� + * 閲囩敤杞﹁締鍏ㄦ鎺ュ彛 * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId * 寰幆map璁$畻鏃堕挓鍑嗙‘鎬� * 鏇存柊鎴栨柊澧� @@ -81,7 +82,9 @@ areaStatsMap.forEach((deptId, stats) -> { if (stats.totalSites > 0) { CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList); - checkIndexCars.add(checkIndexCar); + if (checkIndexCar != null) { + checkIndexCars.add(checkIndexCar); + } } }); @@ -106,11 +109,14 @@ */ private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) { CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class); + if (checkIndexCar == null) { + return null; + } //璋冪敤鏃堕挓鍑嗙‘鎬ц绠楁柟娉� - Map<String, Object> siteOnlineParam = new HashMap<>(); - siteOnlineParam.put("totalSites", stats.totalSites); - siteOnlineParam.put("accuracySites", stats.accuracySites); - BigDecimal clockAccuracy = clockAccuracy(siteOnlineParam); + Map<String, Object> clockAccuracyParam = new HashMap<>(); + clockAccuracyParam.put("totalSites", stats.totalSites); + clockAccuracyParam.put("accuracySites", stats.accuracySites); + BigDecimal clockAccuracy = clockAccuracy(clockAccuracyParam); checkIndexCar.setVehicleTimingAccuracy(clockAccuracy); return checkIndexCar; } -- Gitblit v1.8.0