From a136c5fba98b6dea0e43a77c409ba8eddcf5b9b6 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 九月 2024 16:44:16 +0800 Subject: [PATCH] OSD线程任务调整 --- ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 72 ++++++++++++++++++++++++++++++++--- 1 files changed, 65 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 9e7d512..e968d6d 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,11 +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; @@ -24,7 +31,7 @@ * @param workOrderList * @return */ - Boolean innerAdd(List<WorkOrder> workOrderList); + Boolean innerAddWorkOrder(List<WorkOrder> workOrderList); /** * 娣诲姞 @@ -125,17 +132,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); /** * 鎵归噺涓嬪彂 @@ -159,10 +166,61 @@ Map<String, Object> home(HomeQuery monitorQuery); /** - * 澶у睆宸ュ崟 + * 澶у睆宸ュ崟鏁版嵁 * @param dashboardQuery 鏌ヨ鏉′欢 * @return 鏁版嵁 */ - Map<String, Object> dashboard(DashboardQuery dashboardQuery); + WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery); + /** + * 澶у睆宸ュ崟鍦板尯 + * @param dashboardQuery 鏌ヨ鏉′欢 + * @return 鏁版嵁 + */ + 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); + + /** + * 宸ュ崟璇︽儏 + * + * @param workOrderNo + * @return + */ + Result detailByNo(String workOrderNo); } -- Gitblit v1.8.0