From 1f11310ba04770a4efe4657d39872590575828f1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 10 四月 2025 17:17:24 +0800
Subject: [PATCH] 设备未知状态,新增,导出页新增统计一个月的离线数,与在线率

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
index be898c3..c354891 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
@@ -4,10 +4,11 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鐐逛綅瀵煎叆瀵煎嚭
@@ -17,10 +18,9 @@
  */
 @Data
 public class PointExport {
-
+    private Integer id;
     @ColumnWidth(50)
     @ExcelProperty("鐐逛綅鍚嶇О(鍙慨鏀�)")
-
     private String pointName;
 
     @ColumnWidth(30)
@@ -30,6 +30,9 @@
     @ColumnWidth(30)
     @ExcelProperty("鐐逛綅IP(鍙慨鏀�)")
     private String pointIP;
+    @ColumnWidth(30)
+    @ExcelProperty("鍖哄幙(涓嶅彲淇敼)")
+    private String area;
 
     @ColumnWidth(40)
     @ExcelProperty("褰撳墠杩愮淮鍗曚綅(瀵煎叆鐣岄潰鍙敼)")
@@ -46,28 +49,49 @@
     private Date endTime;
 
     @ExcelIgnore
-    private Boolean provinceTag;
+    private Boolean provinceTagVideo;
+
+    @ExcelIgnore
+    private Boolean provinceTagCar;
+
+    @ExcelIgnore
+    private Boolean provinceTagFace;
 
     @ColumnWidth(20)
-    @ExcelProperty("鏄惁鐪佸巺鏍囩(鍙慨鏀�)")
-    private String provinceTagString;
+    @ExcelProperty("鏄惁鐪佸巺瑙嗛鏍囩(鍙慨鏀�)")
+    private String provinceTagVideoString;
 
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁鐪佸巺杞﹁締鏍囩(鍙慨鏀�)")
+    private String provinceTagCarString;
+
+    @ColumnWidth(20)
+    @ExcelProperty("鏄惁鐪佸巺浜鸿劯鏍囩(鍙慨鏀�)")
+    private String provinceTagFaceString;
     @ColumnWidth(20)
     @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)")
     private String importantCommandImageTagString;
 
     @ColumnWidth(20)
     @ExcelProperty("鏄惁閮ㄧ骇鏍囩(鍙慨鏀�)")
-    private String deptTag;
+    private String deptTagString;
 
+    @ExcelIgnore
+    private Boolean deptTag;
     @ExcelIgnore
     private Boolean importantTag;
 
-//    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
-//    private String importantTagString;
+    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+    private String importantTagString;
 
+    @ColumnWidth(20)
+    @ExcelProperty("鐢ㄦ埛鍚�(鍙慨鏀�)")
+    private String username;
+    @ColumnWidth(20)
+    @ExcelProperty("瀵嗙爜(鍙慨鏀�)")
+    private String password;
     @ExcelIgnore
     private Boolean importantCommandImageTag;
 
-
+    private List<DynamicColumnVO> dynamicData;
 }

--
Gitblit v1.8.0