From babf39d1cf3905e7aafc32ddc41e3960f32fb56b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 21:07:06 +0800
Subject: [PATCH] 优化出入库信息2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java
index 442b974..81ce32e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java
@@ -5,13 +5,14 @@
import com.ld.igds.camera.data.ApiCameraData;
import com.ld.igds.camera.data.ApiCameraResp;
import com.ld.igds.camera.data.ApiSnapReq;
+import com.ld.igds.data.SnapImgDto;
import com.ld.igds.file.CoreFileService;
+import com.ld.igds.inout.ApiInoutManager;
import com.ld.igds.inout.InoutConstant;
-import com.ld.igds.inout.dto.InoutApiData;
+import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.inout.dto.InoutCameraDto;
import com.ld.igds.inout.dto.InoutData;
-import com.ld.igds.inout.dto.InoutSnapImgDto;
-import com.ld.igds.io.InoutApiService;
+import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.InoutConf;
@@ -49,7 +50,7 @@
private ApiCameraManager apiCameraManager;
- public InoutApiData getPlateNum(InoutApiData param) {
+ public ApiInoutData getPlateNum(ApiInoutData param) {
//濡傛灉浣跨敤鐨勬槸鍦扮鎻掍欢鑾峰彇锛屽垯闇�瑕佽皟鏁磋澶囦负鍦扮鎻掍欢淇℃伅
if (ProtocolEnum.TCP_FZZY_WEIGHT.getCode().equals(param.getProtocol())) {
@@ -60,7 +61,7 @@
return param;
}
- InoutApiData pluginWeight = new InoutApiData();
+ ApiInoutData pluginWeight = new ApiInoutData();
pluginWeight = param;
pluginWeight.setIp(conf.getIp());
pluginWeight.setPort(conf.getPort());
@@ -74,7 +75,7 @@
return apiInoutManager.getApiService(param.getProtocol()).getPlateNum(param);
}
- public InoutApiData getIcCardNum(InoutApiData param) {
+ public ApiInoutData getIcCardNum(ApiInoutData param) {
return apiInoutManager.getApiService(param.getProtocol()).getIcCardNum(param);
}
@@ -119,14 +120,9 @@
if (null == conf) return;
- InoutApiData lprData = new InoutApiData(conf);
+ ApiInoutData lprData = new ApiInoutData(conf);
apiInoutManager.getApiService(conf.getProtocol()).initLpr(lprData);
- }
-
-
- public String reConnectLpr(InoutApiData param) {
- return apiInoutManager.getApiService(param.getProtocol()).reConnectLpr(param);
}
@@ -134,7 +130,7 @@
* @param param
* @return
*/
- public String noticeWeightDone(InoutApiData param) {
+ public String noticeWeightDone(ApiInoutData param) {
//鑾峰彇绉伴噸涓绘帶鍣ㄩ厤缃�
InoutConf conf = getWeightGateway(param.getCompanyId(), param.getDeptId(), param.getSort());
@@ -142,14 +138,14 @@
return "绉伴噸涓绘帶鏈厤缃紝鏀寔澶辫触";
}
- InoutApiData apiData = new InoutApiData(conf);
+ ApiInoutData apiData = new ApiInoutData(conf);
apiData.setPlateNum(param.getPlateNum());
- apiData.setInoutProgress(param.getInoutProgress());
apiData.setTime(new Date());
- InoutApiService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
- return inoutApiService.noticeWeightDone(apiData);
+ // return inoutApiService.noticeWeightDone(apiData); TODO
+ return null;
}
/**
@@ -158,7 +154,7 @@
* @param param
* @return
*/
- public InoutSnapImgDto snapImg(InoutSnapImgDto param) {
+ public SnapImgDto snapImg(SnapImgDto param) {
try {
InoutConf conf;
@@ -205,7 +201,7 @@
*
* @param snapImgDto
*/
- private void noticeGatewayWeightInfo(InoutSnapImgDto snapImgDto) {
+ private void noticeGatewayWeightInfo(SnapImgDto snapImgDto) {
log.debug("-------------鐢ㄦ埛纭绉伴噸----閫氱煡绉伴噸缃戝叧----{}", snapImgDto.getWeight());
InoutConf conf = this.getWeightGateway(snapImgDto.getCompanyId(), snapImgDto.getDeptId(), snapImgDto.getSort());
@@ -215,7 +211,7 @@
return;
}
- InoutApiData apiData = new InoutApiData(conf);
+ ApiInoutData apiData = new ApiInoutData(conf);
apiData.setTime(new Date());
apiData.setRepeat(2);
apiData.setWeight(snapImgDto.getWeight());
@@ -233,7 +229,7 @@
*
* @param imgDto
*/
- private void noticeGatewayAddWhitePlate(InoutSnapImgDto imgDto) {
+ private void noticeGatewayAddWhitePlate(SnapImgDto imgDto) {
List<InoutConf> list = this.getWeightGateway(imgDto.getCompanyId(), imgDto.getDeptId());
@@ -244,13 +240,13 @@
log.debug("-------------鐧昏瀹屾垚锛屽鍔犺溅鐗岀櫧鍚嶅崟-----------{}", imgDto.getPlateNum());
- InoutApiService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
- InoutApiData apiData;
+ ApiInoutData apiData;
for (InoutConf conf : list) {
- apiData = new InoutApiData(conf);
+ apiData = new ApiInoutData(conf);
apiData.setPlateNum(imgDto.getPlateNum());
- inoutApiService.addWhitePlate(apiData);
+ // inoutApiService.addWhitePlate(apiData);
}
}
@@ -262,13 +258,14 @@
return;
}
- InoutApiService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
- InoutApiData apiData;
+ ApiInoutData apiData;
for (InoutConf conf : list) {
- apiData = new InoutApiData(conf);
+ apiData = new ApiInoutData(conf);
apiData.setPlateNum(data.getPlateNum());
- inoutApiService.delWhitePlate(apiData);
+
+ // inoutApiService.delWhitePlate(apiData); TODO
}
}
@@ -280,7 +277,7 @@
* @param snapSer
* @return
*/
- private String snapImgByConf(InoutConf conf, InoutSnapImgDto param, SnapSer snapSer) {
+ private String snapImgByConf(InoutConf conf, SnapImgDto param, SnapSer snapSer) {
if (null == conf) return null;
if (null == conf.getSnapType()) {
@@ -430,4 +427,16 @@
}
+ /**
+ * 鏍规嵁鍑哄叆搴撲俊鎭紝鎺у埗鍑哄叆搴撴帶鍒跺櫒
+ *
+ * @param data
+ * @param curProgress
+ * @param nextProgress
+ */
+ public void controlWeight(InoutData data, String curProgress, String nextProgress) {
+
+ //TODO
+
+ }
}
--
Gitblit v1.9.3