diff --git a/modules/core/src/main/java/com/bytedesk/core/base/BaseExcel.java b/modules/core/src/main/java/com/bytedesk/core/base/BaseExcel.java
index f15f80c398..bef9289c24 100644
--- a/modules/core/src/main/java/com/bytedesk/core/base/BaseExcel.java
+++ b/modules/core/src/main/java/com/bytedesk/core/base/BaseExcel.java
@@ -1,5 +1,35 @@
+/*
+ * @Author: jackning 270580156@qq.com
+ * @Date: 2025-04-10 09:38:52
+ * @LastEditors: jackning 270580156@qq.com
+ * @LastEditTime: 2025-04-30 21:35:33
+ * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
+ * Please be aware of the BSL license restrictions before installing Bytedesk IM –
+ * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
+ * Business Source License 1.1: https://github.com/Bytedesk/bytedesk/blob/main/LICENSE
+ * contact: 270580156@qq.com
+ *
+ * Copyright (c) 2025 by bytedesk.com, All Rights Reserved.
+ */
package com.bytedesk.core.base;
-public abstract class BaseExcel {
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public abstract class BaseExcel implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @ExcelProperty(index = 0, value = "唯一Uid")
+ @ColumnWidth(20)
+ private String uid;
+
}
diff --git a/modules/pom.xml b/modules/pom.xml
index 28ca522927..eeb4e8ee2f 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -317,7 +317,7 @@
com.alibaba
easyexcel
- 4.0.1
+ 4.0.3
provided
diff --git a/modules/service/src/main/java/com/bytedesk/service/queue/QueueExcel.java b/modules/service/src/main/java/com/bytedesk/service/queue/QueueExcel.java
index 8ba86dfa37..c4de030324 100644
--- a/modules/service/src/main/java/com/bytedesk/service/queue/QueueExcel.java
+++ b/modules/service/src/main/java/com/bytedesk/service/queue/QueueExcel.java
@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-08-01 06:18:10
* @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-30 21:09:57
+ * @LastEditTime: 2025-04-30 21:38:31
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -15,13 +15,18 @@ package com.bytedesk.service.queue;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.bytedesk.core.base.BaseExcel;
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+// import lombok.experimental.SuperBuilder;
// https://github.com/alibaba/easyexcel
-// https://easyexcel.opensource.alibaba.com/docs/current/
-@Data
-public class QueueExcel {
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+public class QueueExcel extends BaseExcel {
@ExcelProperty(value = "队列名称")
@ColumnWidth(20)
@@ -44,15 +49,15 @@ public class QueueExcel {
private String status;
@ExcelProperty(value = "今日请求服务人数")
- @ColumnWidth(15)
+ @ColumnWidth(25)
private Integer totalCount;
@ExcelProperty(value = "机器人服务中人次")
- @ColumnWidth(15)
+ @ColumnWidth(25)
private Integer robotingCount;
@ExcelProperty(value = "客服离线人次")
- @ColumnWidth(15)
+ @ColumnWidth(20)
private Integer offlineCount;
@ExcelProperty(value = "留言数")
@@ -68,11 +73,11 @@ public class QueueExcel {
private Integer queuingCount;
@ExcelProperty(value = "正在服务人数")
- @ColumnWidth(15)
+ @ColumnWidth(25)
private Integer chattingCount;
@ExcelProperty(value = "对话结束人数")
- @ColumnWidth(15)
+ @ColumnWidth(25)
private Integer closedCount;
}
diff --git a/modules/service/src/main/java/com/bytedesk/service/queue/QueueRestService.java b/modules/service/src/main/java/com/bytedesk/service/queue/QueueRestService.java
index a9de57f850..5097b43570 100644
--- a/modules/service/src/main/java/com/bytedesk/service/queue/QueueRestService.java
+++ b/modules/service/src/main/java/com/bytedesk/service/queue/QueueRestService.java
@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-03-22 23:03:55
* @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2025-04-30 21:03:47
+ * @LastEditTime: 2025-04-30 21:33:55
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -164,7 +164,9 @@ public class QueueRestService extends BaseRestServiceWithExcel