From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:35:16 +0800 Subject: [PATCH] Revert "1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。" --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrOpeningScheduleMapper.xml | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrOpeningScheduleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrOpeningScheduleMapper.xml index 8ff2b08..1acd788 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrOpeningScheduleMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrOpeningScheduleMapper.xml @@ -6,12 +6,13 @@ <!--@Table ir_opening_schedule--> <id column="id" jdbcType="BIGINT" property="id" /> <result column="schedule_id" jdbcType="BIGINT" property="scheduleId" /> + <result column="intake_id" jdbcType="BIGINT" property="intakeId" /> <result column="start_time" jdbcType="TIMESTAMP" property="startTime" /> <result column="duration" jdbcType="INTEGER" property="duration" /> </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> - id, schedule_id, start_time, duration + id, schedule_id, intake_id, start_time, duration </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> @@ -27,10 +28,10 @@ </delete> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoIr.IrOpeningSchedule"> <!--@mbg.generated--> - insert into ir_opening_schedule (id, schedule_id, start_time, - duration) - values (#{id,jdbcType=BIGINT}, #{scheduleId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, - #{duration,jdbcType=INTEGER}) + insert into ir_opening_schedule (id, schedule_id, intake_id, + start_time, duration) + values (#{id,jdbcType=BIGINT}, #{scheduleId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, + #{startTime,jdbcType=TIMESTAMP}, #{duration,jdbcType=INTEGER}) </insert> <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrOpeningSchedule"> <!--@mbg.generated--> @@ -41,6 +42,9 @@ </if> <if test="scheduleId != null"> schedule_id, + </if> + <if test="intakeId != null"> + intake_id, </if> <if test="startTime != null"> start_time, @@ -55,6 +59,9 @@ </if> <if test="scheduleId != null"> #{scheduleId,jdbcType=BIGINT}, + </if> + <if test="intakeId != null"> + #{intakeId,jdbcType=BIGINT}, </if> <if test="startTime != null"> #{startTime,jdbcType=TIMESTAMP}, @@ -71,6 +78,9 @@ <if test="scheduleId != null"> schedule_id = #{scheduleId,jdbcType=BIGINT}, </if> + <if test="intakeId != null"> + intake_id = #{intakeId,jdbcType=BIGINT}, + </if> <if test="startTime != null"> start_time = #{startTime,jdbcType=TIMESTAMP}, </if> @@ -84,6 +94,7 @@ <!--@mbg.generated--> update ir_opening_schedule set schedule_id = #{scheduleId,jdbcType=BIGINT}, + intake_id = #{intakeId,jdbcType=BIGINT}, start_time = #{startTime,jdbcType=TIMESTAMP}, duration = #{duration,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT} -- Gitblit v1.8.0