From 82c1e7ced425f43781b0cd01290fad298f51e623 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 六月 2019 13:27:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw
---
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