From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java index 53741ee..b3bf500 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmAlarmStateHistoryMapper.java @@ -1,7 +1,12 @@ package com.dy.pipIrrGlobal.daoRm; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory; +import com.dy.pipIrrGlobal.voRm.VoControllerAlarmState; import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; /** * @Author: liurunyu @@ -9,7 +14,7 @@ * @Description */ @Mapper -public interface RmAlarmStateHistoryMapper { +public interface RmAlarmStateHistoryMapper extends BaseMapper<RmAlarmStateHistory> { /** * delete by primary key * @@ -57,4 +62,18 @@ * @return update count */ int updateByPrimaryKey(RmAlarmStateHistory record); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟 + * @param params + * @return + */ + Long getRecordCount(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍 + * @param params + * @return + */ + List<VoControllerAlarmState> getControllerAlarmStateHistory(Map<?, ?> params); } \ No newline at end of file -- Gitblit v1.8.0