From 88cbf1a8c50a15f35dd78a50adc43e71a6530775 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 26 五月 2025 16:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java
index 284cce7..a4d8f90 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java
@@ -6,16 +6,15 @@
import com.mes.hollowtask.entity.request.HollowBigStorageCageHistoryRequest;
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* (HollowBigStorageCageHistoryTask)琛ㄦ帶鍒跺眰
@@ -42,5 +41,11 @@
public Result<DailyProductionVO> queryHollowDailyProduction(@RequestBody HollowBigStorageCageHistoryRequest request) {
return Result.success(hollowBigStorageCageHistoryTaskService.queryHollowDailyProduction(request));
}
+
+ @ApiOperation(value = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�", notes = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�")
+ @GetMapping("/queryRunTimes")
+ public Result<List<RunTime>> queryRunTimes(String days) {
+ return Result.success(hollowBigStorageCageHistoryTaskService.queryRunTimes(days));
+ }
}
--
Gitblit v1.8.0