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/equipment/entity/Equipment.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
index 8a06736..64d63f5 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
@@ -86,8 +86,8 @@
/**
* 空间坐标
*/
- @ApiModelProperty(value = "空间坐标")
- private String coordinate;
+// @ApiModelProperty(value = "空间坐标")
+// private String coordinate;
/**
* 菜单父主键
*/
@@ -100,15 +100,45 @@
private String addvcd;
private String street;
private String dtype;
+ @TableField("serialNumber")
private String serialNumber;
private String stype;
+ @TableField("channelNumber")
private String channelNumber;
private String pay;
+ @TableField("expireTime")
private String expireTime;
private String heartbeat;
private String province;
private String city;
private String district;
+ private String state;
+ private String reason;
+ @TableField("deptId")
+ private String deptId;
+
+ @TableField("onePhone")
+ private String onePhone;
+ @TableField("twoPhone")
+ private String twoPhone;
+ @TableField("ThreePhone")
+ private String ThreePhone;
+ @TableField("oneId")
+ private String oneId;
+ @TableField("twoId")
+ private String twoId;
+ @TableField("threeId")
+ private String threeId;
+ @TableField("oneContacts")
+ private String oneContacts;
+ @TableField("twoContacts")
+ private String twoContacts;
+ @TableField("ThreeContacts")
+ private String ThreeContacts;
+ /**
+ * 设备厂商名称
+ */
+ private String manufacturers;
}
--
Gitblit v1.9.3