From 0717a39b88cb5461b62f06dc0a89183e6856fea8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 四月 2024 10:50:54 +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 | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 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 5f296d8..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,61 +1,48 @@
package com.mes.bigstorage.controller;
-
import com.mes.bigstorage.entity.BigStorageCage;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.impl.BigStorageCageDetailsServiceImpl;
-import com.mes.bigstorage.service.impl.BigStorageCageServiceImpl;
+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 {
- private BigStorageCageServiceImpl bigStorageCageServiceImpl;
- private BigStorageCageDetailsServiceImpl bigStorageCageDetailsServiceImpl;
+ @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> BigStorageCage() {
- return bigStorageCageServiceImpl.list();
- }
-
- @ApiOperation("鐞嗙墖绗艰鎯�")
- @GetMapping("/BigStorageCageDetails")
- public List<BigStorageCageDetails> BigStorageCageDetails() {
- return bigStorageCageDetailsServiceImpl.list();
- }
-
- @ApiOperation("灏忚溅瀹炴椂浣嶇疆")
- @GetMapping("/CarPosition")
- public List<Integer> CarPosition() {
- return bigStorageCageDetailsServiceImpl.GetCarposition();
+ @GetMapping("/bigStorageCage")
+ public Result<List<BigStorageCage>> querybigStorageCageDetail() {
+ return Result.success(bigStorageCageService.querybigStorageCageDetail());
}
@ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
- @GetMapping("/FinishTask")
- public void FinishTask(int type, int id) {
+ @PostMapping("/finishTask")
+ public Result<String> finishTask(int type, int id) {
// bigStorageCageDetailsService.FinishTask();
+ return Result.success("success");
}
}
--
Gitblit v1.8.0