From e0699feb382ad3c01040f135f53698ac5c6ec84e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 10:42:24 +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 | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 c316ad9..0b24e21 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
@@ -2,18 +2,22 @@
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.downstorage.service.DownStorageCageService;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
-
+@Api(tags = "缂撳瓨")
@RestController
@RequestMapping("/api/unLoadGlass/downstorage")
public class DownStorageCageDetailsController {
@Autowired
private DownStorageCageDetailsService downStorageCageDetailsService;
+ @Autowired
+ private DownStorageCageService downStorageCageService;
@PostMapping("/add")
public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
@@ -22,9 +26,20 @@
}
@GetMapping("/leisure")
- public List<Map<String, Object>> getLeisureData() {
- return downStorageCageDetailsService.selectCacheLeisure();
+ public List<Map> getLeisureData() {
+ return downStorageCageService.getCacheInfo();
}
+
+ 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