From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +0800
Subject: [PATCH] 新增查询当前设备未处理和处理中的警情数量接口，当前设备一个警情处理完成后，如果当前设备还有其他预警未处理完成的，当前设备状态不会修改回正常状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
index cc98f2b..841a10e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
@@ -17,7 +17,36 @@
 	private String endDate;
 
 	/**
+	 * 开始时间
+	 */
+	private String startTime;
+	/**
+	 * 结束时间
+	 */
+	private String endTime;
+
+	/**
 	 * 状态码 0：本天    1：本周   2：本月
 	 */
 	private Integer status;
+
+	/**
+	 * 是否为违禁品   contraband-违禁物品 normal-非违禁物品
+	 */
+	private String decisioDiagramResult;
+
+	/**
+	 * 分页页码
+	 */
+	private Integer currentPage;
+
+	/**
+	 * 分页记录数
+	 */
+	private Integer pageSize;
+
+	/**
+	 * 预警确认时间描述
+	 */
+	private String timeDesc;
 }

--
Gitblit v1.9.3