From 7cc260bc574c4f962cf2cc0ac8a3e104cc527f21 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Fri, 6 Jan 2023 20:14:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/wms/liKuData/DeviceStatusData.java | 29 +++++++++++++ .../ext/wms/liKuData/DeviceStatusRequest.java | 8 ++++ .../wms/liKuData/DeviceStatusResponse.java | 14 +++++++ .../acs/ext/wms/rest/AcsToLiKuController.java | 22 ++++++++++ .../acs/ext/wms/service/AcsToLiKuService.java | 20 +++++++++ .../service/impl/AcsToLiKuServiceImpl.java | 42 +++++++++++++++++++ .../service/impl/LiKuToAcsServiceImpl.java | 4 +- 7 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusRequest.java create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusResponse.java diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java new file mode 100644 index 000000000..07a680691 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java @@ -0,0 +1,29 @@ +package org.nl.acs.ext.wms.liKuData; + +public class DeviceStatusData { + + String deviceId; + + String x; + + String y; + + //楼层 + String mapId; + + //电量 + String power; + + //托盘 + String pallet; + + //有无货 + String load; + + //报警 + String alarm; + + //任务号 + String taskId; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusRequest.java new file mode 100644 index 000000000..fca8e50df --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusRequest.java @@ -0,0 +1,8 @@ +package org.nl.acs.ext.wms.liKuData; + +public class DeviceStatusRequest { + + String deviceId; + + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusResponse.java new file mode 100644 index 000000000..b50b15be1 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusResponse.java @@ -0,0 +1,14 @@ +package org.nl.acs.ext.wms.liKuData; + +public class DeviceStatusResponse { + + String result; + + String code; + + String comment; + + DeviceStatusData data; + + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java index 56b38945d..012674495 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java @@ -88,4 +88,26 @@ public class AcsToLiKuController { public ResponseEntity cancelTask(@RequestBody CancelTaskRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.cancelTask(requestParam), HttpStatus.OK); } + + @PostMapping("/queryCarStatus") + @Log("查询四向车状态") + @ApiOperation("查询四向车状态") + public ResponseEntity queryCarStatus(@RequestBody DeviceStatusRequest requestParam) { + return new ResponseEntity<>(acsToLiKuService.queryCarDeviceStatus(requestParam), HttpStatus.OK); + } + + @PostMapping("/queryTsjStatus") + @Log("查询提升机状态") + @ApiOperation("查询提升机状态") + public ResponseEntity queryTsjStatus(@RequestBody DeviceStatusRequest requestParam) { + return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); + } + + @PostMapping("/querySsxStatus") + @Log("查询输送线状态") + @ApiOperation("查询提升机状态") + public ResponseEntity querySsxStatus(@RequestBody DeviceStatusRequest requestParam) { + return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); + } + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java index 0087d7396..007a68c3e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java @@ -65,4 +65,24 @@ public interface AcsToLiKuService { * @return */ public Resp cancelTask(CancelTaskRequest requestParam); + + /** + *查询小车设备状态 + * @return + */ + public Resp queryCarDeviceStatus(DeviceStatusRequest requestParam); + + /** + *查询tsj设备状态 + * @return + */ + public Resp queryTsjDeviceStatus(DeviceStatusRequest requestParam); + + /** + *查询ssx设备状态 + * @return + */ + public Resp querySsxDeviceStatus(DeviceStatusRequest requestParam); } + + diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java index 0e76e858b..f13788d16 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java @@ -150,4 +150,46 @@ public class AcsToLiKuServiceImpl implements AcsToLiKuService { } + @Override + public Resp queryCarDeviceStatus(DeviceStatusRequest requestParam) { + try { + MDC.put(log_file_type, log_type); + log.info("queryCarDeviceStatus-----输入参数{}", requestParam); + String api = addressService.findByCode("queryCarDeviceStatus").getMethods_url(); + String result = AcsUtil.notifyAcs(api, requestParam); + log.info("queryCarDeviceStatus-----输出参数{}", result); + return RespUtil.getResp(result, new DeviceStatusRequest()); + } finally { + MDC.remove(log_file_type); + } + } + + @Override + public Resp queryTsjDeviceStatus(DeviceStatusRequest requestParam) { + try { + MDC.put(log_file_type, log_type); + log.info("queryTsjDeviceStatus-----输入参数{}", requestParam); + String api = addressService.findByCode("queryTsjDeviceStatus").getMethods_url(); + String result = AcsUtil.notifyAcs(api, requestParam); + log.info("queryTsjDeviceStatus-----输出参数{}", result); + return RespUtil.getResp(result, new DeviceStatusRequest()); + } finally { + MDC.remove(log_file_type); + } + } + + @Override + public Resp querySsxDeviceStatus(DeviceStatusRequest requestParam) { + try { + MDC.put(log_file_type, log_type); + log.info("queryTsjDeviceStatus-----输入参数{}", requestParam); + String api = addressService.findByCode("querySsxDeviceStatus").getMethods_url(); + String result = AcsUtil.notifyAcs(api, requestParam); + log.info("queryTsjDeviceStatus-----输出参数{}", result); + return RespUtil.getResp(result, new DeviceStatusRequest()); + } finally { + MDC.remove(log_file_type); + } + } + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java index 5cb3cff2c..0dcd36e65 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java @@ -255,9 +255,9 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { MDC.remove(log_file_type); } - - } + + }