From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java | 48 +++++-------------------------------------------
1 files changed, 5 insertions(+), 43 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 780d073..cf0c7a3 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
@@ -6,7 +6,6 @@
import com.ld.igds.camera.data.ApiCameraResp;
import com.ld.igds.camera.data.ApiSnapReq;
import com.ld.igds.constant.BizType;
-import com.ld.igds.constant.DeviceType;
import com.ld.igds.data.SnapImgDto;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.inout.ApiInoutManager;
@@ -30,7 +29,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -128,27 +126,7 @@
}
- /**
- * @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;
-// }
+
/**
* 鍑哄叆搴撴姄鎷�
@@ -278,6 +256,10 @@
req.setPlayType(conf.getPlayType());
req.setSerSn(null == snapSer ? null : snapSer.getSn());
req.setBizId(param.getBizId());
+ //鑻ヤ负鍑哄叆搴撶О閲嶆姄鎷嶏紝鍒欎笉浼犻�掍笟鍔′富閿�傚湪鍑哄叆搴撲笟鍔℃彁浜ゆ椂淇濆瓨鏂囦欢淇℃伅
+ if(InoutConstant.PROGRESS_WEIGHT_TAG.equals(conf.getInoutProgress())){
+ req.setBizId(null);
+ }
req.setCameraName(conf.getName());
req.setMediaAddr(CameraUtil.updateMediaAddr(conf.getMediaAddr(), conf.getLoginId(),
@@ -371,26 +353,6 @@
return null;
}
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;
}
/**
--
Gitblit v1.9.3