From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 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 c4c802d..a28f44b 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,26 +1,23 @@ package com.mes.edgstoragecage.controller; +import com.mes.edgglasstask.entity.request.IdentWornRequest; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; 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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.awt.image.ImageProducer; -import java.util.HashMap; import java.util.List; import java.util.Map; /** * <p> - * 鍓嶇鎺у埗鍣� + * 鍓嶇鎺у埗鍣� * </p> * * @author zhoush @@ -40,41 +37,33 @@ @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()") @PostMapping("/selectEdgStorageCage") @ResponseBody - public Result selectEdgStorageCage () { - List<Map<String, Object>> list=edgStorageCageService.selectEdgStorageCages(); - return Result.build(200,"鎴愬姛",list); + public Result selectEdgStorageCage() { + List<Map<String, Object>> list = edgStorageCageService.selectEdgStorageCages(); + return Result.build(200, "鎴愬姛", list); } -// @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(EdgStorageCage edgStorageCage)") -// @PostMapping("/insertEdgStorageCage") -// @ResponseBody -// public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { -// boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); -// return Result.build(200,"娣诲姞鎴愬姛",1); -// } + @ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�") @PostMapping("/updateEdgStorageCage") @ResponseBody public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) { - boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage); - return Result.build(200,"銆愬惎鐢�/绂佺敤銆戞垚鍔�",1); + String isSucess = edgStorageCageService.updateEdgStorageCage(edgStorageCage) ? "鎴愬姛" : "澶辫触"; + return Result.build(200, "銆愬惎鐢�/绂佺敤銆�" + isSucess, 1); } @ApiOperation("纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄�/鏇存崲/缁戝畾銆� EdgStorageCage鏍煎瓙淇℃伅,EdgStorageCageDetails 鐜荤拑淇℃伅 ") @PostMapping("/edgStorageCageGlass") @ResponseBody - public Result edgStorageCageGlass(@RequestBody EdgStorageCageDetails edgStorageCageDetails,int edgStorageCageId) { - boolean isSucess=edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId,edgStorageCageDetails); - return Result.build(200,"銆愭竻闄�/鏇存崲/缁戝畾銆戞垚鍔�",1); + public Result edgStorageCageGlass(@RequestBody EdgStorageCageDetails edgStorageCageDetails, int edgStorageCageId) { + + String isSucess = edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId, edgStorageCageDetails) ? "鎴愬姛" : "澶辫触"; + return Result.build(200, "銆愭竻闄�/鏇存崲/缁戝畾銆�" + isSucess, 1); } @ApiOperation("纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ") @PostMapping("/edgReportStatus") @ResponseBody - public Result edgReportStatus(@RequestBody Map<String, String> arguments) { - String edgStorageCageDetailsId=arguments.get("glassId"); - int controlsId=Integer.valueOf(arguments.get("controlsId")); - boolean isSucess=edgStorageCageDetailsService.identWorn(edgStorageCageDetailsId,controlsId); - return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1); + public Result edgReportStatus(@RequestBody @Validated IdentWornRequest request) { + return Result.build(200, "銆愮牬鎹�/鎷胯蛋銆�" + edgStorageCageDetailsService.edgReportStatus(request), 1); } } -- Gitblit v1.8.0