From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 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 25bac7b..6980cfb 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,13 +1,10 @@
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.Api;
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;
@@ -15,13 +12,13 @@
/**
* <p>
- * 澶х悊鐗囩淇℃伅
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
-@ApiModel("澶х悊鐗囩淇℃伅")
+@Api(description = "鐞嗙墖绗间俊鎭�")
@RestController
@RequestMapping("/bigStorageCage")
public class BigStorageCageController {
@@ -29,20 +26,11 @@
@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("鐞嗙墖绗煎惎鐢ㄧ鐢�")
+ @GetMapping("/updateStorageCageDisabled")
+ public Result updateStorageCageDisabled(int slot,int enableState) {
+ bigStorageCageService.updateStorageCageDisabled(slot,enableState);
+ return Result.build(200,"鍚敤/绂佺敤鎴愬姛",1);
}
- @ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
- @PostMapping("/finishTask")
- public Result<String> finishTask(int type, int id) {
- // bigStorageCageDetailsService.FinishTask();
- return Result.success("success");
- }
}
--
Gitblit v1.8.0