From 5e31f7c1f3eaf5cfd3be0e5fc942aa78f3a4133c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 25 二月 2025 10:19:07 +0800
Subject: [PATCH] 修改下发缓存命令的等待逻辑，RTU上行数据后，使尽快发送下行命令。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
index 8b782c1..fd8a25f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -126,15 +126,17 @@
select
count(*)
from ug_rtu_controller ugCon
- inner join pr_intake inta ON inta.id = ugCon.task_id
+ inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
+ inner join pr_controller con on ugCon.controller_id = con.id
+ inner join pr_intake inta on con.intakeId = inta.id
<where>
<if test="taskId != null">
AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
</if>
- <if test="intakeNum != null">
+ <if test="intakeNum != null and intakeNum != ''">
AND inta.name = #{intakeNum,jdbcType=VARCHAR}
</if>
- <if test="rtuAddr != null">
+ <if test="rtuAddr != null and rtuAddr != ''">
AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
</if>
<if test="state != null and state == 1">
@@ -159,15 +161,17 @@
ugCon.ug_state as ugState,
ugCon.over_dt as overDt
from ug_rtu_controller ugCon
- inner join pr_intake inta on ugCon.task_id = inta.id
+ inner join ug_rtu_task ugTask on ugCon.task_id = ugTask.id
+ inner join pr_controller con on ugCon.controller_id = con.id
+ inner join pr_intake inta on con.intakeId = inta.id
<where>
<if test="taskId != null">
AND ugCon.task_id = #{taskId,jdbcType=BIGINT}
</if>
- <if test="intakeNum != null">
+ <if test="intakeNum != null and intakeNum != ''">
AND inta.name = #{intakeNum,jdbcType=VARCHAR}
</if>
- <if test="rtuAddr != null">
+ <if test="rtuAddr != null and rtuAddr != ''">
AND ugCon.rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
</if>
<if test="state != null and state == 1">
--
Gitblit v1.8.0