From c0ababe8b64de64c8d7e09a80a9126f4ec99d50c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 08 十月 2023 15:22:43 +0800
Subject: [PATCH] 抓拍修改

---
 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java |   46 ++--------------------------------------------
 1 files changed, 2 insertions(+), 44 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..58b3aef 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;
-//    }
+
 
     /**
      * 鍑哄叆搴撴姄鎷�
@@ -288,7 +266,7 @@
         req.setFilePath(filePath);
 
         //璋冩暣闄勪欢鍚嶇О锛岄伩鍏嶅嚭鐜颁腑鏂�
-        String fileName = ContextUtil.getTimeId(100) + "_" + conf.getInoutProgress() + ".jpg";
+        String fileName = ContextUtil.getTimeId(100) + "_" + param.getProgress() + ".jpg";
         req.setFileName(fileName);
 
         //鎵ц鎶撴媿
@@ -371,26 +349,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