From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml index 9c251e9..8559512 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml @@ -428,9 +428,9 @@ <if test="timeStart != null and timeStart != '' "> OR rohrl.rtu_dt < #{timeStart} </if> - <if test="timeStop != null and timeStop != '' "> - OR rohrl.rtu_dt > #{timeStop} - </if> +<!-- <if test="timeStop != null and timeStop != '' ">--> +<!-- OR rohrl.rtu_dt > #{timeStop}--> +<!-- </if>--> ORDER BY rtu_dt ASC </select> <!--鑾峰彇鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛--> @@ -446,9 +446,14 @@ <if test="timeStart != null"> OR rohrl.rtu_dt < #{timeStart} </if> - <if test="timeStop != null"> - OR rohrl.rtu_dt > #{timeStop} - </if> +<!-- <if test="timeStop != null">--> +<!-- OR rohrl.rtu_dt > #{timeStop}--> +<!-- </if>--> ORDER BY rtu_dt ASC + <trim prefix="limit "> + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0