From bab48c8264e4958e86195885c96e3910e2dcaba1 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 04 七月 2023 18:13:28 +0800
Subject: [PATCH] 邦海出入库控制协议

---
 igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java              |    4 ++--
 igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java  |   12 +++++++++---
 igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java |   12 +++++++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java b/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
index 616e00f..3ea581d 100644
--- a/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
@@ -33,12 +33,12 @@
     }
 
     @Override
-    public String gateControl(ApiInoutData param) {
+    public String gateControl(ApiInoutData param, InoutData data) {
         return null;
     }
 
     @Override
-    public String lightControl(ApiInoutData param) {
+    public String lightControl(ApiInoutData param, InoutData data) {
         return null;
     }
 
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
index 4b1b897..5949616 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
@@ -4,6 +4,7 @@
 import com.ld.igds.camera.CameraUtil;
 import com.ld.igds.inout.ApiInoutService;
 import com.ld.igds.inout.dto.ApiInoutData;
+import com.ld.igds.inout.dto.InoutData;
 import com.ld.igds.io.constant.ProtocolEnum;
 import com.ld.igds.protocol.openapi.data.PlateReqVo;
 import com.ld.igds.protocol.openapi.data.SinglePlateRepVo;
@@ -86,17 +87,22 @@
     }
 
     @Override
-    public String gateControl(ApiInoutData param) {
+    public String gateControl(ApiInoutData param, InoutData data) {
         return "褰撳墠鍗忚涓嶆敮鎸�";
     }
 
     @Override
-    public String noticeRadio(ApiInoutData param) {
+    public String lightControl(ApiInoutData param, InoutData data) {
+        return null;
+    }
+
+    @Override
+    public String noticeRadio(ApiInoutData param, InoutData data) {
         return "褰撳墠鍗忚涓嶆敮鎸�";
     }
 
     @Override
-    public String noticeLed(ApiInoutData param) {
+    public String noticeLed(ApiInoutData param, InoutData data) {
         return "褰撳墠鍗忚涓嶆敮鎸�";
     }
 }
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
index f54b5e1..901f6db 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.ld.igds.inout.dto.ApiInoutData;
 import com.ld.igds.inout.ApiInoutService;
+import com.ld.igds.inout.dto.InoutData;
 import com.ld.igds.io.constant.ProtocolEnum;
 import com.ld.igds.util.HttpUtils;
 
@@ -94,6 +95,11 @@
         return "褰撳墠妯″紡鏃犻渶鍒濆鍖栬溅鐗岃瘑鍒�";
     }
 
+    @Override
+    public String lightControl(ApiInoutData param, InoutData data) {
+        return null;
+    }
+
 
     /**
      * 鏆傛椂涓嶅疄鐜�
@@ -102,7 +108,7 @@
      * @return
      */
     @Override
-    public String gateControl(ApiInoutData param) {
+    public String gateControl(ApiInoutData param, InoutData data) {
         return null;
     }
 
@@ -144,7 +150,7 @@
      * @return
      */
     @Override
-    public String noticeRadio(ApiInoutData param) {
+    public String noticeRadio(ApiInoutData param, InoutData data) {
 
         FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_30}));
         ExecutorService executorService = Executors.newCachedThreadPool();
@@ -216,7 +222,7 @@
     }
 
 	@Override
-	public String noticeLed(ApiInoutData param) {
+	public String noticeLed(ApiInoutData param, InoutData data) {
 		// TODO Auto-generated method stub
 		return null;
 	}

--
Gitblit v1.9.3