From 5a244958ec24b95c47e377607319c7503cddd6bb Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期日, 05 十一月 2023 20:48:04 +0800
Subject: [PATCH] 优化结算录入
---
igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
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 9f27bd7..a5abe9e 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
@@ -1,14 +1,18 @@
package com.ld.igds.protocol.weight;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.inout.dto.InoutApiData;
-import com.ld.igds.io.InoutApiService;
+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;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Component;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
@@ -20,7 +24,7 @@
*/
@Slf4j
@Component
-public class FzzyWeightServiceImpl implements InoutApiService {
+public class FzzyWeightServiceImpl implements ApiInoutService {
@Override
@@ -33,7 +37,7 @@
* @return
*/
@Override
- public InoutApiData getPlateNum(InoutApiData param) {
+ public ApiInoutData getPlateNum(ApiInoutData param) {
if (null == param.getSn()) {
@@ -87,19 +91,13 @@
* @return
*/
@Override
- public String reConnectLpr(InoutApiData param) {
- return "褰撳墠妯″紡鏃犻渶閲嶇疆杞︾墝璇嗗埆";
+ public String initLpr(ApiInoutData param) {
+ return "褰撳墠妯″紡鏃犻渶鍒濆鍖栬溅鐗岃瘑鍒�";
}
- /**
- * 涓嶉渶瑕佸疄鐜�
- *
- * @param param
- * @return
- */
@Override
- public String initLpr(InoutApiData param) {
- return "褰撳墠妯″紡鏃犻渶鍒濆鍖栬溅鐗岃瘑鍒�";
+ public String lightControl(ApiInoutData param) {
+ return null;
}
@@ -110,7 +108,7 @@
* @return
*/
@Override
- public String gateControl(InoutApiData param) {
+ public String gateControl(ApiInoutData param) {
return null;
}
@@ -120,8 +118,7 @@
* @param param deviceId鍜宎ctionCode 涓嶅彲涓虹┖
* @return
*/
- @Override
- public String addWhitePlate(InoutApiData param) {
+ public String addWhitePlate(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_10}));
ExecutorService executorService = Executors.newCachedThreadPool();
@@ -137,8 +134,7 @@
* @param param
* @return
*/
- @Override
- public String delWhitePlate(InoutApiData param) {
+ public String delWhitePlate(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_11}));
ExecutorService executorService = Executors.newCachedThreadPool();
executorService.submit(futureTask);
@@ -154,7 +150,7 @@
* @return
*/
@Override
- public String noticeRadio(InoutApiData 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();
@@ -164,10 +160,6 @@
return "SUCCESS";
}
- @Override
- public String gatewayStatus(InoutApiData param) {
- return null;
- }
/**
* 绉伴噸瀹屾垚 --璋冪敤瀛愮嚎绋嬪疄鐜�
@@ -175,9 +167,7 @@
* @param param
* @return
*/
- @Override
- public String noticeWeightDone(InoutApiData param) {
-
+ public String noticeWeightDone(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_60, WeightUtil.ACTION_CODE_30}));
ExecutorService executorService = Executors.newCachedThreadPool();
executorService.submit(futureTask);
@@ -191,7 +181,7 @@
* @return
*/
@Override
- public InoutApiData getIcCardNum(InoutApiData param) {
+ public ApiInoutData getIcCardNum(ApiInoutData param) {
try {
@@ -230,4 +220,10 @@
return param;
}
+
+ @Override
+ public String noticeLed(ApiInoutData param, InoutData data) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
--
Gitblit v1.9.3