From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index d174f6c..5e56064 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -10,7 +10,6 @@
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.config.Const;
-import com.mes.glassinfo.entity.GlassInfo;
import com.mes.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -106,12 +105,23 @@
@ApiOperation("鎸囧畾閽㈠寲宸ョ▼")
@PostMapping("/appointTemperingEngineerId")
- public Result appointTemperingEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
- boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(bigStorageCageDetails.getEngineerId());
+ public Result appointTemperingEngineerId(String engineerId) {
+ boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(engineerId);
if (result == true) {
return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
} else {
return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+ }
+ }
+
+ @ApiOperation("鍙栨秷褰撳墠閽㈠寲")
+ @PostMapping("/cancelTemperingTask")
+ public Result<Boolean> cancelTemperingTask() {
+ boolean result = bigStorageCageDetailsService.cancelTemperingTask();
+ if (result == true) {
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲鎴愬姛", result);
+ } else {
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲澶辫触", result);
}
}
@@ -126,6 +136,7 @@
public Result<List<BigStorageCageDetails>> queryRealGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryRealGlassInfo(bigStorageQueryVO));
}
+
@ApiOperation("缂虹墖鏁伴噺鏌ヨ")
@PostMapping("/queryLackGlassInfo")
public Result<List<GlassInfoLackDTO>> queryLackGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
@@ -179,10 +190,11 @@
return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1);
}
}
+
@ApiOperation("澶х悊鐗囩鎶ョ牬鎹�")
@PostMapping("/bigStorageGlassDamageByGlassId")
public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) {
- String glassId=map.get("glassId");
+ String glassId = map.get("glassId");
return Result.build(200, "鎶ョ牬鎹熸垚鍔�", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
}
}
--
Gitblit v1.8.0