From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 21 四月 2025 10:45:16 +0800 Subject: [PATCH] 1、江海测试系统设备类型默认为阀; 2、完善通信中间件测试消息推送代码; 3、增加队列数据结构注释; 4、121服务器相关的初始化配置文件bug修改; 5、其他注释完善。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java index 9a94c28..35a5b41 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java @@ -2,10 +2,7 @@ import com.dy.pipIrrGlobal.pojoPr.PrIntake; -import com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat; -import com.dy.pipIrrGlobal.voPr.VoAllIntake; -import com.dy.pipIrrGlobal.voPr.VoIntake; -import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; +import com.dy.pipIrrGlobal.voPr.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -93,6 +90,13 @@ * @return address */ Integer getRecordCountOfIntake(@Param("intakeId") Long intakeId); + + /** + * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃 + * @param intakeId 鏉慖d + * @return intakeName 鍙栨按鍙g紪鍙� + */ + String getNameById(@Param("intakeId") Long intakeId); /** * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃 @@ -190,4 +194,15 @@ */ int updateByPrimaryKeySelective1(IntakeUpdateLngLat record); + /** + * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙e垪琛� + * @return + */ + List<VoIntakeSimple> getFreeIntakes(Map<?, ?> params); + + /** + * 鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙g粦铏氭嫙鍗′娇鐢� + * @return + */ + List<VoIntakeSimple> getNotLinkVcIntakes(); } -- Gitblit v1.8.0