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/RmAlarmStateLastMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 884118b..53147f1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -390,10 +390,10 @@
<if test="valveState != null">
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
- <if test="intakeId != null">
- and rasl.intake_id = #{intakeId}
+ <if test="intakeId != null and intakeId != '' ">
+ and rash.intake_id = #{intakeId}
</if>
- <if test="intakeName != null">
+ <if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="startDt != null">
@@ -474,10 +474,10 @@
<if test="valveState != null">
and rasl.valve_state = #{valveState,jdbcType=TINYINT}
</if>
- <if test="intakeId != null">
- and rasl.intake_id = #{intakeId}
+ <if test="intakeId != null and intakeId != '' ">
+ and rash.intake_id = #{intakeId}
</if>
- <if test="intakeName != null">
+ <if test="intakeName != null and intakeName != '' ">
and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
</if>
<if test="startDt != null">
--
Gitblit v1.8.0