From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
index 47c8dc7..32498d0 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
@@ -36,15 +36,13 @@
@ResponseBody
@RequestMapping("/get-plateNum")
public PageResponse<ApiInoutData> getPlateNum(@RequestBody ApiInoutData param) {
-
- if (StringUtils.isEmpty(param.getProtocol())) {
- param.setErrorMsg("褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+
+ if (null == param.getIp()) {
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
}
- if (null == param.getIp()) {
- param.setErrorMsg("鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ if (StringUtils.isEmpty(param.getProtocol())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
}
param = inoutDeviceManager.getPlateNum(param);
@@ -57,23 +55,21 @@
}
/**
- * 鑾峰彇杞︾墝璇嗗埆淇℃伅
+ * 鑾峰彇鏅烘収鍗′俊鎭�
*
- * @param param 杞︾墝璇嗗埆鏁版嵁淇℃伅
+ * @param param 鑾峰彇鏅烘収鍗′俊鎭�
* @return
*/
@ResponseBody
- @RequestMapping("/ic-card-num")
- public PageResponse<ApiInoutData> getIcCardNum(@RequestBody ApiInoutData param) {
+ @RequestMapping("/get-icCard")
+ public PageResponse<ApiInoutData> getIcCard(@RequestBody ApiInoutData param) {
if (StringUtils.isEmpty(param.getProtocol())) {
- param.setErrorMsg("褰撳墠鏅烘収鍗℃湭閰嶇疆閫氳鍗忚锛屾棤娉曟墽琛�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠鏅烘収鍗℃湭閰嶇疆閫氳鍗忚锛屾棤娉曟墽琛�");
}
if (null == param.getIp()) {
- param.setErrorMsg("鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆鏅烘収鍗′俊鎭�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆鏅烘収鍗′俊鎭�");
}
param = inoutDeviceManager.getIcCardNum(param);
--
Gitblit v1.9.3