From 7b71c3616c71c2c6a0a04055aab4ae92509b72d5 Mon Sep 17 00:00:00 2001
From: qh <280141285@qq.com>
Date: Thu, 28 Nov 2024 23:55:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cuit/solarenergy/controller/DataController.java   |  4 ++--
 .../mapper/TSamplingDataDetailsMapper.java            |  7 +++++++
 .../resources/mapper/TSamplingDataDetailsMapper.xml   | 11 +++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/cuit/solarenergy/controller/DataController.java b/src/main/java/com/cuit/solarenergy/controller/DataController.java
index f3872dc..cccde2a 100644
--- a/src/main/java/com/cuit/solarenergy/controller/DataController.java
+++ b/src/main/java/com/cuit/solarenergy/controller/DataController.java
@@ -193,7 +193,7 @@ public class DataController {
             return RetResponse.makeErrRsp("查询数据失败！"+e.getMessage());
         }
     }
-     @AopLog
+    @AopLog
     @AuthToken
     @ApiOperation("7、监测排序")
     @PreAuthorize("hasAuthority('minio:upload')")
@@ -237,7 +237,7 @@ public class DataController {
             return RetResponse.makeErrRsp("获取当前时间失败！"+e.getMessage());
         }
     }
-        @AopLog
+    @AopLog
     @AuthToken
     @ApiOperation("10、获取要素状态")
     @PreAuthorize("hasAuthority('minio:upload')")
diff --git a/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java
index 52a4f99..656fb92 100644
--- a/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java
+++ b/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cuit.solarenergy.entity.ElementValue;
 import com.cuit.solarenergy.entity.MapService;
+import com.cuit.solarenergy.entity.MonitorRet;
 import com.cuit.solarenergy.entity.TSamplingDataDetails;
 import com.cuit.solarenergy.entity.vo.req.MultiRSDetectionReq;
 import com.cuit.solarenergy.entity.vo.req.MultiRSReq;
@@ -120,6 +121,12 @@ public interface TSamplingDataDetailsMapper extends BaseMapper<TSamplingDataDeta
      * @return
      */
     List<ElementValueRet> getElementStatus(String mappedElementCode);
+
+    /**
+     * 查询监测点信息
+     * @return
+     */
+    List<MonitorRet> getMonitorInfo();
 }
 
 
diff --git a/src/main/resources/mapper/TSamplingDataDetailsMapper.xml b/src/main/resources/mapper/TSamplingDataDetailsMapper.xml
index edaa01b..1df598e 100644
--- a/src/main/resources/mapper/TSamplingDataDetailsMapper.xml
+++ b/src/main/resources/mapper/TSamplingDataDetailsMapper.xml
@@ -385,6 +385,17 @@
     </choose>
     FROM radi_chn_mul_hor
     </select>
+    <select id="getMonitorInfo" resultType="com.cuit.solarenergy.entity.MonitorRet">
+        SELECT Station_Id_C AS monitorPointName,
+               Lat          AS monitorPointLat,
+               Lon          AS monitorPointLng,
+               V14311       AS monitorValue
+        FROM radi_chn_mul_hor
+        WHERE V14311 != '999999'
+        ORDER BY
+            V14311 DESC
+            LIMIT 10
+    </select>
 
 
     <!-- 数据管理模块编辑接口-->