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/dao/impl/Sensor_infImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java b/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java
index 213800a..e83fe4a 100644
--- a/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java
+++ b/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java
@@ -50,7 +50,7 @@
 	@Override
 	public List serchByCondition(Object obj) {
 		Sensor_inf sinf=(Sensor_inf) obj;
-		String sql=" select distinct sensor_dev_id,num,province,city,county,device_name "
+		String sql=" select distinct sensor_dev_id,num,province,city,county,airtmp_alarm,airhum_alarm,smoke_alarm,device_name "
 				+ "  from db_sensor.tb_sensor_inf  "
 				+ "  where sensor_dev_id=? ";
 		List  list=(List) DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{sinf.getSensor_dev_id()}, new CallBack() {
@@ -66,6 +66,9 @@
 						s.setProvince(rs.getString("province"));
 						s.setCity(rs.getString("city"));
 						s.setCounty(rs.getString("county"));
+						s.setAirtmp_alarm(rs.getFloat("airtmp_alarm"));
+						s.setAirhum_alarm(rs.getFloat("airhum_alarm"));
+						s.setSmoke_alarm(rs.getInt("smoke_alarm"));
 						s.setDevice_name(rs.getString("device_name"));
 						list.add(s);
 					}

--
Gitblit v1.9.1