From 0302ebee9915bc6abb3435c11df47dff57b9bbc9 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:07:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E4=BC=98=E5=8C=96=20OTA=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重写 getOtaUpgradeRecordCount 和 getOtaUpgradeRecordStatistics 方法，使用 MyBatis-Plus 的 LambdaQueryWrapperX
-移除 XML 中对应的 SQL 查询语句
- 提高代码可维护性和数据库兼容性
---
 .../mysql/ota/IotOtaUpgradeRecordMapper.java  | 20 ++++++++++++++-----
 .../mapper/ota/IotOtaUpgradeRecordMapper.xml  | 17 ----------------
 2 files changed, 15 insertions(+), 22 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 35a164ca2c..83bdb43065 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
@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 // TODO @li：这里的注释，可以去掉哈，多了点点
+
 /**
  * OTA 升级记录 Mapper 接口
  */
@@ -43,9 +44,14 @@ public interface IotOtaUpgradeRecordMapper extends BaseMapperX<IotOtaUpgradeReco
      * @param status     状态，用于筛选特定状态的升级记录
      * @return 返回符合条件的OTA升级记录的数量
      */
-    Long getOtaUpgradeRecordCount(@Param("taskId") Long taskId,
-                                  @Param("deviceName") String deviceName,
-                                  @Param("status") Integer status);
+    default Long getOtaUpgradeRecordCount(@Param("taskId") Long taskId,
+                                          @Param("deviceName") String deviceName,
+                                          @Param("status") Integer status) {
+        return selectCount(new LambdaQueryWrapperX<IotOtaUpgradeRecordDO>()
+                .eqIfPresent(IotOtaUpgradeRecordDO::getTaskId, taskId)
+                .likeIfPresent(IotOtaUpgradeRecordDO::getDeviceId, deviceName)
+                .eqIfPresent(IotOtaUpgradeRecordDO::getStatus, status));
+    }
 
     /**
      * 获取OTA升级记录的统计信息
@@ -54,8 +60,12 @@ public interface IotOtaUpgradeRecordMapper extends BaseMapperX<IotOtaUpgradeReco
      * @param status     状态，用于筛选特定状态的升级记录
      * @return 返回符合条件的OTA升级记录的统计信息
      */
-    Long getOtaUpgradeRecordStatistics(@Param("firmwareId") Long firmwareId,
-                                       @Param("status") Integer status);
+    default Long getOtaUpgradeRecordStatistics(@Param("firmwareId") Long firmwareId,
+                                               @Param("status") Integer status) {
+        return selectCount(new LambdaQueryWrapperX<IotOtaUpgradeRecordDO>()
+                .eqIfPresent(IotOtaUpgradeRecordDO::getFirmwareId, firmwareId)
+                .eqIfPresent(IotOtaUpgradeRecordDO::getStatus, status));
+    }
 
 
     /**
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml
index ea86ba5c40..74fa85eaca 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/ota/IotOtaUpgradeRecordMapper.xml
@@ -4,21 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.iot.dal.mysql.ota.IotOtaUpgradeRecordMapper">
 
-    <!-- TODO @li：看看是不是可以通过 mybatis plus 写哈，更好适配多 db -->
-    <select id="getOtaUpgradeRecordCount" resultType="java.lang.Long">
-        select count(*)
-        from iot_ota_upgrade_record
-        where task_id = #{taskId}
-          and device_name like concat('%', #{deviceName}, '%')
-          and status = #{status}
-    </select>
-
-    <!-- TODO @li：看看是不是可以通过 mybatis plus 写哈，更好适配多 db -->
-    <select id="getOtaUpgradeRecordStatistics" resultType="java.lang.Long">
-        select count(*)
-        from iot_ota_upgrade_record
-        where firmware_id = #{firmwareId}
-          and status = #{status}
-    </select>
-
 </mapper>
\ No newline at end of file