From b6c7e996491ab34cc2d772e3ece137de81f2e9f7 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 24 七月 2024 13:21:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java index 88b1494..0678559 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.GetMapping; import java.util.List; +import java.util.Map; +import java.util.Optional; /** * @@ -99,4 +101,14 @@ return Result.success(result); } + + @ApiOperation(value = "浠诲姟鏌ヨ",notes = "浠诲姟鏌ヨ",produces = "application/json") + @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")}) + @GetMapping("/findTasks") + public Result findLatestTasks() { + List<Map<String, Object>> result = storageTaskService.Tasks(); + return Result.success(result); + } + + } \ No newline at end of file -- Gitblit v1.8.0