From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 01 四月 2025 09:14:19 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java index 39fb4b2..3355e67 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java @@ -26,7 +26,7 @@ @Resource private EdgStorageDeviceTaskService edgStorageDeviceTaskService; - @ApiOperation(value = "閲嶇疆浠诲姟锛氭寜鐓ц澶噄d閲嶇疆浠诲姟") + @ApiOperation(value = "閲嶇疆浠诲姟/浠诲姟澶辫触澶勭悊锛氭寜鐓ц澶噄d閲嶇疆浠诲姟") @PostMapping("/resetTask") public Result<Boolean> resetTask(Integer deviceId) { Boolean flag = edgStorageDeviceTaskService.resetTask(deviceId); @@ -36,4 +36,10 @@ return Result.build(200, "鏃犱换鍔★紝鏃犻渶閲嶇疆", flag); } } + + @ApiOperation("浠诲姟鎴愬姛澶勭悊") + @PostMapping("/taskSuccess") + public Result<Boolean> taskSuccess(Integer deviceId) { + return Result.build(200, "澶勭悊鎴愬姛", edgStorageDeviceTaskService.taskSuccess(deviceId)); + } } -- Gitblit v1.8.0