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/entity/DeviceInteractionLogic.java | 126 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 0 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
new file mode 100644
index 0000000..a16a4fa
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceInteractionLogic.java
@@ -0,0 +1,126 @@
+package com.mes.device.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 璁惧浜や簰閫昏緫瀹炰綋绫�
+ * 瀵瑰簲鏁版嵁搴撹〃锛歞evice_interaction_logic
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("device_interaction_logic")
+@Schema(name = "DeviceInteractionLogic", description = "璁惧浜や簰閫昏緫閰嶇疆")
+public class DeviceInteractionLogic {
+
+ @Schema(description = "閫昏緫ID", example = "1")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @Schema(description = "閫昏緫鍚嶇О", example = "澶ц溅鑷姩鍖栨祴璇曢�昏緫")
+ @TableField("logic_name")
+ private String logicName;
+
+ @Schema(description = "閫昏緫缂栧彿", example = "TRUCK_AUTO_TEST_001")
+ @TableField("logic_code")
+ private String logicCode;
+
+ @Schema(description = "鎵�灞炴ā鍧楋細1-涓婂ぇ杞︼紝2-涓嬪ぇ杞︼紝3-杞繍锛�4-娴嬭瘯", example = "1")
+ @TableField("module_type")
+ private Integer moduleType;
+
+ @Schema(description = "鎵�灞炶澶囩粍ID", example = "1")
+ @TableField("group_id")
+ private Long groupId;
+
+ @Schema(description = "閫昏緫绫诲瀷锛�1-椤哄簭鎵ц锛�2-骞惰鎵ц锛�3-鏉′欢鎵ц锛�4-寰幆鎵ц", example = "1")
+ @TableField("logic_type")
+ private Integer logicType;
+
+ @Schema(description = "閫昏緫鐘舵�侊細0-绂佺敤锛�1-鍚敤锛�3-璋冭瘯涓�", example = "1")
+ @TableField("status")
+ private Integer status;
+
+ @Schema(description = "璁惧缁勫唴璇ラ�昏緫鐨勪紭鍏堢骇锛�1-鏈�楂橈紝10-鏈�浣�", example = "1")
+ @TableField("priority")
+ private Integer priority;
+
+ @Schema(description = "鎵ц瓒呮椂鏃堕棿(姣)", example = "30000")
+ @TableField("execution_timeout")
+ private Integer executionTimeout;
+
+ @Schema(description = "閲嶈瘯娆℃暟", example = "3")
+ @TableField("retry_times")
+ private Integer retryTimes;
+
+ @Schema(description = "閫昏緫鎻忚堪", example = "澶ц溅鑷姩鍖栨祴璇曠殑瀹屾暣娴佺▼鎺у埗")
+ @TableField("description")
+ private String description;
+
+ @Schema(description = "浜や簰姝ラ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}]}")
+ @TableField("condition_logic")
+ private String conditionLogic;
+
+ @Schema(description = "鎵╁睍鍙傛暟JSON", example = "{\"parallelLimit\": 5, \"errorHandling\": \"retry\"}")
+ @TableField("extra_params")
+ private String extraParams;
+
+ @Schema(description = "鐗堟湰鍙�", example = "1.0.0")
+ @TableField("version")
+ private String version;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ @TableField(value = "created_time", fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createdTime;
+
+ @Schema(description = "鏇存柊鏃堕棿")
+ @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updatedTime;
+
+ @Schema(description = "鍒涘缓浜�", example = "system")
+ @TableField(value = "created_by", fill = FieldFill.INSERT)
+ private String createdBy;
+
+ @Schema(description = "鏇存柊浜�", example = "system")
+ @TableField(value = "updated_by", fill = FieldFill.INSERT_UPDATE)
+ private String updatedBy;
+
+ @Schema(description = "鏄惁鍒犻櫎锛�0-鍚︼紝1-鏄�", example = "0")
+ @TableField("is_deleted")
+ @TableLogic
+ private Integer isDeleted;
+
+ // 妯″潡绫诲瀷鏋氫妇
+ public static final class ModuleType {
+ public static final int LOAD_TRUCK = 1; // 涓婂ぇ杞�
+ public static final int UNLOAD_TRUCK = 2; // 涓嬪ぇ杞�
+ public static final int TRANSFER = 3; // 杞繍
+ public static final int TEST = 4; // 娴嬭瘯
+ }
+
+ // 閫昏緫绫诲瀷鏋氫妇
+ public static final class LogicType {
+ public static final int SEQUENTIAL = 1; // 椤哄簭鎵ц
+ public static final int PARALLEL = 2; // 骞惰鎵ц
+ public static final int CONDITIONAL = 3; // 鏉′欢鎵ц
+ public static final int LOOP = 4; // 寰幆鎵ц
+ }
+
+ // 閫昏緫鐘舵�佹灇涓�
+ public static final class Status {
+ public static final int DISABLED = 0; // 绂佺敤
+ public static final int ENABLED = 1; // 鍚敤
+ public static final int DEBUGGING = 2; // 璋冭瘯涓�
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0