From c1ade366428ade752213c196f3c76b49020a9839 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 29 八月 2024 16:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index fcaee48..4a2bca7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -9,6 +9,7 @@
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
import com.ycl.system.Result;
+import org.bytedeco.javacv.FFmpegFrameGrabber;
import java.util.List;
import java.util.Map;
@@ -129,17 +130,17 @@
/**
* 鑾峰彇宸ュ崟杩愮淮鎯呭喌
- * @param id 宸ュ崟id
+ * @param workOrderNo 宸ュ崟鍙�
* @return 宸ュ崟杩愮淮鎯呭喌
*/
- Result selectYwConditionByYwId(Integer id);
+ Result selectYwConditionByYwId(String workOrderNo);
/**
* 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
- * @param id 宸ュ崟id
+ * @param workOrderNo 宸ュ崟鍙�
* @return 宸ュ崟杩愮淮瀹℃牳璁板綍
*/
- Result selectYwAuditingListByYwId(String id);
+ Result selectYwAuditingListByYwId(String workOrderNo);
/**
* 鎵归噺涓嬪彂
@@ -180,11 +181,12 @@
/**
* 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗�
*
- * @param deviceId 璁惧鍥芥爣鐮�
- * @param channelId 璁惧閫氶亾缂栧彿
+ * @param deviceId 鍥芥爣璁惧鍥芥爣鐮�
+ * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛�
+ * @param workOrderNo 宸ュ崟鍙�
* @return 鏁版嵁
*/
- String getFrameImgByDevice(String deviceId, String channelId);
+ String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
/**
* 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
@@ -194,7 +196,7 @@
List<DeviceInfoVO> hasErrorWorkOrderList();
/**
- * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
+ * 鏇存柊宸ュ崟鍥剧墖
*
* @param workOrderId 宸ュ崟ID
* @param imgPath 鍥惧儚鍦板潃
--
Gitblit v1.8.0