From f9ba7532ed58fb7d61cd8f60e7e95de1beb263b1 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期日, 14 十二月 2025 11:54:01 +0800
Subject: [PATCH] no message
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 8d41a2d..1b947c9 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -131,7 +131,8 @@
// JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
return result;
} else {
- throw new CoolException("鏌ヨ澶辫触锛侊紒");
+ return result;
+// throw new CoolException("鏌ヨ澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
@@ -242,11 +243,7 @@
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("涓婁紶澶辫触锛侊紒");
} else {
-// ObjectMapper objectMapper = new ObjectMapper();
-// objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
CommonResponse commonResponse = new CommonResponse();
-////
-// ErpCommonResponse result = objectMapper.readValue(exchange.getBody(), ErpCommonResponse.class);
ErpCommonResponse result = JSONObject.parseObject(exchange.getBody(), ErpCommonResponse.class);
if (!result.getIsError()) {
commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
@@ -264,7 +261,7 @@
* @version 1.0
*/
@Override
- public CommonResponse reportCheck(Map<String, Object> params) {
+ public CommonResponse reportCheck(ReportParams params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -275,24 +272,19 @@
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
- params.put("", "");
HttpEntity httpEntity = new HttpEntity(params, headers);
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("淇敼缁撴灉锛� {}", exchange);
+ log.info("淇敼缁撴灉锛� {}", exchange.getBody());
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("淇敼澶辫触锛侊紒");
} else {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
- try {
- CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
- if (result.getCode() == 200) {
- return result;
- } else {
- throw new CoolException("淇敼澶辫触锛侊紒");
- }
- } catch (JsonProcessingException e) {
- throw new CoolException(e.getMessage());
+ CommonResponse commonResponse = new CommonResponse();
+ ErpCommonResponse result = JSONObject.parseObject(exchange.getBody(), ErpCommonResponse.class);
+ if (!result.getIsError()) {
+ commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
+ return commonResponse;
+ } else {
+ throw new CoolException("淇敼澶辫触锛侊紒");
}
}
}
--
Gitblit v1.9.1