From 8d58c40af40493bd5f066cbfdb1ffd9f113c22fc Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 03 九月 2025 16:37:21 +0800
Subject: [PATCH] 1.前端推数据使用了最新的webSokect客户现场总是掉线，修改为接口方式 2.设备交互整体增加异常处理以及PLC连接方式改为短连接
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingLogService.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingLogService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingLogService.java
index d0cd50a..106cae1 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingLogService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingLogService.java
@@ -1,9 +1,9 @@
package com.mes.md.service;
import com.github.yulichang.base.MPJBaseService;
-import com.mes.md.entity.TaskLog;
import com.mes.md.entity.TaskingLog;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -21,8 +21,34 @@
* 鏌ヨ瀹屽伐鏁伴噺-鍒嗙嚎璺�
*/
List<Map> selectTaskingLog(int dayCount);
+
+ /**
+ * 鏌ヨ浜ч噺
+ * @param dayCount 澶╂暟
+ * @param startDate 寮�濮嬫棩鏈�
+ * @param endDate 缁撴潫鏃ユ湡
+ * @param taskType 浠诲姟绫诲瀷
+ * @param operationRecord 璁惧
+ * @param lineType 鐢熶骇绾匡紙1锛氫竴绾匡紝2锛氫簩绾匡級
+ * @return 浜ч噺鏁版嵁鍒楄〃
+ */
+ List<Map> selectMechanicalReport(int dayCount, Date startDate, Date endDate, String taskType, String operationRecord, String lineType);
+
/**
* 鍥炰紶鎶ュ伐鏁版嵁+ 璁惧鐜荤拑杩囩墖璁板綍缁� 涔濈墽
*/
Integer reportTaskingLog();
+
+ /**
+ * 鏌ヨ鍗曞皬鏃朵骇閲�
+ * @param dayCount 鏌ヨ澶╂暟
+ */
+ Map<String, Object> findHourlyOutput(int dayCount);
+
+ /**
+ * 鏌ヨ搴撲綅鏁版嵁
+ * @param dayCount 鏌ヨ澶╂暟
+ * @return 搴撲綅鏁版嵁鍒楄〃
+ */
+ List<Map<String, Object>> selectWareHouse(int dayCount);
}
--
Gitblit v1.8.0