|
@ -937,12 +937,30 @@ public class PatientInfoPlatFormService {
|
|
|
detailInfo.put("warnStatus",false);
|
|
|
}
|
|
|
|
|
|
com.alibaba.fastjson.JSONObject tmp = ysDeviceService.getDeviceLiveAddress(patient, deviceSn, 1, null);
|
|
|
detailInfo.put("monitorInfoStatus", tmp.getIntValue(ResponseContant.resultFlag));
|
|
|
if (tmp.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
|
|
|
detailInfo.put("monitorInfo", tmp.getString(ResponseContant.resultMsg));
|
|
|
} else {
|
|
|
detailInfo.put("monitorInfo", tmp.getJSONObject(ResponseContant.resultMsg));
|
|
|
if(bl){
|
|
|
//取之前时间的监控
|
|
|
try {
|
|
|
JSONObject tmp = ysDeviceService.deviceVideoTimeList(patient, deviceSn, 1,beforeTime.substring(0,10)+" 00:00:00",beforeTime.substring(0,10)+" 23:59:59",0, null);
|
|
|
//JSONObject tmp = ysDeviceService.deviceVideoUrlByTime(deviceSn, 1,"3","2",beforeTime,afterTime,1000, null);
|
|
|
detailInfo.put("monitorInfoStatus", tmp.getIntValue(ResponseContant.resultFlag));
|
|
|
if (tmp.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
|
|
|
detailInfo.put("monitorInfo", tmp.getString(ResponseContant.resultMsg));
|
|
|
} else {
|
|
|
detailInfo.put("monitorInfo", tmp.getJSONObject(ResponseContant.resultMsg));
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
detailInfo.put("monitorInfoStatus", 0);
|
|
|
detailInfo.put("monitorInfo", "未获取到当天录像信息");
|
|
|
}
|
|
|
}else {
|
|
|
com.alibaba.fastjson.JSONObject tmp = ysDeviceService.getDeviceLiveAddress(patient, deviceSn, 1, null);
|
|
|
detailInfo.put("monitorInfoStatus", tmp.getIntValue(ResponseContant.resultFlag));
|
|
|
if (tmp.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
|
|
|
detailInfo.put("monitorInfo", tmp.getString(ResponseContant.resultMsg));
|
|
|
} else {
|
|
|
detailInfo.put("monitorInfo", tmp.getJSONObject(ResponseContant.resultMsg));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
break;
|