From 712f4736e41497c273756959a35a85950e42fba1 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期二, 02 七月 2024 10:06:22 +0800 Subject: [PATCH] 对接生成出片任务 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 43 insertions(+), 8 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 4a6a297..e7feaef 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 @@ -1,5 +1,6 @@ package com.mes.downstorage.controller; +import com.mes.downstorage.entity.DownStorageCage; import com.mes.downstorage.entity.DownStorageCageDetails; import com.mes.downstorage.service.DownStorageCageDetailsService; import com.mes.downstorage.service.DownStorageCageService; @@ -11,16 +12,16 @@ import java.util.List; import java.util.Map; -@Api(tags = "缂撳瓨") +@Api(description = "缂撳瓨") @RestController -@RequestMapping("/api/unLoadGlass/downstorage") +@RequestMapping("/downStorage") public class DownStorageCageDetailsController { @Autowired private DownStorageCageDetailsService downStorageCageDetailsService; @Autowired private DownStorageCageService downStorageCageService; - + @ApiOperation("娣诲姞鐜荤拑") @PostMapping("/add") public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) { downStorageCageDetailsService.addDownStorageCageDetails(details); @@ -30,19 +31,53 @@ //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 - @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏") + @ApiOperation("鏌ヨ缂撳瓨鐞嗙墖绗煎唴璇︽儏") @GetMapping("/selectStorageCage") @ResponseBody - public Result selectEdgStorageCage () { - List<Map> list=downStorageCageService.getCacheInfo(); + public Result selectDownStorageCage () { + List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages(); return Result.build(200,"鎴愬姛",list); + } + + +// +// @ApiOperation("娣诲姞缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(DownStorageCageDetails downStorageCageDetails)") +// @PostMapping("/insertEdgStorageCage") +// @ResponseBody +// public Result insertEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) { +// boolean isSucess=downStorageCageService.updatedownStorageCageDetails(downStorageCageDetails); +// return Result.build(200,"娣诲姞鎴愬姛",1); +// } + + + + @ApiOperation("淇敼缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�") + @PostMapping("/updateDownStorageCage") + @ResponseBody + public Result updateDownStorageCage(@RequestBody DownStorageCage downStorageCage) { + boolean isSucess=downStorageCageService.updateDownStorageCage(downStorageCage); + return Result.build(200,"鏇存崲鎴愬姛",isSucess); + } + @ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��") + @PostMapping("/deleteDownStorageCage") + @ResponseBody + public Result deleteDownStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails,int downStorageCageId) { + boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails); + return Result.build(200,"鍒犻櫎鎴愬姛",1); } -// + @ApiOperation("淇敼鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ") + @PostMapping("/ReportStatus") + @ResponseBody + public Result edgReportStatus(@RequestBody Map<String, String> arguments) { + String downStorageCageDetailsId=arguments.get("glassId"); + int controlsId=Integer.valueOf(arguments.get("controlsId")); + boolean isSucess=downStorageCageDetailsService.identWorn(downStorageCageDetailsId,controlsId); + return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1); + } - // Other CRUD operations can be defined here } -- Gitblit v1.8.0