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/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
index 09f9ae0..7b1a76b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
@@ -49,14 +49,15 @@
      * @param rtuAddr
      * @return
      */
-    List<Map<String, Object>> getControllersByCode(@Param("rtuAddr") String rtuAddr);
+    List<Map<String, Object>> getControllersByAddr(@Param("rtuAddr") String rtuAddr);
 
     /**
      * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
      * @param rtuAddr
      * @return
      */
-    List<PrController> getControllersByRtuAddr(@Param("rtuAddr") String rtuAddr);
+    List<PrController> getControllersByRtuAddrAndIntakeNotNull(@Param("rtuAddr") String rtuAddr);
+
 
     /**
      * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
@@ -71,4 +72,26 @@
      * @return
      */
     Integer getRecordCountOfController(@Param("controllerId") Long controllerId);
+
+    /**
+     * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�
+     * @param controllerId
+     * @return
+     */
+    Integer getBindedCount(@Param("controllerId") Long controllerId);
+
+    /**
+     * 鏍规嵁鎺у埗鍣ㄧ紪鍙峰垹闄ゅ彇姘村彛缂栧彿
+     * @param controllerId
+     * @return
+     */
+    Integer deleteIntakeId(@Param("controllerId") Long controllerId);
+
+    /**
+     * 鏍规嵁鍙栨按鍙D鎴栭榾鎺у櫒鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄
+     * @param intakeId
+     * @param rtuAddr
+     * @return
+     */
+    PrController getRtu(@Param("intakeId") Long intakeId, @Param("rtuAddr") String rtuAddr);
 }
\ No newline at end of file

--
Gitblit v1.8.0