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/DeviceGroupConfig.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupConfig.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupConfig.java
new file mode 100644
index 0000000..a7641bc
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupConfig.java
@@ -0,0 +1,101 @@
+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_group_config
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("device_group_config")
+@Schema(name = "DeviceGroupConfig", description = "璁惧缁勯厤缃俊鎭�")
+public class DeviceGroupConfig {
+
+ @Schema(description = "璁惧缁処D", example = "1")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @Schema(description = "璁惧缁勫悕绉�", example = "鐢熶骇绾緼")
+ @TableField("group_name")
+ private String groupName;
+
+ @Schema(description = "璁惧缁勭紪鍙�", example = "GROUP_001")
+ @TableField("group_code")
+ private String groupCode;
+
+ @Schema(description = "璁惧缁勭被鍨嬶細1-鐢熶骇绾匡紝2-娴嬭瘯绾匡紝3-杈呭姪璁惧缁�", example = "1")
+ @TableField("group_type")
+ private Integer groupType;
+
+ @Schema(description = "鎵�灞為」鐩甀D", example = "1")
+ @TableField("project_id")
+ private Long projectId;
+
+ @Schema(description = "璁惧缁勭姸鎬侊細0-鍋滅敤锛�1-鍚敤锛�3-缁存姢涓�", example = "1")
+ @TableField("status")
+ private Integer status;
+
+ @Schema(description = "鏈�澶у苟鍙戣澶囨暟", example = "3")
+ @TableField("max_concurrent_devices")
+ private Integer maxConcurrentDevices;
+
+ @Schema(description = "蹇冭烦妫�娴嬮棿闅�(绉�)", example = "30")
+ @TableField("heartbeat_interval")
+ private Integer heartbeatInterval;
+
+ @Schema(description = "閫氫俊瓒呮椂鏃堕棿(姣)", example = "5000")
+ @TableField("communication_timeout")
+ private Integer communicationTimeout;
+
+ @Schema(description = "璁惧缁勬弿杩�", example = "鐢熶骇绾緼璁惧缁�")
+ @TableField("description")
+ private String description;
+
+ @Schema(description = "鎵╁睍閰嶇疆JSON", example = "{\"retryTimes\": 3, \"batchSize\": 100}")
+ @TableField("extra_config")
+ private String extraConfig;
+
+ @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 GroupType {
+ public static final int PRODUCTION_LINE = 1; // 鐢熶骇绾�
+ public static final int TEST_LINE = 2; // 娴嬭瘯绾�
+ public static final int AUXILIARY_GROUP = 3; // 杈呭姪璁惧缁�
+ }
+
+ // 璁惧缁勭姸鎬佹灇涓�
+ public static final class Status {
+ public static final int DISABLED = 0; // 鍋滅敤
+ public static final int ENABLED = 1; // 鍚敤
+ public static final int MAINTENANCE = 2; // 缁存姢涓�
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0