From 4629084c1ba1411109403dcec1f11b6096b46f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=8E=84=E7=A4=BC?= <chenxiake008@qq.com>
Date: Thu, 27 Feb 2025 23:18:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E9=87=8D=E6=9E=84=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=AE=B0=E5=BD=95=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 IotOtaUpgradeRecordMapper 中的 cancelUpgradeRecordByTaskId 方法- 新增 updateUpgradeRecordStatusByTaskIdAndStatus 方法，用于更通用的状态更新
- 在 IotOtaUpgradeRecordServiceImpl 中调用新方法来取消升级记录
---
 .../mysql/ota/IotOtaUpgradeRecordMapper.java  | 19 ++++++++++---------
 .../ota/IotOtaUpgradeRecordServiceImpl.java   |  4 +++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java
index 83bdb43065..bba148a594 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.iot.controller.admin.ota.vo.upgrade.record.IotOtaUpgradeRecordPageReqVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.ota.IotOtaUpgradeRecordDO;
-import cn.iocoder.yudao.module.iot.enums.ota.IotOtaUpgradeRecordStatusEnum;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -82,18 +81,20 @@ public interface IotOtaUpgradeRecordMapper extends BaseMapperX<IotOtaUpgradeReco
     }
 
     /**
-     * 根据任务ID取消升级记录。
-     * 该方法通过任务ID查找状态为“待处理”的升级记录，并将其状态更新为“已取消”。
+     * 根据任务ID和状态更新升级记录的状态
+     * <p>
+     * 该函数用于将符合指定任务ID和状态的升级记录的状态更新为新的状态。
      *
-     * @param taskId 任务ID，用于查找对应的升级记录。
+     * @param setStatus   要设置的新状态值，类型为Integer
+     * @param taskId      要更新的升级记录对应的任务ID，类型为Long
+     * @param whereStatus 用于筛选升级记录的当前状态值，类型为Integer
      */
-    default void cancelUpgradeRecordByTaskId(Long taskId) {
-        // 使用LambdaUpdateWrapper构建更新条件，将状态为“待处理”的记录更新为“已取消”
-        // TODO @li：哪些可以更新，通过 service 传递。mapper 尽量不要有逻辑
+    default void updateUpgradeRecordStatusByTaskIdAndStatus(Integer setStatus, Long taskId, Integer whereStatus) {
+        // 使用LambdaUpdateWrapper构建更新条件，将指定状态的记录更新为指定状态
         update(new LambdaUpdateWrapper<IotOtaUpgradeRecordDO>()
-                .set(IotOtaUpgradeRecordDO::getStatus, IotOtaUpgradeRecordStatusEnum.CANCELED.getStatus())
+                .set(IotOtaUpgradeRecordDO::getStatus, setStatus)
                 .eq(IotOtaUpgradeRecordDO::getTaskId, taskId)
-                .eq(IotOtaUpgradeRecordDO::getStatus, IotOtaUpgradeRecordStatusEnum.PENDING.getStatus())
+                .eq(IotOtaUpgradeRecordDO::getStatus, whereStatus)
         );
     }
 
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
index ae2b682739..5738f57637 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java
@@ -134,7 +134,9 @@ public class IotOtaUpgradeRecordServiceImpl implements IotOtaUpgradeRecordServic
     @Override
     public void cancelUpgradeRecordByTaskId(Long taskId) {
         // 暂定只有待推送的升级记录可以取消
-        upgradeRecordMapper.cancelUpgradeRecordByTaskId(taskId);
+        upgradeRecordMapper.updateUpgradeRecordStatusByTaskIdAndStatus(
+                IotOtaUpgradeRecordStatusEnum.CANCELED.getStatus(), taskId,
+                IotOtaUpgradeRecordStatusEnum.PENDING.getStatus());
     }
 
     @Override