From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 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 ba47fef..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,13 +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;
@@ -21,12 +26,13 @@
public interface WorkOrderService extends IService<WorkOrder> {
/**
- * 绯荤粺鍐呴儴鐨勬坊鍔�
+ * 绯荤粺鍐呴儴鐨勬坊鍔狅紝涓嬪彂
*
* @param workOrderList
* @return
*/
- Boolean innerAdd(List<WorkOrder> workOrderList);
+ Boolean innerAddWorkOrder(List<WorkOrder> workOrderList);
+
/**
* 娣诲姞
@@ -127,17 +133,17 @@
/**
* 鑾峰彇宸ュ崟杩愮淮鎯呭喌
- * @param id 宸ュ崟id
+ * @param workOrderNo 宸ュ崟鍙�
* @return 宸ュ崟杩愮淮鎯呭喌
*/
- Result selectYwConditionByYwId(Integer id);
+ List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo);
/**
* 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
- * @param id 宸ュ崟id
+ * @param workOrderNo 宸ュ崟鍙�
* @return 宸ュ崟杩愮淮瀹℃牳璁板綍
*/
- Result selectYwAuditingListByYwId(String id);
+ List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo);
/**
* 鎵归噺涓嬪彂
@@ -174,4 +180,40 @@
*/
List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery);
+
+ /**
+ * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗�
+ *
+ * @param deviceId 鍥芥爣璁惧鍥芥爣鐮�
+ * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛�
+ * @param workOrderNo 宸ュ崟鍙�
+ * @return 鏁版嵁
+ */
+ String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
+
+ /**
+ * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
+ *
+ * @param start 寮�濮嬫椂闂�
+ * @param end 缁撴潫鏃堕棿
+ * @return 鏁版嵁
+ */
+ 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