From b01723592cc0e6a9702dea57fb176a465c5ee45c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 23 十月 2025 13:18:34 +0800
Subject: [PATCH] 仓储设备图色块修改，element组件国际化语言添加
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index bf20572..57cd55d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -16,9 +16,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -44,6 +47,9 @@
@Autowired
DamageService damageService;
+ // 鍥介檯璇█搴�
+ @Resource
+ private MessageSource messageSource;
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@@ -62,12 +68,12 @@
@PostMapping("/pause") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
- boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
+ boolean work = engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
// List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
if(work){
- return Result.build(200, "鎴愬姛", null);
+ return Result.build(200, "success", null);
}else {
- return Result.build(100, "澶辨晽", null);
+ return Result.build(500, "fail", null);
}
}
--
Gitblit v1.8.0