简柏林 / thingskit · Commits

Commit ffaf4d54226406716696a84d590dcd64d8c7ec3e

Authored by xp.Huang
1 parent e53b4b84

fix: 调用海康API失败时，返回具体的错误消息

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
... ... @@ -105,7 +105,7 @@ public enum ErrorMessage {
105 105 REPORT_NAME_ERROR(400081,"报表配置的名称包含斜杠或反斜杠!!!"),
106 106 DEVICE_CREDENTIALS_ASSIGNED(400082,"设备凭证【%s】已分配给其它设备!"),
107 107 HIKVISION_GET_URL_ERROR(400083,"海康威视视API调用获取URL失败！！"),
108   - HIKVISION_API_ERROR(400084,"海康威视视频预览API调用失败，错误码【%s】"),
  108 + HIKVISION_API_ERROR(400084,"海康威视视频预览API调用失败【%s】，错误码【%s】"),
109 109 HAVE_NO_PERMISSION(500002,"没有修改权限");
110 110 private final int code;
111 111 private String message;
... ...
... ... @@ -68,7 +68,7 @@ public class HikVisionArtemisPostUtils {
68 68 //返回url地址
69 69 if (StringUtils.isNotEmpty(result)) {
70 70 JsonNode json = JacksonUtil.toJsonNode(result);
71   - if(json.get("code").equals("0")){
  71 + if(json.get("code").asText().equals("0")){
72 72 json = json.get("data");
73 73 String message = null;
74 74 if(null == json || json.get("url") == null){
... ... @@ -82,8 +82,9 @@ public class HikVisionArtemisPostUtils {
82 82 }
83 83 return json.get("url").textValue();
84 84 }else{
85   - String errorCode = json.get("code").toString();
86   - throw new TkDataValidationException(String.format(ErrorMessage.HIKVISION_API_ERROR.getMessage(),errorCode));
  85 + String errorCode = json.get("code").asText();
  86 + String msg = json.get("msg").asText();
  87 + throw new TkDataValidationException(String.format(ErrorMessage.HIKVISION_API_ERROR.getMessage(),msg,errorCode));
87 88 }
88 89
89 90 } else {
... ...