From d9d08181a94d727a4fe5933ac9efd1ff5c8a7c5a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 16 七月 2025 13:49:13 +0800 Subject: [PATCH] 中间件修改内容: 1、当没农业综合站时即没相关配置项目内容为空时,启动时会产生bug; 2、整理优化代码。 --- 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