From 5d70dcef9c9b4f7eb1cd092dcc4f4b8b802c5d30 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 17 四月 2024 10:53:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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 746b3ed..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
@@ -1,29 +1,48 @@
package com.mes.bigstorage.controller;
-
+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;
+
+import java.util.List;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 澶х悊鐗囩淇℃伅
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
+@ApiModel("澶х悊鐗囩淇℃伅")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
+ @Autowired
+ private BigStorageCageService bigStorageCageService;
+
+// public Result<BigStorageCageDetails> feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails){
+//
+// }
+
+ @ApiOperation("鐞嗙墖绗间俊鎭�")
+ @GetMapping("/bigStorageCage")
+ 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