From cae756904b61aea7b35e41a7521bd5dfbaeaf4d5 Mon Sep 17 00:00:00 2001 From: psh Date: Fri, 28 Jun 2024 14:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=A1=E6=9D=BF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/service/IotToWmsService.java | 6 ++--- .../ext/service/impl/IotToWmsServiceImpl.java | 27 ++++++++++++++----- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/IotToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/IotToWmsService.java index 51512af..aacf87d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/IotToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/IotToWmsService.java @@ -11,10 +11,10 @@ import org.nl.wms.ext.service.dto.to.iot.IotPartsReq; */ public interface IotToWmsService { /** ACS请求接口 */ - BaseResponse acsApply(JSONObject param); + JSONObject acsApply(JSONObject param); - BaseResponse parts(IotPartsReq iotPartsReq); + JSONObject parts(IotPartsReq iotPartsReq); - BaseResponse orders(IotOrdersReq iotOrdersReq); + JSONObject orders(IotOrdersReq iotOrdersReq); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/IotToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/IotToWmsServiceImpl.java index c9280c4..fdff7ed 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/IotToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/IotToWmsServiceImpl.java @@ -9,6 +9,7 @@ import org.nl.wms.ext.service.dto.to.iot.IotOrdersReq; import org.nl.wms.ext.service.dto.to.iot.IotPartsReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; /** @@ -22,20 +23,32 @@ public class IotToWmsServiceImpl implements IotToWmsService { private AcsToWmsService acsToWmsService; @Override - public BaseResponse acsApply(JSONObject param) { - return acsToWmsService.acsApply(param); + public JSONObject acsApply(JSONObject param) { +// return acsToWmsService.acsApply(param); + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + return resultJson; } @Override - public BaseResponse parts(IotPartsReq iotPartsReq) { - return null; + public JSONObject parts(IotPartsReq iotPartsReq) { + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + return resultJson; } @Override - public BaseResponse orders(IotOrdersReq iotOrdersReq) { - - return null; + public JSONObject orders(IotOrdersReq iotOrdersReq) { + JSONObject resultJson = new JSONObject(); + resultJson.put("status", HttpStatus.OK); + resultJson.put("message", "操作成功"); + resultJson.put("data", new JSONObject()); + return resultJson; } }