From 439139cf650de7ccb0c91b2ffbda08e2273bc7b5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:45:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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..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,7 +4,10 @@
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;
import com.ycl.system.Result;
import java.util.List;
@@ -19,12 +22,13 @@
public interface WorkOrderService extends IService<WorkOrder> {
/**
- * 绯荤粺鍐呴儴鐨勬坊鍔�
+ * 绯荤粺鍐呴儴鐨勬坊鍔狅紝涓嬪彂
*
* @param workOrderList
* @return
*/
- Boolean innerAdd(List<WorkOrder> workOrderList);
+ Boolean innerAddWorkOrder(List<WorkOrder> workOrderList);
+
/**
* 娣诲姞
@@ -159,10 +163,42 @@
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 璁惧閫氶亾缂栧彿
+ * @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