From 2f9b947344a9218390b30dd2d5d141c1f6d319b9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 07 十一月 2025 08:17:41 +0800
Subject: [PATCH] 仓储异常情况断联，任务无法执行，添加clear按钮可手动清除异常状态任务，
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 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 67097d1..a4447a4 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
@@ -8,12 +8,15 @@
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
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 javax.annotation.Resource;
import java.util.List;
/**
@@ -31,6 +34,10 @@
@Autowired
private RawGlassStorageTaskService rawGlassStorageTaskService;
+ // 鍥介檯璇█搴�
+ @Resource
+ private MessageSource messageSource;
+
@ApiOperation("璁剧疆鍘熺墖浠撳偍鏌ヨ鏉′欢")
@PostMapping("/setRawGlassTaskRequest")
public Result setRawGlassTaskRequest(@RequestBody RawGlassTaskRequest request) {
@@ -40,21 +47,46 @@
@ApiOperation("鎸夌収鏉′欢鏌ョ湅浠撳偍鍘嗗彶浠诲姟")
@PostMapping("/queryRawGlassHistoryTask")
public Result<Page<RawGlassStorageTask>> queryRawGlassHistoryTask(@RequestBody @Validated RawGlassTaskRequest request) {
- return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.queryRawGlassHistoryTask(request));
+ String successMsg = messageSource.getMessage(
+ "rawglass.query.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, rawGlassStorageTaskService.queryRawGlassHistoryTask(request));
}
@ApiOperation("浠诲姟鎴愬姛澶勭悊")
@PostMapping("/taskSuccess")
public Result<Boolean> taskSuccess(Long taskId) {
- return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskSuccess(taskId));
+ String successMsg = messageSource.getMessage(
+ "rawglass.modify.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, rawGlassStorageTaskService.taskSuccess(taskId));
}
@ApiOperation("浠诲姟澶辫触澶勭悊")
@PostMapping("/taskError")
public Result<Boolean> taskError(Long taskId) {
- return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskError(taskId));
+ String successMsg = messageSource.getMessage(
+ "rawglass.modify.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, rawGlassStorageTaskService.taskError(taskId));
}
+ @ApiOperation("鏌ヨ鍘熺墖浠撳偍浠诲姟璇︽儏")
+ @PostMapping("/listRawGlassTask")
+ public Result<List<RawGlassStorageTask>> listRawGlassTask() {
+ String successMsg = messageSource.getMessage(
+ "rawglass.query.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, rawGlassStorageTaskService.listRawGlassTask());
+ }
}
--
Gitblit v1.8.0