From 04914a9997afbbead6f8adbb9d9c40e05b2edbd1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 17 十二月 2025 17:04:34 +0800
Subject: [PATCH] 修复调用导入工程失败 重复保存；修复分批出片逻辑
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java
index a4099ae..69919ec 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/vo/DevicePlcVO.java
@@ -1,6 +1,7 @@
package com.mes.device.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -25,7 +26,7 @@
@Builder
@NoArgsConstructor
@AllArgsConstructor
- @Schema(name = "DevicePlcOperationResult", description = "PLC 鎿嶄綔缁撴灉")
+ @ApiModel(value = "DevicePlcOperationResult", description = "PLC 鎿嶄綔缁撴灉")
public static class OperationResult implements Serializable {
private Long deviceId;
private String deviceName;
@@ -35,6 +36,7 @@
private Boolean success;
private String message;
private LocalDateTime timestamp;
+ private Map<String, Object> data;
}
/**
@@ -44,13 +46,13 @@
@Builder
@NoArgsConstructor
@AllArgsConstructor
- @Schema(name = "DevicePlcStatus", description = "PLC 鐘舵�佹暟鎹�")
+ @ApiModel(value = "DevicePlcStatus", description = "PLC 鐘舵�佹暟鎹�")
public static class StatusInfo implements Serializable {
private Long deviceId;
private String deviceName;
private String deviceCode;
private String projectId;
- private Map<String, Object> data;
+ private Map<String, Object> fieldValues;
private LocalDateTime timestamp;
}
}
--
Gitblit v1.8.0