From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 十二月 2024 16:59:34 +0800 Subject: [PATCH] (1)升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败; (2)升级状态向Remote模块通知时,当升级任务结束后,仍要向remote模块通知可配置的次数; --- 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..44452a9 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/22 16:26 + * @LastEditTime 2023/12/22 16:26 * @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