From 6dd308df5a1a288f6de850a43c6479d41638083b Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 22 八月 2024 18:51:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 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 a6d00a6..fcaee48 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 @@ -4,6 +4,7 @@ import com.ycl.platform.domain.entity.WorkOrder; 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.screen.WorkOrderRegionVO; import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO; @@ -26,7 +27,7 @@ * @param workOrderList * @return */ - Boolean addWaitDistribute(List<WorkOrder> workOrderList); + Boolean innerAddWorkOrder(List<WorkOrder> workOrderList); /** @@ -175,4 +176,29 @@ */ List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery); + + /** + * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗� + * + * @param deviceId 璁惧鍥芥爣鐮� + * @param channelId 璁惧閫氶亾缂栧彿 + * @return 鏁版嵁 + */ + String getFrameImgByDevice(String deviceId, String channelId); + + /** + * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗� + * + * @return 鏁版嵁 + */ + List<DeviceInfoVO> hasErrorWorkOrderList(); + + /** + * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗� + * + * @param workOrderId 宸ュ崟ID + * @param imgPath 鍥惧儚鍦板潃 + * @return 鏁版嵁 + */ + void updateImgById(Integer workOrderId, String imgPath); } -- Gitblit v1.8.0