From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportLastMapper.xml | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportLastMapper.xml
index b16ee8a..3cca12b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmTimingReportLastMapper.xml
@@ -225,6 +225,67 @@
select
<include refid="Base_Column_List" />
from rm_timing_report_last
- where rtu_addr = #{rtuAddr}
+ where intake_id = #{intakeId}
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瀹氭椂鎶ユ渶鏂拌褰曟暟閲�-->
+ <select id="getTimingReportsCount_last" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM rm_timing_report_last tim
+ INNER JOIN pr_intake inta ON inta.id = tim.intake_id
+ <where>
+ <if test="intakeId != null and intakeId >0">
+ AND tim.intake_id = #{intakeId}
+ </if>
+ <if test = "intakeNum != null and intakeNum !=''">
+ AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
+ </if>
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND tim.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
+ </if>
+ <if test = "timeStart != null and timeStop != null">
+ AND tim.dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瀹氭椂鎶ユ渶鏂拌褰�-->
+ <select id="getTimingReports_last" resultType="com.dy.pipIrrGlobal.voRm.VoTiming">
+ SELECT
+ tim.intake_id AS intakeId,
+ inta.name AS intakenum,
+ tim.rtu_addr AS rtuAddr,
+ tim.dt AS receiveTime,
+ tim.water_total_amount_year AS waterTotalAmountYear,
+ tim.water_total_amount_meter AS waterTotalAmountMeter,
+ tim.ele_total_amount_year AS eleTotalAmountYear,
+ tim.ele_total_amount_meter AS eleTotalAmountMeter,
+ tim.water_total_amount_day AS waterTotalAmountDay,
+ tim.water_user_total_amount_day AS waterUserTotalAmountDay,
+ tim.loss_total_amount_day AS lossTotalAmountDay,
+ tim.battery_volt AS batteryVolt
+ FROM rm_timing_report_last tim
+ INNER JOIN pr_intake inta ON inta.id = tim.intake_id
+ <where>
+ <if test="intakeId != null and intakeId >0">
+ AND tim.intake_id = #{intakeId}
+ </if>
+ <if test = "intakeNum != null and intakeNum !=''">
+ AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
+ </if>
+ <if test = "rtuAddr != null and rtuAddr !=''">
+ AND tim.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
+ </if>
+ <if test = "timeStart != null and timeStop != null">
+ AND tim.dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ORDER BY tim.dt DESC, tim.loss_total_amount_day DESC
+ <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