From c7c8554e2b9809bc90ac4a43fdaa39dfe16f4ab0 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 09 五月 2025 14:09:32 +0800 Subject: [PATCH] “远程测控”功能返回数据中增加protocol和protocolVersion属性,以备前端做多协议兼容。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java | 17 +++++++++-------- 1 files changed, 9 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..690daef 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.voPr.VoController; +import com.dy.pipIrrGlobal.voPr.VoControllerSimple; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -88,16 +89,16 @@ 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); + + /** + * 涓嶅垎椤佃幏鍙栧叏閮ㄦ湭鍒犻櫎鐨勯榾鎺у櫒鍒楄〃 + * @return + */ + List<VoControllerSimple> getSimpleControllers(); } \ No newline at end of file -- Gitblit v1.8.0