From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改,Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceStatusController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceStatusController.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceStatusController.java
index 88d9613..c47a744 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceStatusController.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceStatusController.java
@@ -34,7 +34,7 @@
@Valid @RequestBody DeviceStatusUpdateRequest request) {
try {
boolean success = deviceStatusService.updateDeviceOnlineStatus(
- request.getDeviceId(),
+ request.getId(),
request.getStatus()
);
if (success) {
@@ -104,7 +104,7 @@
public static class DeviceStatusUpdateRequest {
@NotNull(message = "璁惧ID涓嶈兘涓虹┖")
@ApiParam(value = "璁惧閰嶇疆ID", required = true)
- private Long deviceId;
+ private Long id;
@NotEmpty(message = "璁惧鐘舵�佷笉鑳戒负绌�")
@ApiParam(value = "璁惧鐘舵�侊紙ONLINE/OFFLINE/BUSY/ERROR/MAINTENANCE锛�", required = true)
@@ -131,7 +131,7 @@
@Data
public static class DeviceHeartbeatRequest {
@NotEmpty(message = "璁惧ID涓嶈兘涓虹┖")
- @ApiParam(value = "璁惧ID锛坉evice_config.device_id锛�", required = true)
+ @ApiParam(value = "璁惧ID锛圖eviceConfig.id鐨勫瓧绗︿覆褰㈠紡锛屽搴攄evice_status.device_id锛�", required = true)
private String deviceId;
@ApiParam(value = "璁惧鐘舵�侊紙鍙�夛紝榛樿涓篛NLINE锛�")
--
Gitblit v1.8.0