diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java index c273ff7..6c332e1 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsResourceRetryableDelegate.java @@ -89,7 +89,7 @@ public class IvsResourceRetryableDelegate { final String apiAddr = getApiAddress(ivsPresetVo); log.info("URI_PTZ_CONTROL GOTO apiAddr: {}", apiAddr); ivsCommonService.postJson(ivsPresetVo.getUUID(), apiAddr, IvsConst.URI_PTZ_CONTROL, paramJson, IvsResult.class); - log.info("URI_PTZ_CONTROL SUCCESS retryCount: {}, apiAddr: {}", apiAddr, retryCount); + log.info("URI_PTZ_CONTROL SUCCESS retryCount: {}, apiAddr: {}", retryCount, apiAddr); } catch (Exception e) { log.info("URI_PTZ_CONTROL GOTO FAIL retryCount: {}, UUID: {}", retryCount, ivsPresetVo.getUUID()); //throw new IOException("URI_PTZ_CONTROL GOTO: FAIL UUID: " + ivsPresetVo.getUUID() + ", retryCount: " + retryCount + ", MSG: " + e); diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java index 3f73929..4e9d5cf 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/util/CallDeviceApi.java @@ -5,15 +5,28 @@ import com.inspect.client.service.SpringApplicationContext; import com.inspect.base.core.utils.HttpClientUtils; import com.inspect.base.core.utils.StringUtils; import com.inspect.base.redis.service.RedisService; +import lombok.extern.slf4j.Slf4j; + import java.util.concurrent.TimeUnit; +@Slf4j public class CallDeviceApi { public static final String DEVICE_API_TOKEN = "device_client_api_token"; public static JSONObject callDevice(String url, String jsonParam) { - String result = HttpClientUtils.postJson(url, jsonParam, (String)null); - JSONObject json = JSONObject.parseObject(result); - return json; + String result = HttpClientUtils.postJson(url, jsonParam, (String) null); + + if(StringUtils.isEmpty(result)) { + log.info("callDevice Exception: {} ", "Call remote server failed"); + JSONObject resultJson = new JSONObject(); + resultJson.put("code", "200"); + resultJson.put("msg", "Call remote server failed"); + return resultJson; + } + + JSONObject json = JSONObject.parseObject(result); + return json; + } public static String getDeviceToken() {