From b6b66097764363f8bb5a27f30507e194a80da497 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 11:50:43 +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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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..5f296d8 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,11 +1,17 @@
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 io.swagger.annotations.ApiOperation;
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>
@@ -19,11 +25,37 @@
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
+ private BigStorageCageServiceImpl bigStorageCageServiceImpl;
+ private BigStorageCageDetailsServiceImpl bigStorageCageDetailsServiceImpl;
+
+ //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
@ApiOperation("娴嬭瘯")
@GetMapping("/index")
public String index() {
return "hello world";
}
-}
+ @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();
+ }
+
+ @ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
+ @GetMapping("/FinishTask")
+ public void FinishTask(int type, int id) {
+ // bigStorageCageDetailsService.FinishTask();
+ }
+}
--
Gitblit v1.8.0