From e76f0739e647fe8a7e0e2618914e2faff554b1b7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 17 十一月 2025 17:33:23 +0800
Subject: [PATCH] 解决冲突
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceInteractionController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceInteractionController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceInteractionController.java
new file mode 100644
index 0000000..b5655ae
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceInteractionController.java
@@ -0,0 +1,33 @@
+package com.mes.device.controller;
+
+import com.mes.device.request.DeviceGlassFeedRequest;
+import com.mes.device.service.DeviceInteractionService;
+import com.mes.device.vo.DevicePlcVO;
+import com.mes.vo.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("device/interaction")
+@Tag(name = "璁惧浜や簰", description = "璁惧浜や簰閫昏緫鎵ц鎺ュ彛")
+@Validated
+@RequiredArgsConstructor
+public class DeviceInteractionController {
+
+ private final DeviceInteractionService deviceInteractionService;
+
+ @PostMapping("/glass-feed")
+ @Operation(summary = "鐜荤拑涓婃枡鍐欏叆")
+ public Result<DevicePlcVO.OperationResult> feedGlass(@Valid @RequestBody DeviceGlassFeedRequest request) {
+ return Result.success(deviceInteractionService.feedGlass(request));
+ }
+}
+
--
Gitblit v1.8.0