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/DeviceGroupRelation.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java
new file mode 100644
index 0000000..b7dedd3
--- /dev/null
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceGroupRelation.java
@@ -0,0 +1,94 @@
+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_relation
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("device_group_relation")
+@Schema(name = "DeviceGroupRelation", description = "璁惧缁勪笌璁惧鍏宠仈鍏崇郴")
+public class DeviceGroupRelation {
+
+ @Schema(description = "鍏宠仈ID", example = "1")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @Schema(description = "璁惧缁処D", example = "1")
+ @TableField("group_id")
+ private Long groupId;
+
+ @Schema(description = "璁惧ID", example = "1")
+ @TableField("device_id")
+ private Long deviceId;
+
+ @Schema(description = "璁惧鍦ㄧ粍鍐呯殑浼樺厛绾э細1-鏈�楂橈紝10-鏈�浣�", example = "1")
+ @TableField("priority")
+ private Integer priority;
+
+ @Schema(description = "璁惧鍦ㄧ粍鍐呯殑瑙掕壊锛�1-涓绘帶锛�2-鍗忎綔锛�3-鐩戞帶", example = "1")
+ @TableField("role")
+ private Integer role;
+
+ @Schema(description = "璁惧鍦ㄨ缁勪腑鐨勭姸鎬侊細0-鏈厤缃紝1-姝ｅ父锛�2-鏁呴殰锛�3-缁存姢", example = "1")
+ @TableField("status")
+ private Integer status;
+
+ @Schema(description = "杩炴帴椤哄簭锛氭暟鍊艰秺灏忚秺鍏堣繛鎺�", example = "1")
+ @TableField("connection_order")
+ private Integer connectionOrder;
+
+ @Schema(description = "鍏宠仈鎻忚堪", example = "涓绘帶璁惧锛岃礋璐ｆ暣浣撳崗璋�")
+ @TableField("relation_desc")
+ private String relationDesc;
+
+ @Schema(description = "鎵╁睍鍙傛暟JSON", example = "{\"timeout\": 5000, \"retryPolicy\": \"exponential\"}")
+ @TableField("extra_params")
+ private String extraParams;
+
+ @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 Role {
+ public static final int CONTROLLER = 1; // 涓绘帶
+ public static final int COLLABORATOR = 2; // 鍗忎綔
+ public static final int MONITOR = 3; // 鐩戞帶
+ }
+
+ // 鍏宠仈鐘舵�佹灇涓�
+ public static final class Status {
+ public static final int UNCONFIGURED = 0; // 鏈厤缃�
+ public static final int NORMAL = 1; // 姝ｅ父
+ public static final int FAULT = 2; // 鏁呴殰
+ public static final int MAINTENANCE = 3; // 缁存姢
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0