From 089a23ac48c7e08ca0b467240c74ef7fed38a374 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 14 一月 2025 11:49:28 +0800
Subject: [PATCH] 功能”最近信号强度“”最近电压低于指定值“查询数据中加上取水口经纬度

---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java |    4 ++--
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml                         |    4 ++++
 2 files changed, 6 insertions(+), 2 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 c81dd42..c5dcab8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportLastMapper.xml
@@ -351,6 +351,8 @@
     <select id="getUnderVoltIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoBatteryVolt">
         SELECT inta.id          AS intakeId,
                inta.name        AS intakeNum,
+               inta.lng         AS lng,
+               inta.lat         AS lat,
                blo.name         AS blockName,
                hou.battery_volt AS batteryVolt,
                hou.dt           AS getDate
@@ -393,6 +395,8 @@
     <select id="getSpecifiedSignalIntakes" resultType="com.dy.pipIrrGlobal.voSt.VoSignalIntensity">
         SELECT inta.id          AS intakeId,
                inta.name        AS intakeNum,
+               inta.lng         AS lng,
+               inta.lat         AS lat,
                blo.name         AS blockName,
                hou.signal_value AS signValue,
                hou.dt           AS getDate
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
index 64031bb..b668470 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
@@ -176,7 +176,7 @@
         }
     }
 
-    /**
+    /** ok 114
      * 鑾峰彇娆犲帇鍙栨按鍙�
      * @param qo
      * @return
@@ -195,7 +195,7 @@
         }
     }
 
-    /**
+    /** ok 115
      * 鑾峰彇鎸囧畾淇″彿寮哄害鐨勫彇姘村彛
      * @param qo
      * @return

--
Gitblit v1.8.0