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/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
index 36aa0c8..c0b1e98 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
@@ -5,15 +5,15 @@
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
import com.mes.opctask.service.LoadGlassDeviceTaskHistoryService;
-import com.mes.pp.service.OptimizeProjectService;
-import com.mes.uppattenusage.entity.UpPattenUsage;
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.*;
-import java.util.List;
+import javax.annotation.Resource;
/**
* <p>
@@ -30,10 +30,24 @@
@Autowired
private LoadGlassDeviceTaskHistoryService loadGlassDeviceTaskHistoryService;
+ // 鍥介檯璇█搴�
+ @Resource
+ private MessageSource messageSource;
+
@ApiOperation("鎸夌収鏌ヨ鏉′欢鏌ヨ涓婄墖鍘嗗彶浠诲姟")
@PostMapping("/queryLoadGlassHistoryTask") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
public Result<Page<LoadGlassDeviceTaskHistory>> queryBigStorageCageHistoryTask(@RequestBody @Validated LoadGlassDeviceTaskHistoryRequest request) {
- return Result.build(200, "鏌ヨ鎴愬姛", loadGlassDeviceTaskHistoryService.queryLoadGlassHistoryTask(request));
+ Page<LoadGlassDeviceTaskHistory> result = loadGlassDeviceTaskHistoryService.queryLoadGlassHistoryTask(request);
+ if (result != null) {
+ String successMsg = messageSource.getMessage(
+ "rawglass.query.success",
+ null,
+ LocaleContextHolder.getLocale()
+ );
+ return Result.build(200, successMsg, result);
+ }else {
+ return Result.build(500, "fail", result);
+ }
}
}
--
Gitblit v1.8.0