From 472a9062e14cd8e1323370d1f04d9f776252eee3 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 22 Feb 2024 16:38:02 +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

---
 .../HighFormworkAlarmDataController.java      |  1 +
 .../entity/HighFormworkAlarmData.java         | 26 ++++++++++++-------
 .../xml/HighFormworkAlarmDataMapper.xml       |  8 ++++++
 .../HighFormworkMeasureCurrentDataMapper.xml  |  4 +--
 .../xml/HighFormworkMeasurePointMapper.xml    |  4 +--
 .../mapper/xml/HighSlopeCurrentDataMapper.xml |  2 +-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkAlarmDataController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkAlarmDataController.java
index a09a50dfd..04c38c8f3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkAlarmDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkAlarmDataController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
index d89120557..ed2f201ad 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
@@ -63,14 +63,22 @@ public class HighFormworkAlarmData implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "创建时间")
 	private java.util.Date createTime;
-	/**
-	 * 项目SN
-	 */
-	@Excel(name = "项目SN", width = 15)
-	@ApiModelProperty(value = "项目SN")
-	private java.lang.String projectSn;
+    /**
+     * 项目SN
+     */
+    @Excel(name = "项目SN", width = 15)
+    @ApiModelProperty(value = "项目SN")
+    private java.lang.String projectSn;
+
+    @ApiModelProperty(value = "测量点名称")
+    @TableField(exist = false)
+    private java.lang.String measurePointName;
+
+    @TableField(exist = false)
+    private java.lang.String createTime_begin;
+
+    @TableField(exist = false)
+    private java.lang.String createTime_end;
+
 
-	@ApiModelProperty(value = "测量点名称")
-	@TableField(exist = false)
-	private java.lang.String measurePointName;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
index 3d9ec99ec..40a0834e7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
@@ -9,6 +9,14 @@
             <if test="q.projectSn != null and q.projectSn != ''">
                 and hfmp.project_sn = #{q.projectSn}
             </if>
+            <if test="param2.createTime_begin != null and param2.createTime_begin != ''">
+                and hfad.create_time >= #{param2.createTime_begin}
+            </if>
+            <if test="param2.createTime_end != null and param2.createTime_end != ''">
+                and hfad.create_time >= #{param2.createTime_end}
+                and hfad.create_time <![CDATA[<=]]> if(LENGTH(#{param2.createTime_end}) = 10,
+                CONCAT(DATE_FORMAT(#{param2.createTime_end}, '%Y-%m-%d'), ' 23:59:59'), #{param2.createTime_end})
+            </if>
         </where>
         order by hfad.create_time desc
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
index fff673d2b..73026b4f8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
@@ -76,9 +76,9 @@
     </select>
 
     <select id="countMonitorTime" resultType="java.lang.Long">
-        select timestampdiff(second ,collect_time,now())
+        select ifnull(timestampdiff(second ,min(collect_time),max(collect_time)),0) monitorDurationTime
         from high_formwork_measure_current_data
         where project_sn = #{projectSn} and collect_time is not null
-        order by collect_time limit 1
+        limit 1
     </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
index 55594ae29..366fbb56a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
@@ -68,9 +68,9 @@
     </select>
 
     <select id="countMonitorDynamic" resultType="com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint">
-        select hfmp.*,ifnull(timestampdiff(second ,min(hfad.create_time),max(hfad.create_time)),0) monitorDurationTime
+        select hfmp.*,ifnull(timestampdiff(second ,min(hfad.collect_time),max(hfad.collect_time)),0) monitorDurationTime
         from high_formwork_measure_point hfmp
-        left join high_formwork_alarm_data hfad on hfmp.id = hfad.measure_point_id
+        left join high_formwork_measure_current_data hfad on hfmp.measure_point_number = hfad.measure_point_number
         where hfmp.project_sn=#{projectSn}
         group by hfmp.measure_point_number
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml
index e737d2bae..d6f7d1995 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml
@@ -129,7 +129,7 @@
                 and decd.alarm_state = #{alarmState}
             </if>
             <if test="highSlopeMonitorTypeId != null">
-                and hsetmt.id = #{highSlopeMonitorTypeId}
+                and dest.id = #{highSlopeMonitorTypeId}
             </if>
         </where>
         order by decd.receive_time desc