|
|
@ -1,6 +1,7 @@
|
|
|
package com.yihu.jw.care.service.device;
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.yihu.jw.care.config.AqgConfig;
|
|
|
import com.yihu.jw.care.dao.device.DeviceDao;
|
|
|
import com.yihu.jw.care.dao.device.DeviceDetailDao;
|
|
|
@ -796,7 +797,26 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
|
|
|
MultiValueMap<String, String> param = new LinkedMultiValueMap<>();
|
|
|
param.add("type", type);
|
|
|
HttpEntity<com.alibaba.fastjson.JSONObject> response = httpClientUtil.aqgCookieHttp(url, param, HttpMethod.GET, getCookie());
|
|
|
return response.getBody();
|
|
|
com.alibaba.fastjson.JSONObject responseJSON = response.getBody();
|
|
|
if (responseJSON.getBooleanValue("success")){
|
|
|
if (responseJSON.containsKey("obj")&&responseJSON.getJSONObject("obj")!=null){
|
|
|
com.alibaba.fastjson.JSONObject tmp= responseJSON.getJSONObject("obj");
|
|
|
if (tmp.containsKey("locationdata")&&tmp.getJSONObject("locationdata")!=null){
|
|
|
com.alibaba.fastjson.JSONObject locationdataJson= tmp.getJSONObject("locationdata");
|
|
|
if (locationdataJson.containsKey("point")&&locationdataJson.getJSONObject("point")!=null){
|
|
|
com.alibaba.fastjson.JSONObject tmpPoint = locationdataJson.getJSONObject("point");
|
|
|
if (tmpPoint.containsKey("coordinates")&&tmpPoint.getJSONArray("coordinates")!=null){
|
|
|
com.alibaba.fastjson.JSONArray pointArr = tmpPoint.getJSONArray("coordinates");
|
|
|
Double lon = pointArr.getDouble(0);
|
|
|
Double lat = pointArr.getDouble(1);
|
|
|
com.alibaba.fastjson.JSONObject pointJson = gpsUtil.gcj02_To_Bd09(lat,lon);
|
|
|
locationdataJson.put("point",pointJson);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
return responseJSON;
|
|
|
}
|
|
|
|
|
|
/**
|
