From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 8e4a570..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,10 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
-import com.dy.pipIrrGlobal.pojoBa.BaClientType;
-import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
+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 org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -43,11 +43,39 @@
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
*/
- int insert(BaBlock record);
+ int putin(BaBlock record);
/**
* insert record to table selective
--
Gitblit v1.8.0