From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 16:46:24 +0800
Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容； 2、虚拟卡状态写入时机进行修改，由原来的阶段写簇变成随时写入。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 9c12100..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,7 +126,9 @@
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}
@@ -159,7 +161,9 @@
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}
--
Gitblit v1.8.0