From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 六月 2025 16:46:24 +0800 Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容; 2、虚拟卡状态写入时机进行修改,由原来的阶段写簇变成随时写入。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeMapper.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 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 1a44d5e..989f41f 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; @@ -197,4 +194,31 @@ */ int updateByPrimaryKeySelective1(IntakeUpdateLngLat record); + /** + * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙e垪琛� + * @return + */ + List<VoIntakeSimple> getFreeIntakes(Map<?, ?> params); + + /** + * 鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙g粦铏氭嫙鍗′娇鐢� + * @return + */ + List<VoIntakeSimple> getNotLinkVcIntakes(); + + + /** + * 涓簑echat,鏍规嵁鎸囧畾鍙栨按鍙e悕绉版ā绯婏紙鍚庣锛夋煡璇㈡按鍙h褰曟暟 + * @param params + * @return + */ + Long getSomeIntakesCount4Wx(Map<?, ?> params); + + /** + * 涓簑echat,鏍规嵁鎸囧畾鍙栨按鍙e悕绉版ā绯婏紙鍚庣锛夋煡璇㈡按鍙� + * @param params + * @return + */ + List<VoOnLineIntake> getSomeIntakes4Wx(Map<?, ?> params); + } -- Gitblit v1.8.0