代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -442,7 +442,6 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
//                        }
//
//                    }
                    System.out.println("1");
                }catch (Exception e){
                    e.printStackTrace();
                }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -1688,13 +1688,18 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
    }
    public com.alibaba.fastjson.JSONObject getAqgDeviceInfo2(String imei){
        String url = MessageFormat.format(AqgConfig.deviceInfo, imei);
        HttpEntity<com.alibaba.fastjson.JSONObject> response = httpClientUtil.aqgCookieHttp(url, null, HttpMethod.GET, getCookie());
        com.alibaba.fastjson.JSONObject json = response.getBody();
        if(!json.getBoolean("success")){
           return  null;
        try {
            String url = MessageFormat.format(AqgConfig.deviceInfo, imei);
            HttpEntity<com.alibaba.fastjson.JSONObject> response = httpClientUtil.aqgCookieHttp(url, null, HttpMethod.GET, getCookie());
            com.alibaba.fastjson.JSONObject json = response.getBody();
            if(!json.getBoolean("success")){
                return  null;
            }
            return json.getJSONObject("obj");
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
        return json.getJSONObject("obj");
    }
    /**