lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化修正请求和响应逻辑

Browse Source
This commit is contained in:
lsymicc
2026-04-09 08:50:52 +08:00
parent 38d27e3cf2
commit 715fd4a017
16 changed files with 286 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml
View File

@@ -11,13 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="mydojobId" column="mydojob_id" />
<result property="status" column="status" />
<result property="createTime" column="create_time" />
<!-- <result property="spare1" column="spare1" />-->
<!-- <result property="spare2" column="spare2" />-->
<!-- <result property="spare3" column="spare3" />-->
<result property="reqCode" column="req_code" />
<result property="taskTypeCode" column="task_type_code" />
<result property="taskCode" column="task_code" />
</resultMap>
<sql id="selectJobCallBackVo">
select id, type, task_no, mydojob_id, status, create_time from job_call_back
select id, type, task_no, mydojob_id, status, create_time,req_code,task_type_code,task_code from job_call_back
</sql>
<select id="selectJobCallBackList" parameterType="JobCallBack" resultMap="JobCallBackResult">
@@ -25,11 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="taskNo != null "> and task_no = #{taskNo}</if>
<if test="mydojobId != null and mydojobId != ''"> and mydojob_id = #{mydojobId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="mydojobId != null and mydojobId != ''"> and mydojob_id = #{mydojobId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="reqCode != null and reqCode != ''"> and req_code = #{reqCode}</if>
<if test="taskTypeCode != null and taskTypeCode != ''"> and task_type_code = #{taskTypeCode}</if>
<if test="taskCode != null and taskCode != ''"> and task_code = #{taskCode}</if>
</where>
</select>
@@ -50,9 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mydojobId != null">mydojob_id,</if>
<if test="status != null">status,</if>
<if test="createTime != null">create_time,</if>
<!-- <if test="spare1 != null">spare1,</if>-->
<!-- <if test="spare2 != null">spare2,</if>-->
<!-- <if test="spare3 != null">spare3,</if>-->
<if test="reqCode != null">req_code,</if>
<if test="taskTypeCode != null">task_type_code,</if>
<if test="taskCode != null">task_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="type != null">#{type},</if>
@@ -60,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mydojobId != null">#{mydojobId},</if>
<if test="status != null">#{status},</if>
<if test="createTime != null">#{createTime},</if>
<!-- <if test="spare1 != null">#{spare1},</if>-->
<!-- <if test="spare2 != null">#{spare2},</if>-->
<!-- <if test="spare3 != null">#{spare3},</if>-->
<if test="reqCode != null">#{reqCode},</if>
<if test="taskTypeCode != null">#{taskTypeCode},</if>
<if test="taskCode != null">#{taskCode},</if>
</trim>
</insert>
@@ -74,9 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mydojobId != null">mydojob_id = #{mydojobId},</if>
<if test="status != null">status = #{status},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<!-- <if test="spare1 != null">spare1 = #{spare1},</if>-->
<!-- <if test="spare2 != null">spare2 = #{spare2},</if>-->
<!-- <if test="spare3 != null">spare3 = #{spare3},</if>-->
<if test="reqCode != null">req_code = #{reqCode},</if>
<if test="taskTypeCode != null">task_type_code = #{taskTypeCode},</if>
<if test="taskCode != null">task_code = #{taskCode},</if>
</trim>
where id = #{id}
</update>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="getTopJobCallBack" resultMap="JobCallBackResult">
select top(1) id, type, task_no, mydojob_id, status, create_timefrom job_call_back
select top(1) id, type, task_no, mydojob_id, status, create_time,req_code,task_type_code,task_code from job_call_back
where status = '0' and spare1 in ('0','1','2')
order by create_time asc
</select>