From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 21 十二月 2023 21:47:15 +0800 Subject: [PATCH] 1、common模块优化代码,Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler; 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeActiveCardMapper.java | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeActiveCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeActiveCardMapper.java index c4d266f..9b697ed 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeActiveCardMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeActiveCardMapper.java @@ -1,22 +1,22 @@ package com.dy.pipIrrGlobal.daoSe; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoSe.SeActiveCard; -import com.dy.pipIrrGlobal.pojoSe.VoActiveCard; +import com.dy.pipIrrGlobal.voSe.VoActiveCard; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; /** * @author ZhuBaoMin - * @date 2023/12/5 17:39 - * @LastEditTime 2023/12/5 17:39 + * @date 2023/12/18 16:58 + * @LastEditTime 2023/12/18 16:58 * @Description */ @Mapper -public interface SeActiveCardMapper { +public interface SeActiveCardMapper extends BaseMapper<SeActiveCard> { int deleteByPrimaryKey(Long id); int insert(SeActiveCard record); @@ -42,12 +42,4 @@ * @return */ List<VoActiveCard> getActiveCards(Map<?, ?> params); - - /** - * 鏍规嵁姘村崱缂栧彿鍜屾搷浣滅被鍨嬪垹闄ゆ煇鍗¤ˉ鍗¤褰� - * @param cardId - * @param operateType - * @return - */ - Integer deleteByIdAndOperateType(@Param("cardId") Long cardId, @Param("operateType") Byte operateType); } \ No newline at end of file -- Gitblit v1.8.0