root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-01-06 20:14:11 +08:00
parent 153721b600
commit 7cc260bc57
7 changed files with 137 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java Normal file
View File

@@ -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;
}

8
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusRequest.java Normal file
View File

@@ -0,0 +1,8 @@
package org.nl.acs.ext.wms.liKuData;
public class DeviceStatusRequest {
String deviceId;
}

14
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusResponse.java Normal file
View File

@@ -0,0 +1,14 @@
package org.nl.acs.ext.wms.liKuData;
public class DeviceStatusResponse {
String result;
String code;
String comment;
DeviceStatusData data;
}

22
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java
View File

@@ -88,4 +88,26 @@ public class AcsToLiKuController {
public ResponseEntity<Object> cancelTask(@RequestBody CancelTaskRequest requestParam) {
return new ResponseEntity<>(acsToLiKuService.cancelTask(requestParam), HttpStatus.OK);
}
@PostMapping("/queryCarStatus")
@Log("查询四向车状态")
@ApiOperation("查询四向车状态")
public ResponseEntity<Object> queryCarStatus(@RequestBody DeviceStatusRequest requestParam) {
return new ResponseEntity<>(acsToLiKuService.queryCarDeviceStatus(requestParam), HttpStatus.OK);
}
@PostMapping("/queryTsjStatus")
@Log("查询提升机状态")
@ApiOperation("查询提升机状态")
public ResponseEntity<Object> queryTsjStatus(@RequestBody DeviceStatusRequest requestParam) {
return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK);
}
@PostMapping("/querySsxStatus")
@Log("查询输送线状态")
@ApiOperation("查询提升机状态")
public ResponseEntity<Object> querySsxStatus(@RequestBody DeviceStatusRequest requestParam) {
return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK);
}
}

20
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToLiKuService.java
View File

@@ -65,4 +65,24 @@ public interface AcsToLiKuService {
* @return
*/
public Resp<CancelTaskResponse> cancelTask(CancelTaskRequest requestParam);
/**
*查询小车设备状态
* @return
*/
public Resp<DeviceStatusResponse> queryCarDeviceStatus(DeviceStatusRequest requestParam);
/**
*查询tsj设备状态
* @return
*/
public Resp<DeviceStatusResponse> queryTsjDeviceStatus(DeviceStatusRequest requestParam);
/**
*查询ssx设备状态
* @return
*/
public Resp<DeviceStatusResponse> querySsxDeviceStatus(DeviceStatusRequest requestParam);
}

42
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToLiKuServiceImpl.java
View File

@@ -150,4 +150,46 @@ public class AcsToLiKuServiceImpl implements AcsToLiKuService {
}
@Override
public Resp<DeviceStatusResponse> 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<DeviceStatusResponse> 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<DeviceStatusResponse> 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);
}
}
}

4
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
View File

@@ -255,9 +255,9 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
MDC.remove(log_file_type);
}
}
}