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/BaRoleMapper.java | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java index dee40df..a0d79c5 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java @@ -1,11 +1,11 @@ package com.dy.pipIrrGlobal.daoBa; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoBa.BaRole; -import com.dy.pipIrrGlobal.voBa.VoRole; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * @author ZhuBaoMin @@ -13,7 +13,9 @@ * @LastEditTime 2024-01-10 11:00 * @Description */ -public interface BaRoleMapper { + +@Mapper +public interface BaRoleMapper extends BaseMapper<BaRole> { int deleteByPrimaryKey(Long id); int insert(BaRole record); @@ -27,23 +29,37 @@ int updateByPrimaryKey(BaRole record); /** + * 鏌ヨ鏌愪釜鐢ㄦ埛鎵�闅跺睘浜庣殑瑙掕壊 + * @param userId 鐢ㄦ埛ID + * @return List<BaRole> + */ + List<BaRole> selectByUserId(@Param("userId") Long userId) ; + + /** * 鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺 * @param roleName * @return */ Integer getRecordCountByName(@Param("roleName") String roleName); - /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁� - * @param params - * @return - */ - Long getRecordCount(Map<?, ?> params); + ///** + // * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁� + // * @param params + // * @return + // */ + //Long getRecordCount(Map<?, ?> params); + // + ///** + // * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍 + // * @param params + // * @return + // */ + //List<VoRole> getRoles(Map<?, ?> params); /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍 - * @param params + * 鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄 + * @param roleId * @return */ - List<VoRole> getRoles(Map<?, ?> params); + Integer deleteRoleById(@Param("roleId") Long roleId); } \ No newline at end of file -- Gitblit v1.8.0