From 8b7ae914554652266b31f3bb4237106f1b220cc7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:02:11 +0800
Subject: [PATCH] 阿尔及利亚代码逻辑修改，页面布局修改
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
index 331ae9f..29424ab 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
@@ -1,12 +1,14 @@
package com.mes.rawglasstask.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -37,22 +39,27 @@
@ApiOperation("鎸夌収鏉′欢鏌ョ湅浠撳偍鍘嗗彶浠诲姟")
@PostMapping("/queryRawGlassHistoryTask")
- public Result<List<RawGlassStorageTask>> queryRawGlassHistoryTask(@RequestBody RawGlassTaskRequest request) {
+ public Result<Page<RawGlassStorageTask>> queryRawGlassHistoryTask(@RequestBody @Validated RawGlassTaskRequest request) {
return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.queryRawGlassHistoryTask(request));
}
@ApiOperation("浠诲姟鎴愬姛澶勭悊")
@PostMapping("/taskSuccess")
public Result<Boolean> taskSuccess(Long taskId) {
- return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskSuccess(taskId));
+ return Result.build(200, "淇敼鎴愬姛", rawGlassStorageTaskService.taskSuccess(taskId));
}
@ApiOperation("浠诲姟澶辫触澶勭悊")
@PostMapping("/taskError")
public Result<Boolean> taskError(Long taskId) {
- return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskError(taskId));
+ return Result.build(200, "淇敼鎴愬姛", rawGlassStorageTaskService.taskError(taskId));
}
+ @ApiOperation("鏌ヨ鍘熺墖浠撳偍浠诲姟璇︽儏")
+ @PostMapping("/listRawGlassTask")
+ public Result<List<RawGlassStorageTask>> listRawGlassTask() {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.listRawGlassTask());
+ }
}
--
Gitblit v1.8.0