修改

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblEquipmentMqttMapper.java

@@ -1,11 +1,15 @@
 package com.ruoyi.data.mapper;
 
-import com.ruoyi.data.domain.MqttObj;
-
-import java.util.List;
-
-public interface TblEquipmentMqttMapper {
-
-    List<MqttObj> selectMqttListByDeviceId(MqttObj mqttObj);
+import com.ruoyi.data.domain.TblEquipmentMqtt;
+import com.ruoyi.data.domain.vo.TblEquipmentMqttVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-14
+ */
+public interface TblEquipmentMqttMapper extends BaseMapperPlus<TblEquipmentMqttMapper, TblEquipmentMqtt, TblEquipmentMqttVo> {
 
 }

ruoyi-system/src/main/resources/mapper/data/TblEquipmentMqttMapper.xml

@@ -4,30 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.data.mapper.TblEquipmentMqttMapper">
 
-    <resultMap type="com.ruoyi.data.domain.MqttObj" id="MqttObjResult">
+    <resultMap type="com.ruoyi.data.domain.TblEquipmentMqtt" id="TblEquipmentMqttResult">
         <result property="id" column="id"/>
         <result property="equipmentId" column="equipment_id"/>
-        <result property="protocolName" column="protocol_name"/>
-        <result property="protocolDesc" column="protocol_desc"/>
-        <result property="protocolType" column="protocol_type"/>
-        <result property="serverAddress" column="server_address"/>
-        <result property="serverTopic" column="server_topic"/>
-        <result property="account" column="account"/>
-        <result property="password" column="password"/>
-        <result property="uuid" column="uuid"/>
-        <result property="remark" column="remark"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="status" column="status"/>
+        <result property="mqttId" column="mqtt_id"/>
     </resultMap>
 
-    <select id="selectMqttListByDeviceId" parameterType="MqttObj" resultMap="MqttObjResult">
-          select a.equipment_id as equipmentId,b.* from tbl_equipment_mqtt a left join tbl_mqtt b on a.mqtt_id = b.id
-        <where>
-            <if test="equipmentId != null "> and a.equipment_id = #{equipmentId}</if>
-        </where>
-    </select>
 
 </mapper>