From 29ea56cf0546726a83da815ee6721090311f5567 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 四月 2024 14:09:37 +0800
Subject: [PATCH] fixbug:代码误删版本回退
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 9595d77..25bac7b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -2,10 +2,12 @@
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.utils.Result;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -13,13 +15,13 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 澶х悊鐗囩淇℃伅
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
-@ApiModel("鐞嗙墖绗间俊鎭�")
+@ApiModel("澶х悊鐗囩淇℃伅")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
@@ -27,17 +29,20 @@
@Autowired
private BigStorageCageService bigStorageCageService;
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
- }
+// public Result<BigStorageCageDetails> feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails){
+//
+// }
@ApiOperation("鐞嗙墖绗间俊鎭�")
@GetMapping("/bigStorageCage")
- public List<BigStorageCage> querybigStorageCageDetail() {
- return bigStorageCageService.querybigStorageCageDetail();
+ public Result<List<BigStorageCage>> querybigStorageCageDetail() {
+ return Result.success(bigStorageCageService.querybigStorageCageDetail());
}
+ @ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
+ @PostMapping("/finishTask")
+ public Result<String> finishTask(int type, int id) {
+ // bigStorageCageDetailsService.FinishTask();
+ return Result.success("success");
+ }
}
--
Gitblit v1.8.0