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/daoRm/RmLossDayMapper.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmLossDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmLossDayMapper.java index 086fea3..7647fa9 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmLossDayMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmLossDayMapper.java @@ -2,12 +2,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoRm.RmLossDay; +import com.dy.pipIrrGlobal.voRm.VoLossDay; import com.dy.pipIrrGlobal.voSt.VoIntakeLossStatistics; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +import java.util.Map; /** * @Author liurunyu @@ -46,6 +48,13 @@ RmLossDay selectByPrimaryKey(Long id); /** + * select by rtuAddr + * @param intakeId 鎺у埗鍣ㄦ墍缁戝彇姘村彛ID + * @return object by rtuAddr + */ + List<RmLossDay> selectByIntakeId(Long intakeId) ; + /** + /** * select by dt * @param date 鏃ユ湡锛坹yyy-mm-dd锛� * @return object by rtuAddr @@ -67,12 +76,25 @@ int updateByPrimaryKey(RmLossDay record); /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟 + * @param params + * @return + */ + Long getRecordCount(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍 + * @param params + * @return + */ + List<VoLossDay> getLossDayHistory(Map<?, ?> params); + + + /** * 浠ュ彇姘村彛缁村害缁熻婕忔崯閲� * @param statisticsStartId 缁熻鏃堕棿娈靛紑濮嬫椂闂村搴旂殑ID * @param statisticsEndId 缁熻鏃堕棿娈垫埅姝㈡椂闂村搴旂殑ID * @return */ List<VoIntakeLossStatistics> statisticsByIntake(@Param("startId")Long statisticsStartId, @Param("endId")Long statisticsEndId) ; - - } \ No newline at end of file -- Gitblit v1.8.0