From a2068f3779b8172dd66f55d13a2da2ec62c9796a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 15 四月 2024 11:24:04 +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 | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 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 7b778e5..a5a676d 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,21 +1,18 @@
package com.mes.bigstorage.controller;
-
import com.mes.bigstorage.entity.BigStorageCage;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
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.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -25,8 +22,8 @@
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
+ @Autowired
private BigStorageCageService bigStorageCageService;
- private BigStorageCageDetailsService bigStorageCageDetailsService;
//todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
@ApiOperation("娴嬭瘯")
@@ -36,26 +33,14 @@
}
@ApiOperation("鐞嗙墖绗间俊鎭�")
- @GetMapping("/BigStorageCage")
- public List<BigStorageCage> BigStorageCage() {
- return bigStorageCageService.list();
- }
-
- @ApiOperation("鐞嗙墖绗艰鎯�")
- @GetMapping("/BigStorageCageDetails")
- public List<BigStorageCageDetails> BigStorageCageDetails() {
- return bigStorageCageDetailsService.list();
- }
-
- @ApiOperation("灏忚溅瀹炴椂浣嶇疆")
- @GetMapping("/CarPosition")
- public List<Integer> CarPosition() {
- return bigStorageCageDetailsService.getCarposition();
+ @GetMapping("/bigStorageCage")
+ public List<BigStorageCage> querybigStorageCageDetail() {
+ return bigStorageCageService.querybigStorageCageDetail();
}
@ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
- @GetMapping("/FinishTask")
- public void FinishTask(int type, int id) {
+ @GetMapping("/finishTask")
+ public void finishTask(int type, int id) {
// bigStorageCageDetailsService.FinishTask();
}
}
--
Gitblit v1.8.0