|
@ -1001,10 +1001,13 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
|
|
|
devInfoObj.put("day", DateUtil.getStringDateShort());
|
|
|
break;
|
|
|
case "16":
|
|
|
if (StringUtils.isBlank(day)) {
|
|
|
day = DateUtil.getStringDateShort();
|
|
|
}
|
|
|
// 电子围栏
|
|
|
devInfoObj.put("safeAreaGz", securityMonitoringOrderService.getElectronicFence(deviceSn));
|
|
|
// 行动轨迹
|
|
|
devInfoObj.put("actionTrack", securityMonitoringOrderService.getActionTrack(deviceSn));
|
|
|
devInfoObj.put("actionTrack", securityMonitoringOrderService.getActionTrack(deviceSn,day));
|
|
|
//当前定位
|
|
|
List<Map<String , Object>> newList = securityMonitoringOrderService.getNewList(deviceSn,day);
|
|
|
String lat = "";
|