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/IrIntakeOperateMapper.xml | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml index 207ef22..cf9d2c9 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIntakeOperateMapper.xml @@ -168,4 +168,33 @@ <select id="getTerminateCommandIds" resultType="java.lang.Long"> SELECT command_id AS commandId FROM ir_intake_operate WHERE operate_type = 1 AND plan_id = #{planId} </select> + + <!--鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙e垪琛紙寮�闃�鎴愬姛鐨勶級--> + <select id="getToTerminateIntakes" resultType="com.dy.pipIrrGlobal.voIr.VoToTerminateIntakes"> + SELECT + command_id AS commandId, + intake_id AS intakeId, + start_time AS startTime + FROM ir_intake_operate + WHERE operate_type = 1 AND command_result = 1 AND plan_id = #{planId} + </select> + + <!--鏍规嵁璁″垝ID鍙婄杞粍ID鑾峰彇鍙栨按鍙e彂甯冨彂甯冪粨鏋�--> + <select id="getIntakeResult" resultType="com.dy.pipIrrGlobal.voIr.VoIntakeResult"> + SELECT + IF(io.command_result = 1, 0, 1) AS code, + (SELECT name FROM pr_intake WHERE id = io.intake_id) AS intakeName, + io.failure_factors AS result + FROM ir_intake_operate io + inner JOIN ir_group_intake gi ON gi.intake_id = io.intake_id + WHERE io.plan_id = #{planId} AND gi.group_id = #{groupId} AND operate_type = 1; + </select> + + <!--鏍规嵁璁″垝ID鑾峰彇鍙栨按鍙e懡浠ゅ彂甯冨け璐ユ暟閲忥紝鐏屾簤璁″垝璇︽儏椤典娇鐢�--> + <select id="getFailureCount" resultType="java.lang.Integer"> + SELECT + COUNT(1) AS failureCount + FROM ir_intake_operate + WHERE operate_type = 1 AND command_result != 1 AND plan_id = #{planId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0