From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 edd2a15..0f3bf8b 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
@@ -2,14 +2,18 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DeviceInfoVO;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
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.Date;
import java.util.List;
import java.util.Map;
@@ -132,14 +136,14 @@
* @param workOrderNo 宸ュ崟鍙�
* @return 宸ュ崟杩愮淮鎯呭喌
*/
- Result selectYwConditionByYwId(String workOrderNo);
+ List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo);
/**
* 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
* @param workOrderNo 宸ュ崟鍙�
* @return 宸ュ崟杩愮淮瀹℃牳璁板綍
*/
- Result selectYwAuditingListByYwId(String workOrderNo);
+ List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo);
/**
* 鎵归噺涓嬪彂
@@ -180,25 +184,36 @@
/**
* 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗�
*
- * @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);
/**
* 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
*
+ * @param start 寮�濮嬫椂闂�
+ * @param end 缁撴潫鏃堕棿
* @return 鏁版嵁
*/
- List<DeviceInfoVO> hasErrorWorkOrderList();
+ List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end);
/**
- * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
+ * 鏇存柊宸ュ崟鍥剧墖
*
* @param workOrderId 宸ュ崟ID
* @param imgPath 鍥惧儚鍦板潃
* @return 鏁版嵁
*/
void updateImgById(Integer workOrderId, String imgPath);
+
+ /**
+ * 宸ュ崟杩囩▼鍥�
+ *
+ * @param workOrderNo
+ * @return
+ */
+ Result processImg(String workOrderNo);
}
--
Gitblit v1.8.0