From 1bd93d6d748edfda1b95b692f7d4ce4f38363e32 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期五, 19 四月 2024 13:31:59 +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 | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 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 e7b0344..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 @@ -2,18 +2,24 @@ 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.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; +@Api(tags = "缂撳瓨") @RestController -@RequestMapping("/down-storage-cage-details") +@RequestMapping("/api/unLoadGlass/downstorage") public class DownStorageCageDetailsController { @Autowired private DownStorageCageDetailsService downStorageCageDetailsService; + @Autowired + private DownStorageCageService downStorageCageService; @PostMapping("/add") public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) { @@ -21,5 +27,22 @@ return "Details added successfully"; } + + + //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 + @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏") + @GetMapping("/selectStorageCage") + @ResponseBody + public Result selectEdgStorageCage () { + List<Map> list=downStorageCageService.getCacheInfo(); + return Result.build(200,"鎴愬姛",list); + } + + + + +// + + // Other CRUD operations can be defined here } -- Gitblit v1.8.0