From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 f89f3ee..5737bd6 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;
@@ -33,32 +34,35 @@
@ApiOperation("鏌ヨ缂撳瓨鐞嗙墖绗煎唴璇︽儏")
@GetMapping("/selectStorageCage")
@ResponseBody
- public Result selectEdgStorageCage () {
- List<Map> list=downStorageCageDetailsService.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("娣诲姞缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(DownStorageCageDetails downStorageCageDetails)")
- @PostMapping("/insertEdgStorageCage")
- @ResponseBody
- public Result insertEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
- boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
- return Result.build(200,"娣诲姞鎴愬姛",1);
- }
+
+
@ApiOperation("淇敼缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�")
- @PostMapping("/updateEdgStorageCage")
+ @PostMapping("/updateDownStorageCage")
@ResponseBody
- public Result updateEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
- boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
+ public Result updateDownStorageCage(@RequestBody DownStorageCage downStorageCage) {
+ boolean isSucess=downStorageCageService.updateDownStorageCage(downStorageCage);
return Result.build(200,"鏇存崲鎴愬姛",1);
}
@ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
- @PostMapping("/deleteEdgStorageCage")
+ @PostMapping("/deleteDownStorageCage")
@ResponseBody
- public Result deleteEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
- boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
+ public Result deleteDownStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails,int downStorageCageId) {
+ boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
--
Gitblit v1.8.0