From 7a5cf614930a9ab7e636f171cc3c55e18ce3f465 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 7 Jun 2024 16:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E8=8C=83?=
=?UTF-8?q?=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruoyi/page/controller/FireController.java | 1 +
.../domain/dto/request/AlarmFindRequest.java | 24 +++++++++++++++----
.../domain/dto/request/EventPageRequest.java | 18 +++++++++++++-
.../resources/mapper/page/AlarmMapper.xml | 6 +++++
.../resources/mapper/page/EventMapper.xml | 6 +++++
5 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/FireController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/FireController.java
index ac69adc..39689ee 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/FireController.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/controller/FireController.java
@@ -56,6 +56,7 @@ public class FireController extends BaseController {
*
* @param id 主键
* @return 单条数据
+ *
*/
@GetMapping("{id}")
@ApiOperation(value = "通过主键查询单条119数据", response = Fire.class)
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java
index 2b38828..89b0403 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/AlarmFindRequest.java
@@ -22,21 +22,37 @@ public class AlarmFindRequest implements Serializable {
private static final long serialVersionUID = 5773800327954649047L;
/**
- * 开始时间
+ * 报警时间开始时间
*/
- @ApiModelProperty("开始时间")
+ @ApiModelProperty("报警时间开始时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
/**
- * 结束时间
+ * 报警时间结束时间
*/
- @ApiModelProperty("结束时间")
+ @ApiModelProperty("报警时间结束时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ /**
+ * 创建时间开始时间
+ */
+ @ApiModelProperty("创建时间开始时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createStartTime;
+
+ /**
+ * 创建时间结束时间
+ */
+ @ApiModelProperty("创建时间结束时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createEndTime;
+
/**
* 报警内容
*/
diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java
index 11ce379..6155452 100644
--- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java
+++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/page/domain/dto/request/EventPageRequest.java
@@ -51,10 +51,26 @@ public class EventPageRequest implements Serializable {
/**
* 事发结束时间
*/
- @ApiModelProperty(value = "事发开始时间")
+ @ApiModelProperty(value = "事发结束时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+
+ /**
+ * 创建时间开始时间
+ */
+ @ApiModelProperty(value = "创建时间开始时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createStartTime;
+
+ /**
+ * 创建时间结束时间
+ */
+ @ApiModelProperty(value = "创建时间结束时间")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createEndTime;
/**
* 事发地区(行政区划)
*/
diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml
index 280480d..109d69c 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml
+++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/AlarmMapper.xml
@@ -87,6 +87,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAlarmList" resultType="com.ruoyi.page.domain.Alarm">
select * from alarm
<where>
+ <if test="req.createStartTime != null ">
+ create_time >= #{req.createStartTime}
+ </if>
+ <if test="req.createEndTime != null ">
+ and create_time <= #{req.createEndTime}
+ </if>
<if test="req.startTime != null ">
emergency_event_time >= #{req.startTime}
</if>
diff --git a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml
index b6e57da..14b9464 100644
--- a/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml
+++ b/RuoYi-Vue/ruoyi-system/src/main/resources/mapper/page/EventMapper.xml
@@ -72,6 +72,12 @@
SELECT *
FROM event
<where>
+ <if test="event.createStartTime != null">
+ AND create_time >= #{event.createStartTime}
+ </if>
+ <if test="event.createEndTime != null">
+ AND create_time <= #{event.createEndTime}
+ </if>
<if test="event.eventType != '转院'">
AND event_type != '转院'
</if>