From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 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 a41ef3c..8559512 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
@@ -417,5 +417,43 @@
             </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  &lt; #{timeStart}
+        </if>
+<!--        <if test="timeStop != null and timeStop != '' ">-->
+<!--            OR rohrl.rtu_dt &gt; #{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  &lt; #{timeStart}
+        </if>
+<!--        <if test="timeStop != null">-->
+<!--            OR rohrl.rtu_dt &gt; #{timeStop}-->
+<!--        </if>-->
+        ORDER BY rtu_dt ASC
+        <trim prefix="limit ">
+            <if test="start != null and count != null">
+                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+            </if>
+        </trim>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0