From 33099f33835948a05bc32691462a96fd1afcb7e9 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Mon, 12 Jan 2026 14:50:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8Dsql=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=BF=87=E9=95=BF=EF=BC=8Ccpu=E5=8D=A0=E7=94=A8?=
 =?UTF-8?q?=E8=BF=87=E9=AB=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/m2pool/lease/task/RealPowerInsetTask.java     | 11 +++++++----
 .../mapper/lease/LeaseProductMachineMapper.xml        |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

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<ProductMachineDto> getRealPower(String coin){
         List<LeaseProductMachine> leaseProductMachines = leaseProductMachineMapper.selectList(new LambdaQueryWrapper<LeaseProductMachine>()
                 .eq(LeaseProductMachine::getDel, false));
-        List<ProductMachineDto> recentlyFiveMinutesData = leaseProductMachineMapper.getRecentlyFiveMinutesData(leaseProductMachines, coin);
-        for (ProductMachineDto recentlyFiveMinutesDatum : recentlyFiveMinutesData) {
-            recentlyFiveMinutesDatum.setComputingPower(recentlyFiveMinutesDatum.getComputingPower()
-                    .divide(BigDecimal.valueOf(24 * 60 * 60),2, RoundingMode.HALF_UP));
+        List<ProductMachineDto> 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)
         <if test="leaseProductMachines != null and leaseProductMachines.size() > 0">
-            AND (
-            <foreach collection="leaseProductMachines" item="pair" separator="OR">
-                (`user` = #{pair.user} AND miner = #{pair.miner})
+            AND (`user`, miner) IN (
+            <foreach collection="leaseProductMachines" item="pair" separator=",">
+                (#{pair.user}, #{pair.miner})
             </foreach>
             )
         </if>