From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java, 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index 3ba6bb9..7245604 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -266,8 +266,8 @@
     tb.intakeId intakeId,
     itb.name intakeName
     FROM pr_controller tb
-    INNER JOIN pr_intake itb on tb.intakeId=itb.id
-    WHERE deleted = 0 AND intakeId is not null AND rtuAddr=#{rtuAddr,jdbcType=VARCHAR}
+    INNER JOIN pr_intake itb on tb.intakeId = itb.id
+    WHERE tb.deleted = 0 AND tb.intakeId is not null AND tb.rtuAddr=#{rtuAddr,jdbcType=VARCHAR}
   </select>
 
   <!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->

--
Gitblit v1.8.0