|
|
|
@@ -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; |
|
|
|
|