From cf2ca433a7e6ef92b33c1479f60702e97c2cb1bf Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 19 九月 2024 19:55:33 +0800
Subject: [PATCH] OSDbug修复、合同抽检可配置、合同抽检任务空指针修复
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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 4a2bca7..881aa00 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,15 +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;
@@ -23,13 +26,12 @@
public interface WorkOrderService extends IService<WorkOrder> {
/**
- * 绯荤粺鍐呴儴鐨勬坊鍔狅紝涓嬪彂
+ * 绯荤粺鍐呴儴鐨勬坊鍔�
*
* @param workOrderList
* @return
*/
Boolean innerAddWorkOrder(List<WorkOrder> workOrderList);
-
/**
* 娣诲姞
@@ -133,14 +135,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);
/**
* 鎵归噺涓嬪彂
@@ -189,11 +191,23 @@
String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
/**
- * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
+ * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗囷紝骞朵繚瀛樺埌鏁版嵁搴�
*
+ * @param deviceId 鍥芥爣璁惧鍥芥爣鐮�
+ * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛�
+ * @param workOrderNo 宸ュ崟鍙�
* @return 鏁版嵁
*/
- List<DeviceInfoVO> hasErrorWorkOrderList();
+ void saveFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
+
+ /**
+ * 鏌ヨ宸ュ崟锛氬緟瀹℃牳鐨勫伐鍗�
+ *
+ * @param start 寮�濮嬫椂闂�
+ * @param end 缁撴潫鏃堕棿
+ * @return 鏁版嵁
+ */
+ List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end);
/**
* 鏇存柊宸ュ崟鍥剧墖
@@ -203,4 +217,20 @@
* @return 鏁版嵁
*/
void updateImgById(Integer workOrderId, String imgPath);
+
+ /**
+ * 宸ュ崟杩囩▼鍥�
+ *
+ * @param workOrderNo
+ * @return
+ */
+ Result processImg(String workOrderNo);
+
+ /**
+ * 宸ュ崟璇︽儏
+ *
+ * @param workOrderNo
+ * @return
+ */
+ Result detailByNo(String workOrderNo);
}
--
Gitblit v1.8.0