From 96a49c58136a8efe147462dfa41ca58d4479f036 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 28 Jan 2026 15:02:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E7=AE=97=E5=8A=9B=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/m2pool/lease/dto/OrderInfoDto.java    |  3 +++
 .../com/m2pool/lease/dto/OrderItemDto.java    |  2 ++
 .../lease/mapper/LeaseOrderMiningMapper.java  | 11 ++++++++++
 .../lease/redis/service/RedisService.java     | 21 ++++++++++++++++++-
 .../impl/LeaseOrderInfoServiceImpl.java       |  6 ++++++
 .../mapper/lease/LeaseOrderInfoMapper.xml     |  3 ++-
 .../mapper/lease/LeaseOrderMiningMapper.xml   | 21 +++++++++++++++++++
 7 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java b/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java
index 705ac25..c1c500d 100644
--- a/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java
+++ b/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java
@@ -118,6 +118,9 @@ public class OrderInfoDto {
     private BigDecimal powerRatio;
 
 
+    @ApiModelProperty(value = "算力单位")
+    private String unit;
+
     /**
      * 订单详情
      */
diff --git a/src/main/java/com/m2pool/lease/dto/OrderItemDto.java b/src/main/java/com/m2pool/lease/dto/OrderItemDto.java
index 349c3e1..7b44901 100644
--- a/src/main/java/com/m2pool/lease/dto/OrderItemDto.java
+++ b/src/main/java/com/m2pool/lease/dto/OrderItemDto.java
@@ -101,5 +101,7 @@ public class OrderItemDto {
     @ApiModelProperty(value = "实际算力/理论算力 比值")
     private BigDecimal powerRatio;
 
+    @ApiModelProperty(value = "算力单位")
+    private String unit;
 
 }
diff --git a/src/main/java/com/m2pool/lease/mapper/LeaseOrderMiningMapper.java b/src/main/java/com/m2pool/lease/mapper/LeaseOrderMiningMapper.java
index f4c5213..cf84930 100644
--- a/src/main/java/com/m2pool/lease/mapper/LeaseOrderMiningMapper.java
+++ b/src/main/java/com/m2pool/lease/mapper/LeaseOrderMiningMapper.java
@@ -105,4 +105,15 @@ public interface LeaseOrderMiningMapper extends BaseMapper<LeaseOrderMining> {
      */
     @MiningDB
     List<RealHashrateInfoDto> getRealTimeHashrate(@Param("tableName") String tableName, @Param("datetime") String datetime, @Param("list") List<RealTimeHashrateQueryDto> list);
+
+    /**
+     * 获取指定时间范围内的算力数据
+     * @param tableName 表名（如：2miners）
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param list 查询条件列表
+     * @return 实时算力信息列表
+     */
+    @MiningDB
+    List<RealHashrateInfoDto> getHashrateInRange(@Param("tableName") String tableName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("list") List<RealTimeHashrateQueryDto> list);
 }
diff --git a/src/main/java/com/m2pool/lease/redis/service/RedisService.java b/src/main/java/com/m2pool/lease/redis/service/RedisService.java
index 2b1656b..810fa2c 100644
--- a/src/main/java/com/m2pool/lease/redis/service/RedisService.java
+++ b/src/main/java/com/m2pool/lease/redis/service/RedisService.java
@@ -310,7 +310,26 @@ public class RedisService {
      */
     public <T> void deleteCacheMapValue7(final Map<String, String> keyFieldMap) {
         keyFieldMap.forEach((key, hKey) -> {
-            redisTemplate7.opsForHash().delete(key, hKey);
+            try {
+                // 先判断 key 是否存在
+                if (redisTemplate7.hasKey(key)) {
+                    // 检查 key 的类型是否为 Hash
+                    org.springframework.data.redis.core.DataType dataType = redisTemplate7.type(key);
+                    if (dataType == org.springframework.data.redis.core.DataType.HASH) {
+                        // 再判断 hKey 是否存在
+                        if (redisTemplate7.opsForHash().hasKey(key, hKey)) {
+                            redisTemplate7.opsForHash().delete(key, hKey);
+                        }
+                    } else {
+                        System.out.println(String.format("警告: key %s 存在但类型为 %s，不是 Hash 类型，跳过删除 hKey %s",
+                                key, dataType, hKey));
+                    }
+                }
+            } catch (Exception e) {
+                System.err.println(String.format("删除 Redis Hash 数据时出错: key=%s, hKey=%s, error=%s",
+                        key, hKey, e.getMessage()));
+                // 不抛出异常，继续处理下一个
+            }
         });
     }
 
diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
index ad6214b..5fa3494 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
@@ -527,6 +527,8 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
                     .image(leaseOrderItem.getImage())
                     .numbers(leaseOrderItem.getNumbers())
                     .type(leaseOrderItem.getType() ? 1 : 0)
+                    //TODO 先默认MH/S
+                    .unit("MH/S")
                     .build());
 
             // 累加支付金额
@@ -573,6 +575,8 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
                 .totalTheoryPower(BigDecimal.ZERO)
                 .totalPracticalPower(BigDecimal.ZERO)
                 .totalPayAmount(BigDecimal.ZERO)
+                //TODO 先默认MH/S
+                .unit("MH/S")
                 .build();
 
 
@@ -603,6 +607,8 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
                     .practicalPower(practicalPower)
                     .powerRatio(powerRatio)
                     .payAmount(alreadyPayRealAmount)
+                    //TODO 先默认MH/S
+                    .unit("MH/S")
                     .build());
         }
         orderInfoDto.setPayCoin(list.get(0).getPayCoin());
diff --git a/src/main/resources/mapper/lease/LeaseOrderInfoMapper.xml b/src/main/resources/mapper/lease/LeaseOrderInfoMapper.xml
index aa74b5d..cc1c88a 100644
--- a/src/main/resources/mapper/lease/LeaseOrderInfoMapper.xml
+++ b/src/main/resources/mapper/lease/LeaseOrderInfoMapper.xml
@@ -49,7 +49,8 @@
             loo.create_time as createTime,
             loo.update_time as endTime,
             loo.shop_name as shopName,
-            loo.coin as payCoin
+            loo.coin as payCoin,
+            'MH/S' as unit
         from  lease_order_info loo
         <where>
             del = 0
diff --git a/src/main/resources/mapper/lease/LeaseOrderMiningMapper.xml b/src/main/resources/mapper/lease/LeaseOrderMiningMapper.xml
index 68a684f..ef0fb61 100644
--- a/src/main/resources/mapper/lease/LeaseOrderMiningMapper.xml
+++ b/src/main/resources/mapper/lease/LeaseOrderMiningMapper.xml
@@ -155,6 +155,27 @@
         </foreach>
         )
     </select>
+    <select id="getHashrateInRange" resultType="com.m2pool.lease.dto.v2.RealHashrateInfoDto">
+        SELECT
+            hashrate AS power,
+            pool_name AS pool,
+            wallet AS walletAddress,
+            miner AS miner,
+            algorithm,
+            coin,
+            datetime
+        FROM
+            `${tableName}`
+        WHERE
+            datetime >= #{startTime}
+            AND datetime &lt;= #{endTime}
+            AND (wallet, coin, miner, algorithm) IN (
+        <foreach collection="list" item="item" separator=",">
+            (#{item.walletAddress}, #{item.coin}, #{item.miner}, #{item.algorithm})
+        </foreach>
+        )
+        ORDER BY datetime ASC
+    </select>
     <select id="getMiningInfoByOrderId" resultType="com.m2pool.lease.dto.v2.PurchasedMachineListDto">
         select
             id ,