From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 5418041..ef317bf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -2,6 +2,7 @@
import com.mes.bigstorage.entity.BigStorageCage;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -9,11 +10,7 @@
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;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -25,25 +22,28 @@
* @author zhoush
* @since 2024-03-27
*/
-@Api(description = "閽㈠寲灏忕墖琛ㄤ俊鎭�")
+@Api(tags = "閽㈠寲灏忕墖琛ㄤ俊鎭�")
@RestController
@RequestMapping("/temperingGlassInfo")
public class TemperingGlassInfoController {
@Autowired
private TemperingGlassInfoService temperingGlassInfoService;
+ @Autowired
+ private BigStorageCageDetailsService bigStorageCageDetailsService;
- @ApiOperation("閽㈠寲灏忕墖淇℃伅")
- @GetMapping("/queryTemperingGlassInfo")
- public Result queryTemperingGlassInfo() {
- return Result.build(200,"鏌ヨ鎴愬姛",temperingGlassInfoService.list());
+ @ApiOperation("鍑虹墖浠诲姟鍒犻櫎")
+ @PostMapping("/deleteTemperingGlassInfo")
+ public Result deleteTemperingGlassInfo(@RequestBody TemperingGlassInfo temperingGlassInfo) {
+ temperingGlassInfoService.removeById(temperingGlassInfo.getId());
+ return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
- @ApiOperation("鎵嬪姩娣诲姞鍑虹墖浠诲姟")
- @PostMapping("/insertTemperingGlassInfo")
- public Result insertBigStorageCageDetail(TemperingGlassInfo temperingGlassInfo) {
- temperingGlassInfoService.save(temperingGlassInfo);
- return Result.build(200,"娣诲姞鎴愬姛",1);
+ @ApiOperation("鍑虹墖浠诲姟鐮存崯0/鎷胯蛋1")
+ @PostMapping("/damageTemperingGlassInfo")
+ public Result damageTemperingGlassInfo(@RequestBody TemperingGlassInfo temperingGlassInfo,int status) {
+ bigStorageCageDetailsService.damageBigStorageCageDetails(temperingGlassInfo.getGlassId(),status);
+ return Result.build(200,"鐮存崯鎴愬姛",1);
}
}
--
Gitblit v1.8.0