From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-system/src/main/resources/mapper/data/ArdModelMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ard-system/src/main/resources/mapper/data/ArdModelMapper.xml b/ard-system/src/main/resources/mapper/data/ArdModelMapper.xml
index 5fe974f..8d84bee 100644
--- a/ard-system/src/main/resources/mapper/data/ArdModelMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdModelMapper.xml
@@ -22,7 +22,7 @@
height,
proportion,
model_url
- from ard_model_management
+ from ard_model
</sql>
<select id="selectArdModelList" parameterType="ArdModel" resultMap="ArdModelResult">
@@ -43,7 +43,7 @@
</select>
<insert id="insertArdModel" parameterType="ArdModel">
- insert into ard_model_management
+ insert into ard_model
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="modelName != null">model_name,</if>
@@ -65,7 +65,7 @@
</insert>
<update id="updateArdModel" parameterType="ArdModel">
- update ard_model_management
+ update ard_model
<trim prefix="SET" suffixOverrides=",">
<if test="modelName != null">model_name = #{modelName},</if>
<if test="longitude != null">longitude = #{longitude},</if>
@@ -78,13 +78,18 @@
</update>
<delete id="deleteArdModelById" parameterType="String">
- delete from ard_model_management where id = #{id}
+ delete from ard_model where id = #{id}
</delete>
<delete id="deleteArdModelByIds" parameterType="String">
- delete from ard_model_management where id in
+ delete from ard_model where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
+
+ <select id="checkArdModelNameUnique" parameterType="String" resultMap="ArdModelResult">
+ select * from ard_model where model_name = #{modelName} limit 1
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3