From b142d9315fc0538647aa60ba533100dbea765353 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Sat, 21 Sep 2024 15:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A6=BB=E7=BA=BF=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/DcDeviceOfflineRecord.java | 20 +++++++++++++++++++
.../business/DcDeviceOfflineRecordMapper.xml | 4 ++++
2 files changed, 24 insertions(+)
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java b/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java
index f694eb32..73ad8500 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java
@@ -119,6 +119,10 @@ public class DcDeviceOfflineRecord extends BaseEntity
@Excel(name = "状态(0未处理 1已处理 2自动处理)")
private String status;
+ private String startTime;
+
+ private String endTime;
+
public void setId(Long id)
{
this.id = id;
@@ -246,6 +250,22 @@ public class DcDeviceOfflineRecord extends BaseEntity
return status;
}
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml
index 18fa449b..39ee9214 100644
--- a/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml
@@ -44,6 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and longitude = #{longitude}
and latitude = #{latitude}
and status = #{status}
+
+ and date_format(create_time,'%Y-%m-%d %H:%i:%s') >= date_format(#{startTime},'%Y-%m-%d %H:%i:%s')
+ and date_format(create_time,'%Y-%m-%d %H:%i:%s') <= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+