From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index ea63c09..7a1a108 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -1,5 +1,6 @@
 package com.ycl.platform.domain.result.UY;
 
+import annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.platform.domain.result.BaseResult;
 import constant.ApiConstants;
@@ -23,17 +24,19 @@
     /**
      * 鍥芥爣鐮�
      */
-    @TextIndexed
+    @Excel(name = "璁惧缂栫爜",sort = 1,width = 20)
     private String deviceNo;
 
     /**
      *  鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
      */
     private Integer deviceBrand;
-
+    @Excel(name = "鏍囩",sort = 4)
+    private String tagStr;
     /**
      *  鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
      */
+    @Excel(name = "璁惧鍝佺墝",sort = 2)
     private String deviceBrandStr;
     /**
      * 璁惧绫诲瀷
@@ -43,50 +46,57 @@
     /**
      * ip
      */
-    @TextIndexed
+    @Excel(name = "IP",sort = 3)
     private String ip;
 
     /**
      * 妫�娴嬫椂闂�
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "妫�娴嬫椂闂�",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 11)
     private Date checkTime;
 
     /**
      * 鏍囨敞鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "OSD鏍囨敞鏃堕棿",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 10)
     private Date setTime;
 
 
     /**
      * osd閫氶亾鍚�
      */
-    @TextIndexed
+    @Excel(name = "閫氶亾鍚嶇О",sort = 5,width = 32)
     private String osdName;
     /**
      * osd鐪�
      */
+    @Excel(name = "OSD鐪�",sort = 6)
     private String osdProvince;
 
     /**
      * osd甯�
      */
+    @Excel(name = "OSD甯�",sort = 7)
     private String osdCity;
 
     /**
      * osd鍖�
      */
+    @Excel(name = "OSD鍖�",sort = 8)
     private String osdPart;
 
     /**
      * osd宸︿笅瑙�
      */
+    @Excel(name = "OSD宸︿笅瑙�",sort = 9)
     private String osdLB;
 
     /**
      * osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
      */
+    @Excel(name = "鏃堕棿鏄惁姝ｇ‘",sort = 17, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
     private Integer osdTimeCorrect;
 
     /**
@@ -97,6 +107,7 @@
     /**
      * osd閫氶亾鍚嶆槸鍚︽纭�   1姝ｇ‘  0鏈煡  -1閿�
      */
+    @Excel(name = "閫氶亾鍚嶆槸鍚︽纭�",sort = 12, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
     private Integer osdNameCorrect;
 
     /**
@@ -107,6 +118,7 @@
     /**
      * osd鐪佹槸鍚︽纭�
      */
+    @Excel(name = "OSD鐪佹槸鍚︽纭�",sort = 13, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
     private Integer osdProvinceCorrect;
 
     /**
@@ -117,6 +129,7 @@
     /**
      * osd甯傛槸鍚︽纭�
      */
+    @Excel(name = "OSD甯傛槸鍚︽纭�",sort = 14, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
     private Integer osdCityCorrect;
 
     /**
@@ -127,6 +140,7 @@
     /**
      * osd鍖烘槸鍚︽纭�
      */
+    @Excel(name = "OSD鍖烘槸鍚︽纭�",sort = 15, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
     private Integer osdPartCorrect;
 
     /**
@@ -136,6 +150,7 @@
     /**
      * osd宸︿笅瑙掓槸鍚︽纭�
      */
+    @Excel(name = "OSD宸︿笅鏄惁姝ｇ‘",sort = 16, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
     private Integer osdLbCorrect;
 
 

--
Gitblit v1.8.0