From 785ce007ce4b7b2119a99aacc95cefe9da09e32e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 04 七月 2023 16:49:09 +0800
Subject: [PATCH] 优化出入库逻辑,调整节点事件

---
 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 32498d0..c888d5d 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;
 
     /**
      * 鑾峰彇杞︾墝璇嗗埆淇℃伅
@@ -36,8 +36,8 @@
     @ResponseBody
     @RequestMapping("/get-plateNum")
     public PageResponse<ApiInoutData> getPlateNum(@RequestBody ApiInoutData param) {
-    	
-    	if (null == param.getIp()) {
+
+        if (null == param.getIp()) {
             return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
         }
 
@@ -45,7 +45,7 @@
             return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
         }
 
-        param = inoutDeviceManager.getPlateNum(param);
+        param = inoutEventControl.getPlateNum(param);
 
         if (StringUtils.isEmpty(param.getErrorMsg())) {
             return new PageResponse<>(RespCodeEnum.CODE_0000, param);
@@ -72,7 +72,7 @@
             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);
@@ -90,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);
@@ -108,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);
     }
@@ -124,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);
     }
@@ -149,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,7 +167,7 @@
     public @ResponseBody
     PageResponse<String> noticeWeightDone(@RequestBody ApiInoutData param) {
 
-        String msg = inoutDeviceManager.noticeWeightDone(param);
+        String msg = inoutEventControl.noticeWeightDone(param);
 
         return new PageResponse<>(RespCodeEnum.CODE_0000, msg);
     }

--
Gitblit v1.9.3