|
|
@@ -1,5 +1,7 @@
|
|
|
package com.uas.eis.exception;
|
|
|
|
|
|
+import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
|
|
|
import com.uas.eis.entity.ErrorMessage;
|
|
|
import com.uas.eis.sdk.entity.ApiResult;
|
|
|
import com.uas.eis.sdk.entity.WMSApiResult;
|
|
|
@@ -71,20 +73,22 @@ public class ExceptionHandlerAdvice {
|
|
|
@ExceptionHandler(ApiSystemException.class)
|
|
|
@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
|
|
|
@ResponseBody
|
|
|
- public ModelMap handleApiSystemError(ApiSystemException ex, HttpServletRequest request) {
|
|
|
- ModelMap map = new ModelMap();
|
|
|
- ApiResult apiResult = ex.getApiResult();
|
|
|
- if(apiResult!=null) {
|
|
|
- map.put("code", apiResult.getCode());
|
|
|
- map.put("message", apiResult.getMessage());
|
|
|
- map.put("requestId",apiResult.getRequestId());
|
|
|
- map.put("data",apiResult.getData());
|
|
|
- }
|
|
|
+ public String handleApiSystemError(ApiSystemException ex, HttpServletRequest request) {
|
|
|
+ WMSApiResult result = new WMSApiResult();
|
|
|
WMSApiResult wmsApiResult = ex.getWmsApiResult();
|
|
|
if(wmsApiResult!=null){
|
|
|
- map.put("response", wmsApiResult);
|
|
|
+ result.setFlag(wmsApiResult.getFlag());
|
|
|
+ result.setCode(wmsApiResult.getCode());
|
|
|
+ result.setMessage(wmsApiResult.getMessage());
|
|
|
}
|
|
|
- return map;
|
|
|
+ XmlMapper xmlMapper = new XmlMapper();
|
|
|
+ String xml = null;
|
|
|
+ try {
|
|
|
+ xml = xmlMapper.writeValueAsString(result);
|
|
|
+ } catch (JsonProcessingException e) {
|
|
|
+ throw new RuntimeException(e);
|
|
|
+ }
|
|
|
+ return xml;
|
|
|
}
|
|
|
|
|
|
}
|