From 92b68e97ff48e3e6411cee61439e95e216eb392e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 12:51:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 0b24e21..4a6a297 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -3,7 +3,9 @@
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
+import com.mes.utils.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,21 +27,22 @@
return "Details added successfully";
}
- @GetMapping("/leisure")
- public List<Map> getLeisureData() {
- return downStorageCageService.getCacheInfo();
+
+
+ //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
+ @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏")
+ @GetMapping("/selectStorageCage")
+ @ResponseBody
+ public Result selectEdgStorageCage () {
+ List<Map> list=downStorageCageService.getCacheInfo();
+ return Result.build(200,"鎴愬姛",list);
}
- private static final int START_VALUE = 0;
- private static final int END_VALUE = 5;
- @GetMapping("/leisure2")
- public List<DownStorageCageDetails> getLeisureData2() {
- // 璋冪敤Service灞傝幏鍙栨暟鎹�
- return downStorageCageService.getCacheOut(START_VALUE, END_VALUE);
- }
+//
+
// Other CRUD operations can be defined here
}
--
Gitblit v1.8.0