【优化功能】 优化 tdengine 操作数据库相关代码

yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDDLMapper.xml

@@ -2,7 +2,12 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineSuperTableMapper">
+<mapper namespace="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDDLMapper">
+
+    <!-- 创建数据库 -->
+    <update id="createDatabase" parameterType="String">
+        CREATE DATABASE IF NOT EXISTS ${dataBaseName}
+    </update>
 
     <!-- 创建超级表 -->
     <update id="createSuperTable">
@@ -68,4 +73,29 @@
         ALTER STABLE ${dataBaseName}.${superTableName} DROP TAG ${tag.fieldName}
     </update>
 
-</mapper>
+    <!-- 创建子表 -->
+    <update id="createTable">
+        CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
+        USING ${dataBaseName}.${superTableName}
+        TAGS
+        <foreach item="item" collection="tags" separator=","
+                 open="(" close=")">
+            #{item.fieldValue}
+        </foreach>
+    </update>
+
+    <!-- 创建子表，带有 TAGS -->
+    <update id="createTableWithTags">
+        CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
+        USING ${dataBaseName}.${superTableName}
+        <foreach item="item" collection="tags" separator="," open="(" close=")">
+            #{item.fieldName}
+        </foreach>
+        TAGS
+        <foreach item="item" collection="tags" separator=","
+                 open="(" close=")">
+            #{item.fieldValue}
+        </foreach>
+    </update>
+
+</mapper>

yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDMLMapper.xml

@@ -2,7 +2,21 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineQueryMapper">
+<mapper namespace="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDMLMapper">
+
+    <!-- 插入数据 -->
+    <insert id="insertData">
+        INSERT INTO ${dataBaseName}.${tableName}
+        <foreach item="item" collection="columns" separator=","
+                 open="(" close=")">
+            ${item.fieldName}
+        </foreach>
+        VALUES
+        <foreach item="item" collection="columns" separator=","
+                 open="(" close=")">
+            #{item.fieldValue}
+        </foreach>
+    </insert>
 
     <!-- 根据时间戳查询数据 -->
     <select id="selectByTimestamp" parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectDO"
@@ -12,7 +26,7 @@
     </select>
 
     <!-- 获取时间范围内的数据条数 -->
-    <select id="getCountByTimestamp" parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectDO"
+    <select id="selectCountByTimestamp" parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectDO"
             resultType="java.util.Map">
         SELECT COUNT(0) AS count
         FROM ${dataBaseName}.${tableName}
@@ -20,14 +34,14 @@
     </select>
 
     <!-- 获取最新数据 -->
-    <select id="getLastData" resultType="java.util.Map">
+    <select id="selectOneLastData" resultType="java.util.Map">
         SELECT LAST(time), *
         FROM ${tableName}
         WHERE device_id = #{deviceId}
     </select>
 
     <!-- 根据标签获取最新数据 -->
-    <select id="getLastDataByTags" parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TagsSelectDO"
+    <select id="selectLastDataListByTags" parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TagsSelectDO"
             resultType="Map">
         SELECT LAST(*)
         FROM ${dataBaseName}.${stableName}
@@ -35,7 +49,7 @@
     </select>
 
     <!-- 获取历史数据 -->
-    <select id="getHistoryData" resultType="java.util.Map"
+    <select id="selectHistoryDataList" resultType="java.util.Map"
             parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO">
         SELECT ${fieldName} AS data, time
         FROM ${dataBaseName}.${tableName}
@@ -46,14 +60,14 @@
     </select>
 
     <!-- 获取实时数据 -->
-    <select id="getRealtimeData" resultType="java.util.Map"
+    <select id="selectRealtimeDataList" resultType="java.util.Map"
             parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO">
         SELECT ${fieldName}, time
         FROM ${dataBaseName}.${tableName}
     </select>
 
     <!-- 获取聚合数据 -->
-    <select id="getAggregateData" resultType="java.util.Map"
+    <select id="selectAggregateDataList" resultType="java.util.Map"
             parameterType="cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO">
         SELECT ${aggregate}(${fieldName})
         FROM ${dataBaseName}.${tableName}
@@ -62,11 +76,11 @@
     </select>
 
     <!-- 获取历史数据条数 -->
-    <select id="getHistoryCount" resultType="java.lang.Long">
+    <select id="selectHistoryCount" resultType="java.lang.Long">
         SELECT COUNT(time)
         FROM ${dataBaseName}.${tableName}
         WHERE time BETWEEN #{startTime} AND #{endTime}
           AND ${fieldName} IS NOT NULL
     </select>
 
-</mapper>
+</mapper>

yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml

@@ -1,21 +0,0 @@
-<?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="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDataWriterMapper">
-
-    <!-- 插入数据 -->
-    <insert id="insertData">
-        INSERT INTO ${dataBaseName}.${tableName}
-        <foreach item="item" collection="columns" separator=","
-                 open="(" close=")">
-            ${item.fieldName}
-        </foreach>
-        VALUES
-        <foreach item="item" collection="columns" separator=","
-                 open="(" close=")">
-            #{item.fieldValue}
-        </foreach>
-    </insert>
-
-</mapper>

yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml

@@ -1,12 +0,0 @@
-<?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="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDatabaseMapper">
-
-    <!-- 创建数据库 -->
-    <update id="createDatabase" parameterType="String">
-        CREATE DATABASE IF NOT EXISTS ${dataBaseName}
-    </update>
-
-</mapper>

yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml

@@ -1,32 +0,0 @@
-<?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="cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineTableMapper">
-
-    <!-- 创建子表 -->
-    <update id="createTable">
-        CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
-        USING ${dataBaseName}.${superTableName}
-        TAGS
-        <foreach item="item" collection="tags" separator=","
-                 open="(" close=")">
-            #{item.fieldValue}
-        </foreach>
-    </update>
-
-    <!-- 创建子表，带有 TAGS -->
-    <update id="createTableWithTags">
-        CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
-        USING ${dataBaseName}.${superTableName}
-        <foreach item="item" collection="tags" separator="," open="(" close=")">
-            #{item.fieldName}
-        </foreach>
-        TAGS
-        <foreach item="item" collection="tags" separator=","
-                 open="(" close=")">
-            #{item.fieldValue}
-        </foreach>
-    </update>
-
-</mapper>