From 8f1ff8eefdaf6c9722541975abd2422772c9ebdd Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 19 七月 2024 15:18:17 +0800 Subject: [PATCH] 添加指定版图钢化的接口 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 16 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..8335a7e 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 @@ -1,15 +1,15 @@ package com.mes.bigstorage.controller; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.service.BigStorageCageDetailsService; +import com.mes.bigstorage.service.BigStorageCageService; 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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * <p> @@ -26,48 +26,71 @@ @Autowired private BigStorageCageDetailsService bigStorageCageDetailsService; + @Autowired + private BigStorageCageService bigStorageCageService; @ApiOperation("鐜荤拑璇︽儏鏌ヨ") @PostMapping("/selectBigStorageCageDetails") - public Result selectBigStorageCageDetails(String glassId) { - BigStorageCageDetails bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(glassId); - return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails); + public Result selectBigStorageCageDetails(@RequestBody Map map) { + List<BigStorageCageDetails> bigStorageCageDetails=bigStorageCageDetailsService.selectBigStorageCageDetails(map.get("glassId").toString()); + if (bigStorageCageDetails.size()>0){ + return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetails); + }else{ + return Result.build(200,"鏌ヨ澶辫触锛屾棤姝ょ幓鐠僫d",bigStorageCageDetails); + } } @ApiOperation("鐞嗙墖绗艰鎯呮坊鍔�") @PostMapping("/insertBigStorageCageDetails") - public Result insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails); - return Result.build(200,"娣诲姞鎴愬姛",1); + return Result.build(200,"娣诲姞鎴愬姛",bigStorageCageService.querybigStorageCageDetail()); } @ApiOperation("鐞嗙墖绗艰鎯呭垹闄�") @PostMapping("/deleteBigStorageCageDetails") - public Result deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) { + public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails); - return Result.build(200,"鍒犻櫎鎴愬姛",1); + return Result.build(200,"鍒犻櫎鎴愬姛",bigStorageCageService.querybigStorageCageDetail()); } @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); + } + + @ApiOperation("鎸囧畾閽㈠寲") + @PostMapping("/TemperingGlass") + public Result TemperingGlass(@RequestBody String temperingLayoutId,@RequestBody String engineerId) { + boolean result=bigStorageCageDetailsService.TemperingGlass(temperingLayoutId,engineerId); + if(result==true){ + return Result.build(200,"鎸囧畾閽㈠寲鎴愬姛",1); + }else { + return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔�", 1); + } + } + + @ApiOperation("閽㈠寲鏌ヨ") + @PostMapping("/selectTemperingGlass") + public Result selectTemperingGlass() { + return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageDetailsService.selectTemperingGlass()); } } -- Gitblit v1.8.0