From 1a25df189f6cd3af60da56a2261d25f8d948584c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:40 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 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 4b94e9e..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
@@ -88,16 +88,10 @@
     Integer deleteIntakeId(@Param("controllerId") Long controllerId);
 
     /**
-     * 鏍规嵁鍙栨按鍙D鑾峰彇闃�鎺у櫒瀵硅薄
+     * 鏍规嵁鍙栨按鍙D鎴栭榾鎺у櫒鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄
      * @param intakeId
-     * @return
-     */
-    PrController getControllerByIntakeId(Long intakeId);
-
-    /**
-     * 鏍规嵁RTU鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄
      * @param rtuAddr
      * @return
      */
-    PrController getControllerByRtuAddr(String rtuAddr);
+    PrController getRtu(@Param("intakeId") Long intakeId, @Param("rtuAddr") String rtuAddr);
 }
\ No newline at end of file

--
Gitblit v1.8.0