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/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 5021252..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
@@ -1,9 +1,45 @@
package com.mes.opctask.controller;
+import com.mes.opctask.service.EdgStorageDeviceTaskService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
/**
* @Author : zhoush
* @Date: 2024/10/24 15:35
* @Description:
*/
+@Api(tags = "鍗у紡鐞嗙墖绗间换鍔�")
+@RestController
+@RequestMapping("edgStorageDeviceTask")
public class EdgStorageDeviceController {
+
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
+ private EdgStorageDeviceTaskService edgStorageDeviceTaskService;
+
+ @ApiOperation(value = "閲嶇疆浠诲姟/浠诲姟澶辫触澶勭悊锛氭寜鐓ц澶噄d閲嶇疆浠诲姟")
+ @PostMapping("/resetTask")
+ public Result<Boolean> resetTask(Integer deviceId) {
+ Boolean flag = edgStorageDeviceTaskService.resetTask(deviceId);
+ if (flag) {
+ return Result.build(200, "閲嶇疆鎴愬姛", flag);
+ } else {
+ 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