From 44dab7005b915077decd31649f93e6c24b5a809a Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 1 Feb 2024 15:48:36 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ConcreteMonitorCurrentDataController.java       | 2 ++
 .../concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
index 5a92540f9..f096591c1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
@@ -117,6 +117,8 @@ public class ConcreteMonitorCurrentDataController {
     @ApiOperation(value = "统计数据曲线趋势", notes = "统计数据曲线趋势", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "devSn", value = "设备编号", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "pointNo", value = "监测点点位号", paramType = "body", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "date", value = "日期", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping(value = "/countTrend")
diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
index cdcd6cc30..1b131a499 100644
--- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
@@ -33,6 +33,9 @@
         <if test="devSn != null and devSn != ''">
             and dev_sn = #{devSn}
         </if>
+        <if test="pointNo != null and pointNo != ''">
+            and point_no = #{pointNo}
+        </if>
         <choose>
             <when test="date != null and date != ''">
                 and receive_time >= date_format(#{date}, '%Y-%m-%d')