From 00d54db361d697cf8fdf2f15940f4650b21b3185 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 21 四月 2025 15:05:35 +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 | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 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 532b095..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 @@ -5,7 +5,6 @@ import com.dy.pipIrrGlobal.voPr.VoController; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.security.access.method.P; import java.util.List; import java.util.Map; @@ -50,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); + /** * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗 @@ -72,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