From 4725595ed0d3684bde0efbe45889482b46bc6fb0 Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期一, 22 四月 2024 16:38:26 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java index 5e3bed7..defc8cb 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java @@ -1,11 +1,13 @@ package com.mes.edgstoragecage.controller; import com.mes.edgstoragecage.entity.EdgStorageCage; +import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageService; import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl; import com.mes.taskcache.entity.TaskCache; import com.mes.taskcache.service.impl.TaskCacheServiceImpl; 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.*; @@ -23,41 +25,40 @@ * @author zhoush * @since 2024-04-07 */ +@Api(tags = "鐞嗙墖绗肩紦瀛�") @RestController @RequestMapping("/edgStorageCage") public class EdgStorageCageController { @Autowired - private EdgStorageCageServiceImpl edgStorageCageServiceImpl; + private EdgStorageCageService edgStorageCageService; - - //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 + @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()") @PostMapping("/selectEdgStorageCage") @ResponseBody public Result selectEdgStorageCage () { - List<Map> list=edgStorageCageServiceImpl.selectEdgStorageCages(); + List<Map> list=edgStorageCageService.selectEdgStorageCages(); return Result.build(200,"鎴愬姛",list); } - //娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� + @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(EdgStorageCage edgStorageCage)") @PostMapping("/insertEdgStorageCage") @ResponseBody public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { - boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage); + boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); return Result.build(200,"娣诲姞鎴愬姛",1); } - //淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭� + @ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�") @PostMapping("/updateEdgStorageCage") @ResponseBody public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { - boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage); + boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); return Result.build(200,"鏇存崲鎴愬姛",1); } - - //鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ�� + @ApiOperation("鍒犻櫎纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��") @PostMapping("/deleteEdgStorageCage") @ResponseBody - public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { - boolean isSucess=edgStorageCageServiceImpl.updateEdgStorageCage(edgStorageCage); + public Result deleteEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage, EdgStorageCageDetails edgStorageCageDetails) { + boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); return Result.build(200,"鍒犻櫎鎴愬姛",1); } -- Gitblit v1.8.0