From 3c6efb35ff0ebcca6e7104c20cde64825fddd59d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:35:24 +0800
Subject: [PATCH] 添加数据
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java | 232 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
index 3002c16..7732e83 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
@@ -29,7 +29,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -69,20 +68,16 @@
//濡傛灉浣跨敤鐨勬槸鍦扮鎻掍欢鑾峰彇锛屽垯闇�瑕佽皟鏁磋澶囦负鍦扮鎻掍欢淇℃伅
if (ProtocolEnum.TCP_FZZY_WEIGHT.getCode().equals(param.getProtocol())) {
-
InoutConf conf = this.getInoutConf(param.getCompanyId(), param.getDeptId(), param.getSort(), InoutConstant.CONF_TYPE_70);
if (null == conf) {
param.setErrorMsg("娌℃湁鑾峰彇鍒板綋鍓嶅崗璁彃浠堕厤缃厤缃俊鎭紝鑾峰彇澶辫触");
return param;
}
-
-
param.setIp(conf.getIp());
param.setPort(conf.getPort());
param.setProtocol(conf.getProtocol());
return apiInoutManager.getApiService(param.getProtocol()).getPlateNum(param);
-
}
return apiInoutManager.getApiService(param.getProtocol()).getPlateNum(param);
@@ -96,6 +91,20 @@
* @return
*/
public ApiInoutData getIcCardNum(ApiInoutData param) {
+
+ //濡傛灉浣跨敤鐨勬槸鍦扮鎻掍欢鑾峰彇锛屽垯闇�瑕佽皟鏁磋澶囦负鍦扮鎻掍欢淇℃伅
+ if (ProtocolEnum.TCP_FZZY_WEIGHT.getCode().equals(param.getProtocol())) {
+ InoutConf conf = this.getInoutConf(param.getCompanyId(), param.getDeptId(), param.getSort(), InoutConstant.CONF_TYPE_70);
+ if (null == conf) {
+ param.setErrorMsg("娌℃湁鑾峰彇鍒板綋鍓嶅崗璁彃浠堕厤缃厤缃俊鎭紝鑾峰彇澶辫触");
+ return param;
+ }
+ param.setIp(conf.getIp());
+ param.setPort(conf.getPort());
+ param.setProtocol(conf.getProtocol());
+
+ return apiInoutManager.getApiService(param.getProtocol()).getIcCardNum(param);
+ }
return apiInoutManager.getApiService(param.getProtocol()).getIcCardNum(param);
}
@@ -121,23 +130,23 @@
* @param param
* @return
*/
- public String noticeWeightDone(ApiInoutData param) {
- //鑾峰彇绉伴噸涓绘帶鍣ㄩ厤缃�
- InoutConf conf = getWeightGateway(param.getCompanyId(), param.getDeptId(), param.getSort());
-
- if (null == conf) {
- return "绉伴噸涓绘帶鏈厤缃紝鏀寔澶辫触";
- }
-
- ApiInoutData apiData = new ApiInoutData(conf);
- apiData.setPlateNum(param.getPlateNum());
- apiData.setTime(new Date());
-
- ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
-
- // return inoutApiService.noticeWeightDone(apiData); TODO
- return null;
- }
+// public String noticeWeightDone(ApiInoutData param) {
+// //鑾峰彇绉伴噸涓绘帶鍣ㄩ厤缃�
+// InoutConf conf = getWeightGateway(param.getCompanyId(), param.getDeptId(), param.getSort());
+//
+// if (null == conf) {
+// return "绉伴噸涓绘帶鏈厤缃紝鏀寔澶辫触";
+// }
+//
+// ApiInoutData apiData = new ApiInoutData(conf);
+// apiData.setPlateNum(param.getPlateNum());
+// apiData.setTime(new Date());
+//
+// ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
+//
+// // return inoutApiService.noticeWeightDone(apiData); TODO
+// return null;
+// }
/**
* 鍑哄叆搴撴姄鎷�
@@ -175,73 +184,73 @@
*
* @param snapImgDto
*/
- private void noticeGatewayWeightInfo(SnapImgDto snapImgDto) {
-
- log.debug("-------------鐢ㄦ埛纭绉伴噸----閫氱煡绉伴噸缃戝叧----{}", snapImgDto.getWeight());
- InoutConf conf = this.getWeightGateway(snapImgDto.getCompanyId(), snapImgDto.getDeptId(), snapImgDto.getSort());
-
- if (null == conf) {
- log.info("-------------鐢ㄦ埛纭绉伴噸----閫氱煡绉伴噸缃戝叧---鏈厤缃綉鍏�----");
- return;
- }
-
- ApiInoutData apiData = new ApiInoutData(conf);
- apiData.setTime(new Date());
- apiData.setRepeat(2);
- apiData.setWeight(snapImgDto.getWeight());
- apiData.setPlateNum(snapImgDto.getPlateNum());
- //绉伴噸淇℃伅鏆傛椂鍙栨秷鎾斁
-// apiData.setMsg("褰撳墠绉伴噸锛�" + apiData.getWeight() + "鍗冨厠");
- apiData.setMsg("绉伴噸宸插畬鎴�");
-
-// apiInoutManager.getApiService(apiData.getProtocol()).noticeWeightDone(apiData);
- // apiInoutManager.getApiService(apiData.getProtocol()).noticeRadio(apiData);
- }
+// private void noticeGatewayWeightInfo(SnapImgDto snapImgDto) {
+//
+// log.debug("-------------鐢ㄦ埛纭绉伴噸----閫氱煡绉伴噸缃戝叧----{}", snapImgDto.getWeight());
+// InoutConf conf = this.getWeightGateway(snapImgDto.getCompanyId(), snapImgDto.getDeptId(), snapImgDto.getSort());
+//
+// if (null == conf) {
+// log.info("-------------鐢ㄦ埛纭绉伴噸----閫氱煡绉伴噸缃戝叧---鏈厤缃綉鍏�----");
+// return;
+// }
+//
+// ApiInoutData apiData = new ApiInoutData(conf);
+// apiData.setTime(new Date());
+// apiData.setRepeat(2);
+// apiData.setWeight(snapImgDto.getWeight());
+// apiData.setPlateNum(snapImgDto.getPlateNum());
+// //绉伴噸淇℃伅鏆傛椂鍙栨秷鎾斁
+//// apiData.setMsg("褰撳墠绉伴噸锛�" + apiData.getWeight() + "鍗冨厠");
+// apiData.setMsg("绉伴噸宸插畬鎴�");
+//
+//// apiInoutManager.getApiService(apiData.getProtocol()).noticeWeightDone(apiData);
+// // apiInoutManager.getApiService(apiData.getProtocol()).noticeRadio(apiData);
+// }
/**
* 鏂板鐧藉悕鍗曠粰浣忔帶鍒跺櫒锛岄渶瑕佹敞鎰忕殑鏄紝鐧昏鏃跺�欎笉纭浣跨敤鍝釜鍦扮绯荤粺锛屽鏋滅郴缁熼厤缃涓富鎺у櫒锛岄渶瑕佸悓姝ュ叏閮ㄦ帹閫�
*
* @param imgDto
*/
- private void noticeGatewayAddWhitePlate(SnapImgDto imgDto) {
+// private void noticeGatewayAddWhitePlate(SnapImgDto imgDto) {
+//
+// List<InoutConf> list = this.getWeightGateway(imgDto.getCompanyId(), imgDto.getDeptId());
+//
+// if (null == list || list.isEmpty()) {
+// log.info("-------------绉伴噸缃戝叧澧炲姞鐧藉悕鍗�----娌℃湁鑾峰彇鍒扮綉鍏抽厤缃�-----鍙栨秷鎵ц---");
+// return;
+// }
+//
+// log.debug("-------------鐧昏瀹屾垚锛屽鍔犺溅鐗岀櫧鍚嶅崟-----------{}", imgDto.getPlateNum());
+//
+// ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
+//
+// ApiInoutData apiData;
+// for (InoutConf conf : list) {
+// apiData = new ApiInoutData(conf);
+// apiData.setPlateNum(imgDto.getPlateNum());
+// // inoutApiService.addWhitePlate(apiData);
+// }
+// }
- List<InoutConf> list = this.getWeightGateway(imgDto.getCompanyId(), imgDto.getDeptId());
-
- if (null == list || list.isEmpty()) {
- log.info("-------------绉伴噸缃戝叧澧炲姞鐧藉悕鍗�----娌℃湁鑾峰彇鍒扮綉鍏抽厤缃�-----鍙栨秷鎵ц---");
- return;
- }
-
- log.debug("-------------鐧昏瀹屾垚锛屽鍔犺溅鐗岀櫧鍚嶅崟-----------{}", imgDto.getPlateNum());
-
- ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
-
- ApiInoutData apiData;
- for (InoutConf conf : list) {
- apiData = new ApiInoutData(conf);
- apiData.setPlateNum(imgDto.getPlateNum());
- // inoutApiService.addWhitePlate(apiData);
- }
- }
-
- public void noticeProgressComplete(InoutData data) {
- log.debug("-----------------閫氱煡绉伴噸涓绘帶--------娴佺▼缁撴潫鍒犻櫎鐧藉悕鍗�");
- List<InoutConf> list = this.getWeightGateway(data.getCompanyId(), data.getDeptId());
-
- if (null == list || list.isEmpty()) {
- return;
- }
-
- ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
-
- ApiInoutData apiData;
- for (InoutConf conf : list) {
- apiData = new ApiInoutData(conf);
- apiData.setPlateNum(data.getPlateNum());
-
- // inoutApiService.delWhitePlate(apiData); TODO
- }
- }
+// public void noticeProgressComplete(InoutData data) {
+// log.debug("-----------------閫氱煡绉伴噸涓绘帶--------娴佺▼缁撴潫鍒犻櫎鐧藉悕鍗�");
+// List<InoutConf> list = this.getWeightGateway(data.getCompanyId(), data.getDeptId());
+//
+// if (null == list || list.isEmpty()) {
+// return;
+// }
+//
+// ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
+//
+// ApiInoutData apiData;
+// for (InoutConf conf : list) {
+// apiData = new ApiInoutData(conf);
+// apiData.setPlateNum(data.getPlateNum());
+//
+// // inoutApiService.delWhitePlate(apiData); TODO
+// }
+// }
/**
* 璋冪敤鎺ュ彛杩涜鎶撴媿
@@ -362,26 +371,6 @@
return inoutCommonService.getCacheInoutConf(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), id);
}
-
- /**
- * @Desc: 鑾峰彇绉伴噸缃戝叧璁惧
- * @author: Andy
- * @update-time: 2022/11/26
- */
- public List<InoutConf> getWeightGateway(String companyId, String deptId) {
- List<InoutConf> list = inoutCommonService.getCacheInoutConf(companyId, deptId);
- if (null == list || list.isEmpty()) return null;
-
- List<InoutConf> result = new ArrayList<>();
-
- for (InoutConf conf : list) {
- if (InoutConstant.CONF_TYPE_70.equals(conf.getType())) {
- result.add(conf);
- }
- }
- return result;
- }
-
/**
* @Desc: 鑾峰彇绉伴噸缃戝叧璁惧
* @author: Andy
@@ -410,30 +399,41 @@
public void onReceivePlateNum(ApiInoutData data) {
InoutConf conf = this.getInoutConfBySn(data.getCompanyId(), data.getDeptId(), data.getSn());
-
- if (null == conf) return;
-
+ if (null == conf) {
+ log.error("娌℃湁鑾峰彇鍒板嚭鍏ュ簱閰嶇疆CONF锛�"+data.toString());
+ return;
+ }
+ log.info(conf.toString());
if (0 == conf.getInOrder()) return;
data = new ApiInoutData(conf);
-
- ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
-
+ log.info(data.toString());
+ ApiInoutService inoutApiService = null;
+ InoutConf gateconf = null;
//鑾峰彇杞︾墝淇℃伅锛屽紑闂告満
if (InoutApiConstant.DEVICE_CODE_1002 == data.getDeviceCode()) {
+ gateconf = this.getWeightGateway(data.getCompanyId(), data.getDeptId(), null);
+ if (null == gateconf) {
+ log.info("----------娌℃湁鑾峰彇鍒扮О閲嶆帶鍒跺櫒--------------");
+ }
+ data = new ApiInoutData(gateconf);
//寮�鍏ュ彛澶勯亾闂�
+ inoutApiService = apiInoutManager.getApiService(gateconf.getProtocol());
data.setDeviceCode(InoutApiConstant.DEVICE_CODE_2002);
data.setActionCode(InoutApiConstant.ACTION_CODE_1);
-
inoutApiService.gateControl(data);
}
-
if (InoutApiConstant.DEVICE_CODE_1003 == data.getDeviceCode()) {
+ gateconf = this.getWeightGateway(data.getCompanyId(), data.getDeptId(), null);
+ if (null == gateconf) {
+ log.info("----------娌℃湁鑾峰彇鍒扮О閲嶆帶鍒跺櫒--------------");
+ }
//寮�鍏ュ彛澶勯亾闂�
+ data = new ApiInoutData(gateconf);
+ inoutApiService = apiInoutManager.getApiService(gateconf.getProtocol());
data.setDeviceCode(InoutApiConstant.DEVICE_CODE_2003);
data.setActionCode(InoutApiConstant.ACTION_CODE_1);
-
inoutApiService.gateControl(data);
}
@@ -454,7 +454,7 @@
ApiInoutData apiInoutData;
ApiInoutService inoutApiService;
for (InoutConf conf : listInoutConf) {
- if (InoutConstant.CONF_TYPE_10.equals(conf.getType()) && sort.equals(conf.getSort())) {
+ if (InoutConstant.PROGRESS_WEIGHT_TAG.equals(conf.getInoutProgress())&&InoutConstant.CONF_TYPE_10.equals(conf.getType()) && sort.equals(conf.getSort())) {
apiInoutData = new ApiInoutData(conf);
inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
inoutApiService.initLpr(apiInoutData);
@@ -505,9 +505,9 @@
if (InoutConstant.TYPE_IN.equals(data.getType())) {
//缁撶畻閲嶉噺澶т簬0琛ㄧず浜屾绉伴噸
if (data.getNetWeight() > 0) {
- apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_1002);
+ apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_2002);
} else {
- apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_1003);
+ apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_2003);
}
apiData.setActionCode(InoutApiConstant.ACTION_CODE_1);
@@ -515,9 +515,9 @@
} else {
//缁撶畻閲嶉噺澶т簬0琛ㄧず浜屾绉伴噸
if (data.getNetWeight() > 0) {
- apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_1003);
+ apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_2002);
} else {
- apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_1002);
+ apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_2003);
}
apiData.setActionCode(InoutApiConstant.ACTION_CODE_1);
inoutApiService.gateControl(apiData);
--
Gitblit v1.9.3