From fcb8b8cc392b146aa11bbaab9e497f7f13f29d44 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 26 五月 2025 11:38:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
index fbbf163..47fc151 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.entity.request.TaskHistoryRequest;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
@@ -36,5 +39,17 @@
return Result.success(edgStorageDeviceTaskHistoryService.queryEdgStorageDeviceTaskHistory(request));
}
+ @ApiOperation(value = "鏌ヨ鏈潯绾垮巻鍙叉寚瀹氭棩鏈熺殑鏃ョ敓浜ф暟鎹�", notes = "鏌ヨ鏈潯绾垮巻鍙叉寚瀹氭棩鏈熺殑鏃ョ敓浜ф暟鎹�")
+ @PostMapping("/queryEdgDailyProduction")
+ public Result<DailyProductionVO> queryEdgDailyProduction(@RequestBody TaskHistoryRequest request) {
+ return Result.success(edgStorageDeviceTaskHistoryService.queryEdgDailyProduction(request));
+ }
+
+ @ApiOperation(value = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�", notes = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�")
+ @GetMapping("/queryRunTimes")
+ public Result<List<RunTime>> queryRunTimes(String days) {
+ return Result.success(edgStorageDeviceTaskHistoryService.queryRunTimes(days));
+ }
+
}
--
Gitblit v1.8.0