From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 11 十月 2024 17:08:23 +0800 Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时,RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java index 6c4af43..b7a48f5 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java @@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoBa.BaBlock; +import com.dy.pipIrrGlobal.voBa.VoBlock; +import com.dy.pipIrrGlobal.voBa.VoMapCoordinates; +import com.dy.pipIrrGlobal.voBa.VoMapGraph; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -40,6 +43,34 @@ List<BaBlock> selectSome(Map<?, ?> params) ; /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯璁板綍鏁伴噺 + * @param params + * @return + */ + Long getBlocksCount(Map<?, ?> params) ; + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯 + * @param params + * @return + */ + List<VoBlock> getBlocks(Map<?, ?> params) ; + + /** + * 鏍规嵁鐗囧尯ID鑾峰彇鍦板浘鍥惧舰鍒楄〃 + * @param blockId + * @return + */ + List<VoMapGraph> gertMapGraphsByBlockId(Long blockId); + + /** + * 鏍规嵁鍦板浘鍥惧舰ID鑾峰彇鍦板浘鍥惧舰鍧愭爣鍒楄〃 + * @param graphId + * @return + */ + List<VoMapCoordinates> getCoordinatesByGraphId(Long graphId); + + /** * insert record to table * @param record the record * @return insert count -- Gitblit v1.8.0