refactor(schedule): 重构调度线程任务初始化逻辑
- 移除BeanUtil等无关注入工具类 - 使用SpringUtils手动获取依赖服务实例 - 调整设备读取逻辑,从连接判断改为直接加载列表 - 注释掉部分冗余或暂时不用的启动线程代码 - 新增对TSJ、CDZ等设备的支持与初始化配置 - 更新XML映射文件中的SQL查询条件及格式化内容 - 优化SRGV任务中断处理逻辑,增加break语句防止空循环 - 暂时注释实际下发指令方法以避免执行真实操作
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.bas.srgvmap.mapper.WcsSrgvMapMapper">
|
||||
|
||||
|
||||
<resultMap type="WcsSrgvMap" id="WcsSrgvMapResult">
|
||||
<result property="guid" column="guid" />
|
||||
<result property="x" column="x" />
|
||||
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<select id="selectWcsSrgvMapList" parameterType="WcsSrgvMap" resultMap="WcsSrgvMapResult">
|
||||
<include refid="selectWcsSrgvMapVo"/>
|
||||
<where>
|
||||
<where>
|
||||
<if test="guid != null and guid != ''"> and guid = #{guid}</if>
|
||||
<if test="x != null "> and x = #{x}</if>
|
||||
<if test="y != null "> and y = #{y}</if>
|
||||
@@ -57,9 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="plcLayer != null "> and plc_layer = #{plcLayer}</if>
|
||||
<if test="warehouse != null and warehouse != ''"> and warehouse = #{warehouse}</if>
|
||||
<if test="spaceArea != null and spaceArea != ''"> and space_area = #{spaceArea}</if>
|
||||
<if test="remark != null and remark != ''"> and remark = #{remark}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectWcsSrgvMapByGuid" parameterType="String" resultMap="WcsSrgvMapResult">
|
||||
<include refid="selectWcsSrgvMapVo"/>
|
||||
where guid = #{guid}
|
||||
@@ -155,9 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</delete>
|
||||
|
||||
<delete id="deleteWcsSrgvMapByGuids" parameterType="String">
|
||||
delete from wcs_srgv_map where guid in
|
||||
delete from wcs_srgv_map where guid in
|
||||
<foreach item="guid" collection="array" open="(" separator="," close=")">
|
||||
#{guid}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user