From 3050db3dbea1d48ed07b79290ac42df76f0361d2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 09 十二月 2024 08:45:41 +0800
Subject: [PATCH] 修改调度逻辑为按预排的格子进行调度
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml | 20 +++++++++++---------
1 files changed, 11 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..8c76445 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
@@ -4,6 +4,8 @@
<resultMap id="baseMap" type="com.mes.opctask.entity.EdgStorageDeviceTask">
<id column="task_running" property="taskRunning"/>
+ <id column="glass_id" property="glassId"/>
+ <id column="in_place" property="inPlace"/>
<id column="glass_id_in" property="glassIdIn"/>
<id column="glass_id_out" property="glassIdOut"/>
<id column="current_cell" property="currentCell"/>
@@ -16,19 +18,19 @@
<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}
+ <if test="task.taskState == 0">
+ ,task_state = #{task.taskState}
</if>
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0