From eb21b7a8c4800754533e124860fd486a57732fd1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 17 十二月 2024 10:30:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 23 +++++++++++++----------
1 files changed, 13 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 2564546..44e0837 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,7 +1,10 @@
package com.mes.bigstorage.controller;
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
+import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +22,7 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "鐞嗙墖绗间俊鎭�")
+@Api(tags = "鐞嗙墖绗间俊鎭�")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
@@ -27,17 +30,17 @@
@Autowired
private BigStorageCageService bigStorageCageService;
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
+ @ApiOperation("鐞嗙墖绗煎惎鐢ㄧ鐢�")
+ @GetMapping("/updateStorageCageDisabled")
+ public Result updateStorageCageDisabled(int slot, int enableState) {
+ bigStorageCageService.updateStorageCageDisabled(slot, enableState);
+ return Result.build(200, "鍚敤/绂佺敤鎴愬姛", 1);
}
- @ApiOperation("鐞嗙墖绗间俊鎭�")
- @GetMapping("/bigStorageCage")
- public List<BigStorageCage> querybigStorageCageDetail() {
- return bigStorageCageService.querybigStorageCageDetail();
+ @ApiOperation("鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�")
+ @GetMapping("/querybigStorageCageDetail")
+ public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(BigStorageDetailsQueryVO query) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageService.querybigStorageCageDetail(query));
}
}
--
Gitblit v1.8.0