From 797038b15180e4f757e4ef84ae4e5cb323fd99ee Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 24 六月 2019 11:06:55 +0800
Subject: [PATCH] 加三个告警值

---
 sensor/src/com/fgkj/dto/Sensor_inf.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/sensor/src/com/fgkj/dto/Sensor_inf.java b/sensor/src/com/fgkj/dto/Sensor_inf.java
index e9fb4fb..ec5de67 100644
--- a/sensor/src/com/fgkj/dto/Sensor_inf.java
+++ b/sensor/src/com/fgkj/dto/Sensor_inf.java
@@ -8,6 +8,9 @@
 	 private String city;
 	 private String county;
 	 private int    sensor_dev_id;
+	 private float airtmp_alarm;
+	 private float airhum_alarm;
+     private int smoke_alarm;
 	 private String device_name;
 	 private String VideoOrImage;
 	 private String note;
@@ -59,13 +62,34 @@
 	public void setVideoOrImage(String videoOrImage) {
 		VideoOrImage = videoOrImage;
 	}
+	public float getAirtmp_alarm() {
+		return airtmp_alarm;
+	}
+	public void setAirtmp_alarm(float airtmp_alarm) {
+		this.airtmp_alarm = airtmp_alarm;
+	}
+	public float getAirhum_alarm() {
+		return airhum_alarm;
+	}
+	public void setAirhum_alarm(float airhum_alarm) {
+		this.airhum_alarm = airhum_alarm;
+	}
+	public int getSmoke_alarm() {
+		return smoke_alarm;
+	}
+	public void setSmoke_alarm(int smoke_alarm) {
+		this.smoke_alarm = smoke_alarm;
+	}
 	@Override
 	public String toString() {
 		return "Sensor_inf [num=" + num + ", province=" + province + ", city="
 				+ city + ", county=" + county + ", sensor_dev_id="
-				+ sensor_dev_id + ", device_name=" + device_name
+				+ sensor_dev_id + ", airtmp_alarm=" + airtmp_alarm
+				+ ", airhum_alarm=" + airhum_alarm + ", smoke_alarm="
+				+ smoke_alarm + ", device_name=" + device_name
 				+ ", VideoOrImage=" + VideoOrImage + ", note=" + note + "]";
 	}
 	
+	
      
 }

--
Gitblit v1.9.1