|
@ -1173,6 +1173,9 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 烟感、气感设备浓度列表获取
|
|
|
*/
|
|
|
public List<Map<String,Object>> getSmokeOrGasList(String deviceSn,String day){
|
|
|
List<Map<String,Object>> result = new ArrayList<>();
|
|
|
Date now = new Date();
|
|
@ -1192,7 +1195,8 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
|
|
|
Date timeEnd = DateUtil.strToDate(timeEndStr,DateUtil.yyyy_MM_dd_HH_mm_ss);
|
|
|
String sql = " SELECT r.value,CAST(DATE_FORMAT(r.create_time,'%Y-%m-%d %H:%i:%S') as char) create_time " +
|
|
|
" from wlyy_patient_device pd,base_device_health_index r WHERE pd.device_sn = r.device_sn " +
|
|
|
" and r.device_sn='"+deviceSn+"' order by r.create_time asc";
|
|
|
" and r.device_sn='"+deviceSn+"' and r.create_time>='"+timeBeginStr+"' and r.create_time<='"+timeEndStr+"' " +
|
|
|
" order by r.create_time asc";
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
|
|
|
|
//遍历时间区间,无数据时间点产生数据
|