From 78d73df2f8e0c6855d65eb1f2c6df08e0f99bab1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 22 十月 2025 12:45:05 +0800
Subject: [PATCH] 仓储后端接口返回信息国际化处理
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 86 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
index 3723ff4..1021977 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -6,12 +6,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;
/**
@@ -27,44 +30,103 @@
@Autowired
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
- @ApiOperation("鍏ュ簱璇锋眰")
+ // 鍥介檯璇█搴�
+ @Resource
+ private MessageSource messageSource;
+
+ @ApiOperation("鍚婅浣嶈姹�")
@PostMapping("/warehousingRequest")
public Result<String> warehousingRequest(int leftingStation) {
- return Result.build(
- 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
+ String result = rawGlassStorageDetailsService.warehousingRequest(leftingStation);
+ if ("success".equals(result)) {
+ // 鎴愬姛娑堟伅锛氫粠璧勬簮鏂囦欢璇诲彇鍥介檯鍖栨枃鏈�
+ String successMsg = messageSource.getMessage(
+ "rawglass.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, null);
+ } else {
+ // 澶辫触娑堟伅宸茶繑鍥炲浗闄呭寲鏂囨湰
+ return Result.build(500, result, null);
+ }
}
@ApiOperation("鍘熺墖鍏ュ簱")
@PostMapping("/patternWarehousing")
public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
- return Result.build(
- 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+ String result = rawGlassStorageDetailsService.patternWarehousing(request);
+ if ("success".equals(result)) {
+ // 鎴愬姛娑堟伅锛氫粠璧勬簮鏂囦欢璇诲彇鍥介檯鍖栨枃鏈�
+ String successMsg = messageSource.getMessage(
+ "rawglass.details.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, null);
+ } else {
+// String errorMsg = messageSource.getMessage(
+// "rawglass.error",
+// null,
+// LocaleContextHolder.getLocale()
+// );
+ return Result.build(500, result, null);
+ }
}
@ApiOperation("鏇存柊鍓╀綑鏁伴噺")
@PostMapping("/updateQuantity")
public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
- return Result.success(rawGlassStorageDetailsService.updateQuantity(request));
+ String successMsg = messageSource.getMessage(
+ "rawglass.modify.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, rawGlassStorageDetailsService.updateQuantity(request));
}
@ApiOperation("鍒犻櫎鍘熺墖")
@PostMapping("/deleteWarehousing")
public Result<Object> deleteWarehousing(Long slot) {
- return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slot));
+ String successMsg = messageSource.getMessage(
+ "rawglass.delete.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, rawGlassStorageDetailsService.deleteWarehousing(slot));
}
- @ApiOperation("鍘熺墖鍑哄簱")
+ @ApiOperation("鍑哄簱")
@PostMapping("/outWarehousing")
public Result<Object> outWarehousing(Long slotId) {
- return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
+ String result = rawGlassStorageDetailsService.outWarehousing(slotId);
+ if ("success".equals(result)) {
+ String successMsg = messageSource.getMessage(
+ "rawglass.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, null);
+ } else {
+ return Result.build(500, result, null);
+ }
}
- @ApiOperation("鍑哄簱璇锋眰")
+ @ApiOperation("鍥炲簱")
@PostMapping("/outWarehousingRequest")
public Result<String> outWarehousingRequest(int leftingStation) {
- return Result.build(
- 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
+ String result = rawGlassStorageDetailsService.outWarehousingRequest(leftingStation);
+ if ("success".equals(result)) {
+ String successMsg = messageSource.getMessage(
+ "rawglass.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, null);
+ } else {
+ return Result.build(500, result, null);
+ }
}
@ApiOperation("鏋跺瓙澶嶄綅")
--
Gitblit v1.8.0