From d62cbd8da3bd2422de2923a6e7d999822730d632 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 11:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java | 22 ----------------------
1 files changed, 0 insertions(+), 22 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..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
@@ -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;
@@ -371,26 +369,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