更新

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

@@ -18,10 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="faultTime" column="fault_time"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifer" column="modifer"/>
-        <result property="utime" column="utime"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>

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

@@ -15,10 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="len" column="len"/>
         <result property="valueType" column="value_type"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>

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

@@ -15,10 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="manufacturer" column="manufacturer"/>
         <result property="producer" column="producer"/>
         <result property="pictures" column="pictures"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -10,10 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId" column="parent_id"/>
         <result property="name" column="name"/>
         <result property="company" column="company"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>

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

@@ -29,10 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="usefulLife" column="useful_life"/>
         <result property="changeDate" column="change_date"/>
         <result property="supplier" column="supplier"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -17,10 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="version" column="version"/>
         <result property="description" column="description"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>

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

@@ -18,10 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stopBits" column="stop_bits"/>
         <result property="uuid" column="uuid"/>
         <result property="interval" column="interval"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>

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

@@ -15,10 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="uuid" column="uuid"/>
         <result property="interval" column="interval"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.data.mapper.TblMqttInfoTopicMapper">
+
+    <resultMap type="com.ruoyi.data.domain.TblMqttInfoTopic" id="TblMqttInfoTopicResult">
+        <result property="id" column="id"/>
+        <result property="mqttId" column="mqtt_id"/>
+        <result property="topicId" column="topic_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -15,14 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="password" column="password"/>
         <result property="uuid" column="uuid"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <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"/>
     </resultMap>
 
 

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

@@ -10,10 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name" column="name"/>
         <result property="equipmentId" column="equipment_id"/>
         <result property="executeAction" column="execute_action"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -12,10 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lowerLimit" column="lower_limit"/>
         <result property="filterAlgorithm" column="filter_algorithm"/>
         <result property="formula" column="formula"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -14,10 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="time" column="time"/>
         <result property="triggeringCondition" column="triggering_condition"/>
         <result property="description" column="description"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -19,10 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="tagids" column="tagids"/>
         <result property="description" column="description"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -14,10 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="toStandardRatio" column="to_standard_ratio"/>
         <result property="toOffset" column="to_offset"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>

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

@@ -16,10 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="height" column="height"/>
         <result property="voiceOutCode" column="voice_out_code"/>
         <result property="isSupportBoardcast" column="is_support_boardcast"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>

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

@@ -15,10 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="videoFormat" column="video_format"/>
         <result property="vendorType" column="vendor_type"/>
         <result property="serialNumber" column="serial_number"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="remark" column="remark"/>
         <result property="expr1" column="expr1"/>
         <result property="expr2" column="expr2"/>

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

@@ -18,10 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="alarmTime" column="alarm_time"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
-        <result property="creator" column="creator"/>
-        <result property="ctime" column="ctime"/>
-        <result property="modifier" column="modifier"/>
-        <result property="utime" column="utime"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>