From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 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 29f966b..9c251e9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
@@ -417,4 +417,38 @@
</if>
</trim>
</select>
+ <!--鑾峰彇鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛鏁伴噺-->
+ <select id="getUnReportedIntakesCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM pr_intake pit
+ LEFT JOIN `rm_on_hour_report_last` rohrl ON pit.id = rohrl.intake_id
+ LEFT JOIN pr_controller pct ON pit.id = pct.intakeId
+ WHERE rohrl.id is NULL
+ <if test="timeStart != null and timeStart != '' ">
+ OR rohrl.rtu_dt < #{timeStart}
+ </if>
+ <if test="timeStop != null and timeStop != '' ">
+ OR rohrl.rtu_dt > #{timeStop}
+ </if>
+ ORDER BY rtu_dt ASC
+ </select>
+ <!--鑾峰彇鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛-->
+ <select id="getUnReportedIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoIntakeUnReported">
+ SELECT
+ pit.`name` intakeNum,
+ pct.rtuAddr,
+ rohrl.rtu_dt rtuDt
+ FROM pr_intake pit
+ LEFT JOIN `rm_on_hour_report_last` rohrl ON pit.id = rohrl.intake_id
+ LEFT JOIN pr_controller pct ON pit.id = pct.intakeId
+ WHERE rohrl.id is NULL
+ <if test="timeStart != null">
+ OR rohrl.rtu_dt < #{timeStart}
+ </if>
+ <if test="timeStop != null">
+ OR rohrl.rtu_dt > #{timeStop}
+ </if>
+ ORDER BY rtu_dt ASC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0