From 61b40ca50044c8b20b6ea21028398e068ca103a0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:16:14 +0800
Subject: [PATCH] 调整DEVICE的字段和缓存，增加支持根据ID直接获取设备信息，优化MODBUS-TCP协议 实现
---
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 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..d01a357 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
@@ -5,7 +5,7 @@
import com.ld.igds.data.SnapImgDto;
import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.inout.dto.InoutCameraDto;
-import com.ld.igds.inout.manager.InoutDeviceManager;
+import com.ld.igds.inout.manager.InoutEventControlManager;
import com.ld.igds.models.InoutConf;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@
public class InoutApiController {
@Resource
- private InoutDeviceManager inoutDeviceManager;
+ private InoutEventControlManager inoutEventControl;
/**
* 鑾峰彇杞︾墝璇嗗埆淇℃伅
@@ -37,17 +37,15 @@
@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()) {
- param.setErrorMsg("鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
}
- param = inoutDeviceManager.getPlateNum(param);
+ if (StringUtils.isEmpty(param.getProtocol())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
+ }
+
+ param = inoutEventControl.getPlateNum(param);
if (StringUtils.isEmpty(param.getErrorMsg())) {
return new PageResponse<>(RespCodeEnum.CODE_0000, param);
@@ -57,26 +55,24 @@
}
/**
- * 鑾峰彇杞︾墝璇嗗埆淇℃伅
+ * 鑾峰彇鏅烘収鍗′俊鎭�
*
- * @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);
+ param = inoutEventControl.getIcCardNum(param);
if (StringUtils.isEmpty(param.getErrorMsg())) {
return new PageResponse<>(RespCodeEnum.CODE_0000, param);
@@ -94,7 +90,7 @@
public @ResponseBody
PageResponse<InoutCameraDto> inoutVideoPlay(@RequestBody InoutCameraDto param) {
param.setErrorMsg(null);
- param = inoutDeviceManager.inoutVideoPlay(param);
+ param = inoutEventControl.inoutVideoPlay(param);
if (StringUtils.isEmpty(param.getErrorMsg())) {
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎴愬姛", param);
@@ -112,7 +108,7 @@
public @ResponseBody
PageResponse<String> keepLive(@RequestBody InoutCameraDto param) {
- String msg = inoutDeviceManager.videoKeepLive(param);
+ String msg = inoutEventControl.videoKeepLive(param);
return new PageResponse<>(RespCodeEnum.CODE_0000, msg);
}
@@ -128,7 +124,7 @@
public @ResponseBody
PageResponse<SnapImgDto> cutImg(@RequestBody SnapImgDto param) {
- param = inoutDeviceManager.snapImg(param);
+ param = inoutEventControl.snapImg(param);
return new PageResponse<>(RespCodeEnum.CODE_0000, param);
}
@@ -153,7 +149,7 @@
view.addObject("length", length);
view.addObject("width", width);
- InoutConf inoutConf = inoutDeviceManager.getInoutConf(id);
+ InoutConf inoutConf = inoutEventControl.getInoutConf(id);
view.addObject("data", inoutConf);
view.setViewName("admin/inout/video-hik");
@@ -167,13 +163,13 @@
* @param param
* @return
*/
- @RequestMapping("/notice-weight-done")
- public @ResponseBody
- PageResponse<String> noticeWeightDone(@RequestBody ApiInoutData param) {
-
- String msg = inoutDeviceManager.noticeWeightDone(param);
-
- return new PageResponse<>(RespCodeEnum.CODE_0000, msg);
- }
+// @RequestMapping("/notice-weight-done")
+// public @ResponseBody
+// PageResponse<String> noticeWeightDone(@RequestBody ApiInoutData param) {
+//
+// String msg = inoutEventControl.noticeWeightDone(param);
+//
+// return new PageResponse<>(RespCodeEnum.CODE_0000, msg);
+// }
}
--
Gitblit v1.9.3