From cb2b0e73ae2e729126f8d04a06d05e9460517cbc Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 20 五月 2024 14:26:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 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 bea5b42..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,16 +1,20 @@
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;
+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.*;
import java.util.List;
import java.util.Map;
-
+@Api(description = "缂撳瓨")
@RestController
-@RequestMapping("/api/unLoadGlass/downstorage")
+@RequestMapping("/downStorage")
public class DownStorageCageDetailsController {
@Autowired
@@ -24,21 +28,49 @@
return "Details added successfully";
}
- @GetMapping("/leisure")
- public List<Map> getLeisureData() {
- return downStorageCageService.getCacheInfo();
+
+
+ //鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
+ @ApiOperation("鏌ヨ缂撳瓨鐞嗙墖绗煎唴璇︽儏")
+ @GetMapping("/selectStorageCage")
+ @ResponseBody
+ public Result selectDownStorageCage () {
+ List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
+ return Result.build(200,"鎴愬姛",list);
}
- private static final int START_VALUE = 0;
- private static final int END_VALUE = 5;
- @GetMapping("/leisure2")
- public List<Map> getLeisureData2() {
- // 璋冪敤Service灞傝幏鍙栨暟鎹�
- return downStorageCageService.getCacheOut(START_VALUE, END_VALUE);
+//
+// @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,"鏇存崲鎴愬姛",1);
+ }
+ @ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
+ @PostMapping("/deleteDownStorageCage")
+ @ResponseBody
+ public Result deleteDownStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails,int downStorageCageId) {
+ boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
+ return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
+
+//
+
+
// Other CRUD operations can be defined here
}
--
Gitblit v1.8.0