From d79d2f12c82cac10ba28117a9ee49bc5fdc2842d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 13 十一月 2024 16:05:28 +0800 Subject: [PATCH] 1、完善通信中间件远程升级任务模块; 2、web端实现升级任务发布执行功能; 3、web端实现升级任务执行监视功能; 4、web端添加模拟升级过程逻辑。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml index a8d38c4..e91d8e6 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml @@ -17,15 +17,6 @@ <!--@mbg.generated--> id, program_id, creator, remark, dt, is_execute, is_over, deleted </sql> - <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> - <!--@mbg.generated--> - select - <include refid="Base_Column_List" />, - (CASE WHEN is_execute = 1 THEN '鏄�' ELSE '鍚�' END) AS isExecuteStr, - (CASE WHEN is_over = 1 THEN '鏄�' ELSE '鍚�' END) AS isOverStr - from ug_rtu_task - where id = #{id,jdbcType=BIGINT} - </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <!--@mbg.generated--> delete from ug_rtu_task @@ -37,6 +28,23 @@ where id = #{id,jdbcType=BIGINT} </delete> + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> + <!--@mbg.generated--> + select + <include refid="Base_Column_List" />, + (CASE WHEN is_execute = 1 THEN '鏄�' ELSE '鍚�' END) AS isExecuteStr, + (CASE WHEN is_over = 1 THEN '鏄�' ELSE '鍚�' END) AS isOverStr + from ug_rtu_task + where id = #{id,jdbcType=BIGINT} + </select> + + <select id="selectLastTask" parameterType="java.lang.Long" resultMap="BaseResultMap"> + <!--@mbg.generated--> + select + <include refid="Base_Column_List" /> + from ug_rtu_task + order by id desc limit 0, 1 + </select> <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long"> <!--@mbg.generated--> @@ -87,6 +95,17 @@ order by bd.id DESC </select> + <select id="selectTaskDetail" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voRm.VoUpgradeDetail"> + <!--@mbg.generated--> + select + ttb.id as taskId, + ttb.creator as taskCreator, + ttb.dt as taskDt, + ptb.hex_file_name as hexFileName + from ug_rtu_task ttb + inner join ug_rtu_program ptb on ttb.program_id = ptb.id + where ttb.id = #{taskId,jdbcType=BIGINT} + </select> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask"> <!--@mbg.generated--> -- Gitblit v1.8.0