81041
2019-06-24 797038b15180e4f757e4ef84ae4e5cb323fd99ee
sensor/src/com/fgkj/dao/impl/Sensor_mapinfoImpl.java
@@ -49,7 +49,7 @@
   public List searchAll() {
      String sql=" select distinct db_sensor.tb_sensor_mapinfo.num,db_sensor.tb_sensor_mapinfo.sensor_dev_id,longitude,latitude,address "
            + "  ,record_time,airtmp,airhum,smoke,water,lightintensity "
            + "  ,province,city,county,device_name "
            + "  ,province,city,county,device_name,airtmp_alarm,airhum_alarm,smoke_alarm  "
            + " ,CO2concentration,COconcentration,CH4concentration,O2concentration,dev_commcount,dev_errcommcount "
            + "  from db_sensor.tb_sensor_mapinfo,db_sensor.tb_sensor_state,db_sensor.tb_sensor_inf "
            + "  where db_sensor.tb_sensor_mapinfo.sensor_dev_id=db_sensor.tb_sensor_state.sensor_dev_id  "
@@ -73,6 +73,9 @@
                  sinf.setCity(rs.getString("city"));
                  sinf.setCounty(rs.getString("county"));
                  sinf.setDevice_name(rs.getString("device_name"));
                  sinf.setAirtmp_alarm(rs.getFloat("airtmp_alarm"));
                  sinf.setAirhum_alarm(rs.getFloat("airhum_alarm"));
                  sinf.setSmoke_alarm(rs.getInt("smoke_alarm"));
                  
                  sinfo.setSinf(sinf);