From a7cdf717e2ad9f3c7a8dcff5ecfa499e2fd372e8 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 24 六月 2019 17:15:33 +0800
Subject: [PATCH] 修改

---
 sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java b/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java
index 46e7272..74e9bde 100644
--- a/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java
+++ b/sensor/src/com/fgkj/dao/impl/Sensor_infImpl.java
@@ -162,7 +162,7 @@
 	//鏌ヨ鎵�鏈夌殑璁惧锛堝洓绾э級
 	public List serchDevice(Object obj){
 		Sensor_inf sinf=(Sensor_inf) obj;
-		String sql=" select distinct sensor_dev_id,num,province,city,county,device_name from db_sensor.tb_sensor_inf where province like ? and city like ? and county like ? order by province asc";
+		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 province like ? and city like ? and county like ? order by province asc";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+sinf.getProvince()+"%","%"+sinf.getCity()+"%","%"+sinf.getCounty()+"%"}, new CallBack() {
 			
 			@Override
@@ -176,6 +176,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);
 					}
@@ -203,7 +206,13 @@
 	
 	public static void main(String[] args) {
 		Sensor_infImpl simpl=new Sensor_infImpl();
-		List list=simpl.serchProvice();
+		//List list=simpl.serchProvice();
+		Sensor_inf sinf=new Sensor_inf();
+		sinf.setSensor_dev_id(291200001);
+		List<Sensor_inf> list=simpl.serchByCondition(sinf);
+		for (Sensor_inf s : list) {
+			System.out.println(s);
+		}
 		System.out.println(list.size());
 	}
 

--
Gitblit v1.9.1