From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:50:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
index 059ec28..b532cfa 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
@@ -12,23 +12,31 @@
<id column="task_state" property="taskState"/>
<id column="create_time" property="createTime"/>
<id column="update_time" property="updateTime"/>
+ <id column="width" property="width"/>
+ <id column="height" property="height"/>
+ <id column="thickness" property="thickness"/>
+ <id column="film_remove" property="filmRemove"/>
</resultMap>
<select id="queryTaskMessage" resultMap="baseMap">
select *
- from #{tableName}
+ from ${tableName}
limit 1
</select>
<update id="updateTaskMessage">
- UPDATE #{tableName}
- SET task_running = #{taskRunning},
- glass_id_out = #{glassIdOut},
- current_cell = #{currentCell},
- start_cell = #{startCell},
- enc_cell = #{endCell},
- <if test="taskState == 0">
- task_state = #{taskState},
+ UPDATE ${tableName}
+ SET task_running = #{task.taskRunning},
+ glass_id_out = #{task.glassIdOut},
+ current_cell = #{task.currentCell},
+ start_cell = #{task.startCell},
+ end_cell = #{task.endCell},
+ width = #{task.width},
+ height = #{task.height},
+ thickness = #{task.thickness},
+ film_remove = #{task.filmRemove}
+ <if test="task.taskState == 0">
+ ,task_state = #{task.taskState}
</if>
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0