From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 71662b3..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,13 @@
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.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.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.m.service.InoutCommonService;
@@ -144,7 +144,7 @@
ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
- // return inoutApiService.noticeWeightDone(apiData); TODO
+ // return inoutApiService.noticeWeightDone(apiData); TODO
return null;
}
@@ -154,7 +154,7 @@
* @param param
* @return
*/
- public InoutSnapImgDto snapImg(InoutSnapImgDto param) {
+ public SnapImgDto snapImg(SnapImgDto param) {
try {
InoutConf conf;
@@ -201,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());
@@ -229,7 +229,7 @@
*
* @param imgDto
*/
- private void noticeGatewayAddWhitePlate(InoutSnapImgDto imgDto) {
+ private void noticeGatewayAddWhitePlate(SnapImgDto imgDto) {
List<InoutConf> list = this.getWeightGateway(imgDto.getCompanyId(), imgDto.getDeptId());
@@ -246,7 +246,7 @@
for (InoutConf conf : list) {
apiData = new ApiInoutData(conf);
apiData.setPlateNum(imgDto.getPlateNum());
- // inoutApiService.addWhitePlate(apiData);
+ // inoutApiService.addWhitePlate(apiData);
}
}
@@ -265,7 +265,7 @@
apiData = new ApiInoutData(conf);
apiData.setPlateNum(data.getPlateNum());
- // inoutApiService.delWhitePlate(apiData); TODO
+ // inoutApiService.delWhitePlate(apiData); TODO
}
}
@@ -277,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()) {
@@ -427,4 +427,16 @@
}
+ /**
+ * 鏍规嵁鍑哄叆搴撲俊鎭紝鎺у埗鍑哄叆搴撴帶鍒跺櫒
+ *
+ * @param data
+ * @param curProgress
+ * @param nextProgress
+ */
+ public void controlWeight(InoutData data, String curProgress, String nextProgress) {
+
+ //TODO
+
+ }
}
--
Gitblit v1.9.3