From 22e17b6db03ca58bc477a35ca067e55a09cffce7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 10 十二月 2025 17:04:08 +0800
Subject: [PATCH] 添加工程表及相关逻辑，防止重复导入Excel表序号重复生成
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionLogic.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionLogic.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionLogic.java
index a16a4fa..f029282 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionLogic.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionLogic.java
@@ -2,7 +2,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,88 +16,88 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("device_interaction_logic")
-@Schema(name = "DeviceInteractionLogic", description = "璁惧浜や簰閫昏緫閰嶇疆")
+@ApiModel(value = "DeviceInteractionLogic", description = "璁惧浜や簰閫昏緫閰嶇疆")
public class DeviceInteractionLogic {
- @Schema(description = "閫昏緫ID", example = "1")
+ @ApiModelProperty(value = "閫昏緫ID", example = "1")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "閫昏緫鍚嶇О", example = "澶ц溅鑷姩鍖栨祴璇曢�昏緫")
+ @ApiModelProperty(value = "閫昏緫鍚嶇О", example = "澶ц溅鑷姩鍖栨祴璇曢�昏緫")
@TableField("logic_name")
private String logicName;
- @Schema(description = "閫昏緫缂栧彿", example = "TRUCK_AUTO_TEST_001")
+ @ApiModelProperty(value = "閫昏緫缂栧彿", example = "TRUCK_AUTO_TEST_001")
@TableField("logic_code")
private String logicCode;
- @Schema(description = "鎵�灞炴ā鍧楋細1-涓婂ぇ杞︼紝2-涓嬪ぇ杞︼紝3-杞繍锛�4-娴嬭瘯", example = "1")
+ @ApiModelProperty(value = "鎵�灞炴ā鍧楋細1-涓婂ぇ杞︼紝2-涓嬪ぇ杞︼紝3-杞繍锛�4-娴嬭瘯", example = "1")
@TableField("module_type")
private Integer moduleType;
- @Schema(description = "鎵�灞炶澶囩粍ID", example = "1")
+ @ApiModelProperty(value = "鎵�灞炶澶囩粍ID", example = "1")
@TableField("group_id")
private Long groupId;
- @Schema(description = "閫昏緫绫诲瀷锛�1-椤哄簭鎵ц锛�2-骞惰鎵ц锛�3-鏉′欢鎵ц锛�4-寰幆鎵ц", example = "1")
+ @ApiModelProperty(value = "閫昏緫绫诲瀷锛�1-椤哄簭鎵ц锛�2-骞惰鎵ц锛�3-鏉′欢鎵ц锛�4-寰幆鎵ц", example = "1")
@TableField("logic_type")
private Integer logicType;
- @Schema(description = "閫昏緫鐘舵�侊細0-绂佺敤锛�1-鍚敤锛�3-璋冭瘯涓�", example = "1")
+ @ApiModelProperty(value = "閫昏緫鐘舵�侊細0-绂佺敤锛�1-鍚敤锛�3-璋冭瘯涓�", example = "1")
@TableField("status")
private Integer status;
- @Schema(description = "璁惧缁勫唴璇ラ�昏緫鐨勪紭鍏堢骇锛�1-鏈�楂橈紝10-鏈�浣�", example = "1")
+ @ApiModelProperty(value = "璁惧缁勫唴璇ラ�昏緫鐨勪紭鍏堢骇锛�1-鏈�楂橈紝10-鏈�浣�", example = "1")
@TableField("priority")
private Integer priority;
- @Schema(description = "鎵ц瓒呮椂鏃堕棿(姣)", example = "30000")
+ @ApiModelProperty(value = "鎵ц瓒呮椂鏃堕棿(姣)", example = "30000")
@TableField("execution_timeout")
private Integer executionTimeout;
- @Schema(description = "閲嶈瘯娆℃暟", example = "3")
+ @ApiModelProperty(value = "閲嶈瘯娆℃暟", example = "3")
@TableField("retry_times")
private Integer retryTimes;
- @Schema(description = "閫昏緫鎻忚堪", example = "澶ц溅鑷姩鍖栨祴璇曠殑瀹屾暣娴佺▼鎺у埗")
+ @ApiModelProperty(value = "閫昏緫鎻忚堪", example = "澶ц溅鑷姩鍖栨祴璇曠殑瀹屾暣娴佺▼鎺у埗")
@TableField("description")
private String description;
- @Schema(description = "浜や簰姝ラJSON鏁扮粍", example = "[{\"step\": 1, \"deviceId\": 1, \"action\": \"START\", \"params\": {}}]")
+ @ApiModelProperty(value = "浜や簰姝ラJSON鏁扮粍", example = "[{\"step\": 1, \"deviceId\": 1, \"action\": \"START\", \"params\": {}}]")
@TableField("interaction_steps")
private String interactionSteps;
- @Schema(description = "鏉′欢鍒ゆ柇閫昏緫JSON", example = "{\"conditions\": [{\"field\": \"status\", \"operator\": \"eq\", \"value\": 1}]}")
+ @ApiModelProperty(value = "鏉′欢鍒ゆ柇閫昏緫JSON", example = "{\"conditions\": [{\"field\": \"status\", \"operator\": \"eq\", \"value\": 1}]}")
@TableField("condition_logic")
private String conditionLogic;
- @Schema(description = "鎵╁睍鍙傛暟JSON", example = "{\"parallelLimit\": 5, \"errorHandling\": \"retry\"}")
+ @ApiModelProperty(value = "鎵╁睍鍙傛暟JSON", example = "{\"parallelLimit\": 5, \"errorHandling\": \"retry\"}")
@TableField("extra_params")
private String extraParams;
- @Schema(description = "鐗堟湰鍙�", example = "1.0.0")
+ @ApiModelProperty(value = "鐗堟湰鍙�", example = "1.0.0")
@TableField("version")
private String version;
- @Schema(description = "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(value = "created_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdTime;
- @Schema(description = "鏇存柊鏃堕棿")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
- @Schema(description = "鍒涘缓浜�", example = "system")
+ @ApiModelProperty(value = "鍒涘缓浜�", example = "system")
@TableField(value = "created_by", fill = FieldFill.INSERT)
private String createdBy;
- @Schema(description = "鏇存柊浜�", example = "system")
+ @ApiModelProperty(value = "鏇存柊浜�", example = "system")
@TableField(value = "updated_by", fill = FieldFill.INSERT_UPDATE)
private String updatedBy;
- @Schema(description = "鏄惁鍒犻櫎锛�0-鍚︼紝1-鏄�", example = "0")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎锛�0-鍚︼紝1-鏄�", example = "0")
@TableField("is_deleted")
@TableLogic
private Integer isDeleted;
--
Gitblit v1.8.0