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/DevicePlcController.java | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DevicePlcController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DevicePlcController.java
new file mode 100644
index 0000000..d048db9
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DevicePlcController.java
@@ -0,0 +1,80 @@
+package com.mes.device.controller;
+
+import com.mes.device.request.DevicePlcBatchRequest;
+import com.mes.device.service.DevicePlcOperationService;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 璁惧 PLC 鎿嶄綔鎺у埗鍣�
+ *
+ * @author mes
+ * @since 2025-11-17
+ */
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("device/plc")
+@Tag(name = "璁惧PLC鎿嶄綔", description = "澶氳澶嘝LC鍐欏叆涓庣姸鎬佹煡璇㈡帴鍙�")
+public class DevicePlcController {
+
+ private final DevicePlcOperationService devicePlcOperationService;
+
+ @PostMapping("/requests")
+ @Operation(summary = "鎵归噺瑙﹀彂PLC璇锋眰", description = "瀵规寚瀹氳澶囧彂閫丳LC璇锋眰瀛�")
+ public Result<List<DevicePlcVO.OperationResult>> triggerRequests(
+ @Valid @RequestBody DevicePlcBatchRequest request) {
+ return Result.success(devicePlcOperationService.triggerRequest(request.getDeviceIds()));
+ }
+
+ @PostMapping("/reports")
+ @Operation(summary = "鎵归噺妯℃嫙PLC姹囨姤", description = "瀵规寚瀹氳澶囨ā鎷烶LC浠诲姟瀹屾垚姹囨姤")
+ public Result<List<DevicePlcVO.OperationResult>> triggerReports(
+ @Valid @RequestBody DevicePlcBatchRequest request) {
+ return Result.success(devicePlcOperationService.triggerReport(request.getDeviceIds()));
+ }
+
+ @PostMapping("/resets")
+ @Operation(summary = "鎵归噺閲嶇疆PLC鐘舵��", description = "閲嶇疆鎸囧畾璁惧鍏宠仈PLC鐨勫叧閿瓧娈�")
+ public Result<List<DevicePlcVO.OperationResult>> resetPlc(
+ @Valid @RequestBody DevicePlcBatchRequest request) {
+ return Result.success(devicePlcOperationService.resetDevices(request.getDeviceIds()));
+ }
+
+ @PostMapping("/groups/{groupId}/request")
+ @Operation(summary = "璁惧缁勮Е鍙慞LC璇锋眰", description = "瀵硅澶囩粍鍐呮墍鏈夎澶囧彂閫丳LC璇锋眰瀛�")
+ public Result<List<DevicePlcVO.OperationResult>> triggerGroupRequest(
+ @PathVariable Long groupId) {
+ return Result.success(devicePlcOperationService.triggerRequestByGroup(groupId));
+ }
+
+ @PostMapping("/groups/{groupId}/report")
+ @Operation(summary = "璁惧缁勬ā鎷烶LC姹囨姤", description = "瀵硅澶囩粍鍐呮墍鏈夎澶囨ā鎷熶换鍔″畬鎴愭眹鎶�")
+ public Result<List<DevicePlcVO.OperationResult>> triggerGroupReport(
+ @PathVariable Long groupId) {
+ return Result.success(devicePlcOperationService.triggerReportByGroup(groupId));
+ }
+
+ @GetMapping("/status/{deviceId}")
+ @Operation(summary = "鏌ヨ璁惧PLC鐘舵��", description = "璇诲彇鍗曞彴璁惧鐨凱LC鏁版嵁")
+ public Result<DevicePlcVO.StatusInfo> readStatus(@PathVariable Long deviceId) {
+ return Result.success(devicePlcOperationService.readStatus(deviceId));
+ }
+
+ @GetMapping("/groups/{groupId}/status")
+ @Operation(summary = "鏌ヨ璁惧缁凱LC鐘舵��", description = "璇诲彇璁惧缁勫唴鎵�鏈夎澶囩殑PLC鏁版嵁")
+ public Result<List<DevicePlcVO.StatusInfo>> readGroupStatus(@PathVariable Long groupId) {
+ return Result.success(devicePlcOperationService.readStatusByGroup(groupId));
+ }
+}
+
--
Gitblit v1.8.0