From 8f8b8d0bdb17b79c0cb11db6e5be3a6d513924dc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 21 Aug 2019 15:17:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/PowerBillAutoBuildSchedule.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index a0696da11..9b7e935ce 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -24,10 +24,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZoneOffset; import java.time.temporal.TemporalAdjusters; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -59,7 +56,7 @@ public class PowerBillAutoBuildSchedule { /** * 每天5点执行 */ - @Scheduled(cron = "0 49 13 * * ?") + @Scheduled(cron = "0 0 5 * * ?") public void powerBillAutoConfigStart() { logger.info("自动生成电费账单开始...."); int dayOfMonth = LocalDate.now().getDayOfMonth(); @@ -143,7 +140,9 @@ public class PowerBillAutoBuildSchedule { kwMeterDataDto.setStartTime(startdate); kwMeterDataDto.setEndTime(lastdate); KwMeterDataVo power = kwMeterDataService.getPower(kwMeterDataDto); - usedPower += power.getUsedPower(); + if (power != null) { + usedPower += power.getUsedPower(); + } } } return usedPower;