From 38befe04013856beb822886ab02f0ac0f7af8709 Mon Sep 17 00:00:00 2001
From: lisai <lisai17@sina.com>
Date: Sun, 24 Jul 2022 01:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/zhdbaqapi/model/dto/FindDeviceDto.java  | 12 ++++++++++++
 src/main/resources/mapper/DeviceDataMapper.xml       | 12 ++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whdc/zhdbaqapi/model/dto/FindDeviceDto.java b/src/main/java/com/whdc/zhdbaqapi/model/dto/FindDeviceDto.java
index 7982f7e..c8a0488 100644
--- a/src/main/java/com/whdc/zhdbaqapi/model/dto/FindDeviceDto.java
+++ b/src/main/java/com/whdc/zhdbaqapi/model/dto/FindDeviceDto.java
@@ -3,12 +3,24 @@ package com.whdc.zhdbaqapi.model.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Pattern;
+
 /**
  * @author 李赛
  * @date 2022-07-01 1:17
  */
 @Data
 public class FindDeviceDto extends FindPageDto {
+    @ApiModelProperty(value = "起始时间，格式应为：yyyy-MM-dd HH:mm:ss", dataType = "java.lang.String")
+    @Pattern(regexp = "^[1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\\s+(20|21|22|23|[0-1]\\d):[0-5]\\d:[0-5]\\d$",
+            message = "时间格式应为：yyyy-MM-dd HH:mm:ss")
+    private String stm;
+
+    @ApiModelProperty(value = "截止时间，格式应为：yyyy-MM-dd HH:mm:ss", dataType = "java.lang.String")
+    @Pattern(regexp = "^[1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\\s+(20|21|22|23|[0-1]\\d):[0-5]\\d:[0-5]\\d$",
+            message = "时间格式应为：yyyy-MM-dd HH:mm:ss")
+    private String etm;
+
     @ApiModelProperty(value = "站点编码", dataType = "java.lang.String")
     private String deviceId;
 
diff --git a/src/main/resources/mapper/DeviceDataMapper.xml b/src/main/resources/mapper/DeviceDataMapper.xml
index e023408..cc18fe4 100644
--- a/src/main/resources/mapper/DeviceDataMapper.xml
+++ b/src/main/resources/mapper/DeviceDataMapper.xml
@@ -4,14 +4,22 @@
 
     <select id="page" resultType="com.whdc.zhdbaqapi.model.vo.DeviceDataVo">
         SELECT D.*, I.STATION_CODE FROM DEVICE_DATA D
-        LEFT JOIN DEVICE_INFO I ON D.DEVICE_ID = I.DEVICE_ID AND D.CHANNEL_NUM = I.CHANNEL_NUM
-        WHERE DEL = 0
+        LEFT JOIN DEVICE_INFO I ON D.DEVICE_ID = I.DEVICE_ID AND D.CHANNEL_NUM = I.CHANNEL_NUM AND I.DEL = 0
+        WHERE 1=1
         <if test="obj.deviceId != null and obj.deviceId != '' ">
             AND D.DEVICE_ID LIKE CONCAT('%', #{obj.deviceId}, '%')
         </if>
         <if test="obj.stationCode != null and obj.stationCode != '' ">
             AND I.STATION_CODE LIKE CONCAT('%', #{obj.stationCode}, '%')
         </if>
+        <if test="obj.stm != null and obj.stm != '' ">
+            AND D.TIMESTAMP >= #{obj.stm}
+        </if>
+        <if test="obj.etm != null and obj.etm != '' ">
+            AND D.TIMESTAMP &lt; #{obj.etm}
+        </if>
+
+        ORDER BY D.TIMESTAMP DESC
     </select>
 
 </mapper>