bug修改

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -217,40 +217,41 @@ public class MicronApi  {
     }
 
     private static  String getDErrorMsg(MicronResult result) throws ApiException {
-        String errMsg = "";
-        Object errCode = -1;
-        String detail = "";
-        try {
-
-            //                "error": <ErrCode>,
-//                    "message": <ErrMessage>,
-//                    "detail": <ErrDetail>
-
-            errMsg = result.getResult("message", false);
-            if (ObjectUtil.isEmpty(errMsg)) {
-                errMsg = "";
-            } else {
-                errMsg = "message:" + errMsg;
-            }
-            errCode = result.getResult("error", false);
-
-            if (ObjectUtil.isEmpty(errCode)) {
-                errCode = "";
-            } else {
-                errCode = "error:" + errCode;
-            }
-            detail = result.getResult("detail", false);
-            if (ObjectUtil.isEmpty(detail)) {
-                detail = "";
-            } else {
-                detail = "detail:" + detail;
-            }
-
-            return errCode + ";" + errMsg + ";" + detail;
-        } catch (Exception exception) {
-            log.error("出错：" + exception);
-            return errCode + ";" + errMsg + ";" + detail + ":" + exception.toString();
-        }
+        return result.getDErrorMsg();
+//        String errMsg = "";
+//        Object errCode = -1;
+//        String detail = "";
+//        try {
+//
+//            //                "error": <ErrCode>,
+////                    "message": <ErrMessage>,
+////                    "detail": <ErrDetail>
+//
+//            errMsg = result.getResult("message", false);
+//            if (ObjectUtil.isEmpty(errMsg)) {
+//                errMsg = "";
+//            } else {
+//                errMsg = "message:" + errMsg;
+//            }
+//            errCode = result.getResult("error", false);
+//
+//            if (ObjectUtil.isEmpty(errCode)) {
+//                errCode = "";
+//            } else {
+//                errCode = "error:" + errCode;
+//            }
+//            detail = result.getResult("detail", false);
+//            if (ObjectUtil.isEmpty(detail)) {
+//                detail = "";
+//            } else {
+//                detail = "detail:" + detail;
+//            }
+//
+//            return errCode + ";" + errMsg + ";" + detail;
+//        } catch (Exception exception) {
+//            log.error("出错：" + exception);
+//            return errCode + ";" + errMsg + ";" + detail + ":" + exception.toString();
+//        }
     }
 
     public static Map<String,String> API002(String rfid, String operationId, List<StoragePos> storagePos) {

src/main/java/com/neotel/smfcore/custom/micron1053/bean/MicronResult.java

@@ -49,7 +49,7 @@ public class MicronResult implements Serializable {
 //    }
 
     public  boolean  IsSuccess()throws ApiException {
-        Boolean status = getResult("success",false);
+        Boolean status = GetMapValue("success");
         if (ObjectUtil.isNotEmpty(status) && status) {
             return true;
         }
@@ -76,24 +76,26 @@ public class MicronResult implements Serializable {
             resultMap = JsonUtil.toMap(responseData);
         }
         if(needCheck) {
-            Object resultStatus = resultMap.get("status");
-            if (resultStatus == null || (!resultStatus.toString().equalsIgnoreCase("SUCCESS"))) {
-                //失败
-                String message = resultMap.get("message").toString();
-                message = (message == null ? "" : message);
-                Object error = resultMap.get("error");
-                error = (error == null) ? "" : error;
-                String detail = resultMap.get("detail").toString();
-                detail = (detail == null ? "" : detail);
-
-                log.error(" smfcore.api.error : error=" + error + "" + ",message=" + message + ",detial=" + detail);
-                throw new ApiException("smfcore.api.error", "api.error: error={0},message={1},detial={2}", new String[]{error.toString(), message, detail});
-
-            }
-
+                if (!IsSuccess()) {
+                    String msg = getDErrorMsg();
+                    log.error("getResult[" + key + "]  smfcore.api.error : " + msg);
+                    throw new ApiException(msg);
+                }
         }else if(resultMap==null){
             return null;
         }
+       return GetMapValue(key);
+    }
+    private  <T> T GetMapValue(String key )   {
+
+        if (ObjectUtil.isEmpty(responseData)   ) {
+            return null;
+        }
+        if (resultMap == null) {
+            resultMap = JsonUtil.toMap(responseData);
+        }  if(resultMap==null){
+            return null;
+        }
         if (key != null && !key.isEmpty()) {
             Object value = resultMap.get(key);
             if (value != null) {
@@ -127,8 +129,42 @@ public class MicronResult implements Serializable {
         }
         return null;
     }
+    public    String getDErrorMsg(  ) throws ApiException {
+        String errMsg = "";
+        Object errCode = -1;
+        String detail = "";
+        try {
+
+            //                "error": <ErrCode>,
+//                    "message": <ErrMessage>,
+//                    "detail": <ErrDetail>
+
+            errMsg = GetMapValue("message");
+            if (ObjectUtil.isEmpty(errMsg)) {
+                errMsg = "";
+            } else {
+                errMsg = "message:" + errMsg;
+            }
+            errCode = GetMapValue("error");
 
+            if (ObjectUtil.isEmpty(errCode)) {
+                errCode = "";
+            } else {
+                errCode = "error:" + errCode;
+            }
+            detail = GetMapValue("detail");
+            if (ObjectUtil.isEmpty(detail)) {
+                detail = "";
+            } else {
+                detail = "detail:" + detail;
+            }
 
+            return errCode + ";" + errMsg + ";" + detail;
+        } catch (Exception exception) {
+            log.error("出错：" + exception);
+            return errCode + ";" + errMsg + ";" + detail + ":" + exception.toString();
+        }
+    }
     public <T> T getErrorValue(String key)   {
 
         if (resultMap == null) {