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/daoPr/PrDivideMapper.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrDivideMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrDivideMapper.java index 5eb7697..aed83e1 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrDivideMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrDivideMapper.java @@ -1,7 +1,11 @@ package com.dy.pipIrrGlobal.daoPr; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoPr.PrDivide; import com.dy.pipIrrGlobal.voPr.VoDivide; +import com.dy.pipIrrGlobal.voPr.VoSimpleDivide; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -12,7 +16,8 @@ * @LastEditTime 2023/12/21 9:16 * @Description */ -public interface PrDivideMapper { +@Mapper +public interface PrDivideMapper extends BaseMapper<PrDivide> { int deleteByPrimaryKey(Long id); int insert(PrDivide record); @@ -38,4 +43,25 @@ * @return */ List<VoDivide> getDivides(Map<?, ?> params); + + /** + * 鏍规嵁鍒嗘按鎴縄D閫昏緫鍒犻櫎鍒嗘按鎴� + * @param id + * @return + */ + Integer deleteDivideById(@Param("id") Long id); + + /** + * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙� + * @param divideId + * @return + */ + Long getBlockIdById(@Param("divideId") Long divideId); + + /** + * 鏍规嵁鐗囧尯ID鑾峰彇鍒嗘按鎴垮垪琛� + * @param blockId + * @return + */ + List<VoSimpleDivide> getDividesByBlockId(Long blockId); } \ No newline at end of file -- Gitblit v1.8.0