From 0302ebee9915bc6abb3435c11df47dff57b9bbc9 Mon Sep 17 00:00:00 2001
From: 陈玄礼 <chenxiake008@qq.com>
Date: Thu, 27 Feb 2025 23:07:09 +0800
Subject: [PATCH] refactor(iot): 优化 OTA 升级记录查询方法

---
 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/ota/IotOtaUpgradeRecordMapper.java | 20 +++++++++++++++-----
 yudao-module-iot/yudao-module-iot-biz/src/main/resources/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 35a164c..83bdb43 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 ea86ba5..74fa85e 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
--
libgit2 0.21.4