From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index 14eefe6..25c58bc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -394,12 +394,14 @@
         WHERE com_id = #{commId}
     </select>
 
-    <!--鏍规嵁鍛戒护鏃ュ織ID鑾峰彇鍙栨按鍙e強铏氭嫙鍗′俊鎭紝缁堟鐏屾簤璁″垝鏃朵娇鐢紝鐢ㄦ潵鎵ц杩滅▼鍏抽榾-->
-    <select id="getIntakeVc" resultType="com.dy.pipIrrGlobal.voRm.VoIntakeVc">
+    <!--鏍规嵁鍛戒护鏃ュ織ID鑾峰彇寮�闃�淇℃伅锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃�-->
+    <select id="getValveOpen" resultType="com.dy.pipIrrGlobal.voRm.VoIntakeVc">
         SELECT
-            intake_id AS intakeId,
-            (SELECT id FROM se_virtual_card WHERE vc_num = param ->> '$.icCardNo') AS vcId
-        FROM rm_command_history WHERE com_id = #{commandId}
-            LIMIT 0, 1
+            rtu_addr AS rtuAddr,
+            param ->> '$.icCardNo' AS vcNum,
+            param ->> '$.orderNo' AS orderNo
+        FROM rm_command_history
+        WHERE com_id = #{commandId}
+        LIMIT 0, 1
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0