From 2aa1ac49e96999cd58d975afdabe98215f91f534 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期一, 01 七月 2024 14:39:13 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java index 0aad429..0fee9b2 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java @@ -5,11 +5,10 @@ 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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * <p> @@ -30,44 +29,46 @@ @ApiOperation("鐜荤拑璇︽儏鏌ヨ") @PostMapping("/selectBigStorageCageDetails") - public Result selectBigStorageCageDetails(String glassId) { - BigStorageCageDetails bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(glassId); + public Result selectBigStorageCageDetails(@RequestBody Map map) { + List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString()); return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails); } @ApiOperation("鐞嗙墖绗艰鎯呮坊鍔�") @PostMapping("/insertBigStorageCageDetails") - public Result insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails); return Result.build(200,"娣诲姞鎴愬姛",1); } @ApiOperation("鐞嗙墖绗艰鎯呭垹闄�") @PostMapping("/deleteBigStorageCageDetails") - public Result deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails); return Result.build(200,"鍒犻櫎鎴愬姛",1); } @ApiOperation("鐞嗙墖绗间换鍔$牬鎹�0/鎷胯蛋1") @PostMapping("/damageBigStorageCageDetails") - public Result damageBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails,int status) { + public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails,int status) { bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(),status); - return Result.build(200,"鐮存崯鎴愬姛",1); + return Result.build(200,"鐮存崯/鎷胯蛋鎴愬姛",1); } @ApiOperation("鐞嗙墖绗间换鍔″畬鎴�") @PostMapping("/finishBigStorageCageDetails") - public Result finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + public Result finishBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.finishBigStorageCageDetails(bigStorageCageDetails); - return Result.build(200,"鐮存崯鎴愬姛",1); + return Result.build(200,"浠诲姟瀹屾垚鎴愬姛",1); } @ApiOperation("鐞嗙墖绗间换鍔″嚭鐗�") @PostMapping("/outBigStorageCageDetails") - public Result outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + public Result outBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { + bigStorageCageDetailsService.outBigStorageCageDetails(bigStorageCageDetails); - return Result.build(200,"鐮存崯鎴愬姛",1); + return Result.build(200,"鍑虹墖娣诲姞鎴愬姛",1); } + } -- Gitblit v1.8.0