diff --git a/src/main/java/com/m2pool/lease/task/RealPowerInsetTask.java b/src/main/java/com/m2pool/lease/task/RealPowerInsetTask.java index 4d2b9f0..3ddbdf7 100644 --- a/src/main/java/com/m2pool/lease/task/RealPowerInsetTask.java +++ b/src/main/java/com/m2pool/lease/task/RealPowerInsetTask.java @@ -78,10 +78,13 @@ public class RealPowerInsetTask { public List getRealPower(String coin){ List leaseProductMachines = leaseProductMachineMapper.selectList(new LambdaQueryWrapper() .eq(LeaseProductMachine::getDel, false)); - List recentlyFiveMinutesData = leaseProductMachineMapper.getRecentlyFiveMinutesData(leaseProductMachines, coin); - for (ProductMachineDto recentlyFiveMinutesDatum : recentlyFiveMinutesData) { - recentlyFiveMinutesDatum.setComputingPower(recentlyFiveMinutesDatum.getComputingPower() - .divide(BigDecimal.valueOf(24 * 60 * 60),2, RoundingMode.HALF_UP)); + List recentlyFiveMinutesData = new ArrayList<>(); + if(!leaseProductMachines.isEmpty()){ + recentlyFiveMinutesData = leaseProductMachineMapper.getRecentlyFiveMinutesData(leaseProductMachines, coin); + for (ProductMachineDto recentlyFiveMinutesDatum : recentlyFiveMinutesData) { + recentlyFiveMinutesDatum.setComputingPower(recentlyFiveMinutesDatum.getComputingPower() + .divide(BigDecimal.valueOf(24 * 60 * 60),2, RoundingMode.HALF_UP)); + } } return recentlyFiveMinutesData; } diff --git a/src/main/resources/mapper/lease/LeaseProductMachineMapper.xml b/src/main/resources/mapper/lease/LeaseProductMachineMapper.xml index 9e5a209..8be9466 100644 --- a/src/main/resources/mapper/lease/LeaseProductMachineMapper.xml +++ b/src/main/resources/mapper/lease/LeaseProductMachineMapper.xml @@ -91,9 +91,9 @@ WHERE `date` >= DATE_SUB(now(), INTERVAL 1 DAY) - AND ( - - (`user` = #{pair.user} AND miner = #{pair.miner}) + AND (`user`, miner) IN ( + + (#{pair.user}, #{pair.miner}) )