From b31a2529ad309413a23d8ff208d6b15b76efc1cc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 17:58:40 +0800
Subject: [PATCH] OSD导出加上标签
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 31 ++++++++++++++++---------------
ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java | 1 +
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 10 ++++++++++
3 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
index dafcdd1..8586e5c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result;
+import annotation.Excel;
import lombok.Data;
import org.bson.types.ObjectId;
import org.springframework.data.annotation.CreatedDate;
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 e609fb0..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
@@ -24,14 +24,15 @@
/**
* 鍥芥爣鐮�
*/
- @Excel(name = "璁惧缂栫爜",sort = 1)
+ @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 娴峰悍/澶у崕/瀹囪
*/
@@ -52,50 +53,50 @@
* 妫�娴嬫椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "妫�娴嬫椂闂�",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 10)
+ @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 = 9)
+ @Excel(name = "OSD鏍囨敞鏃堕棿",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 10)
private Date setTime;
/**
* osd閫氶亾鍚�
*/
- @Excel(name = "閫氶亾鍚嶇О",sort = 4)
+ @Excel(name = "閫氶亾鍚嶇О",sort = 5,width = 32)
private String osdName;
/**
* osd鐪�
*/
- @Excel(name = "OSD鐪�",sort = 5)
+ @Excel(name = "OSD鐪�",sort = 6)
private String osdProvince;
/**
* osd甯�
*/
- @Excel(name = "OSD甯�",sort = 6)
+ @Excel(name = "OSD甯�",sort = 7)
private String osdCity;
/**
* osd鍖�
*/
- @Excel(name = "OSD鍖�",sort = 7)
+ @Excel(name = "OSD鍖�",sort = 8)
private String osdPart;
/**
* osd宸︿笅瑙�
*/
- @Excel(name = "OSD宸︿笅瑙�",sort = 8)
+ @Excel(name = "OSD宸︿笅瑙�",sort = 9)
private String osdLB;
/**
* osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
*/
- @Excel(name = "鏃堕棿鏄惁姝ｇ‘",sort = 16, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "鏃堕棿鏄惁姝ｇ‘",sort = 17, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdTimeCorrect;
/**
@@ -106,7 +107,7 @@
/**
* osd閫氶亾鍚嶆槸鍚︽纭� 1姝ｇ‘ 0鏈煡 -1閿�
*/
- @Excel(name = "閫氶亾鍚嶆槸鍚︽纭�",sort = 11, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "閫氶亾鍚嶆槸鍚︽纭�",sort = 12, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdNameCorrect;
/**
@@ -117,7 +118,7 @@
/**
* osd鐪佹槸鍚︽纭�
*/
- @Excel(name = "OSD鐪佹槸鍚︽纭�",sort = 12, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD鐪佹槸鍚︽纭�",sort = 13, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdProvinceCorrect;
/**
@@ -128,7 +129,7 @@
/**
* osd甯傛槸鍚︽纭�
*/
- @Excel(name = "OSD甯傛槸鍚︽纭�",sort = 13, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD甯傛槸鍚︽纭�",sort = 14, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdCityCorrect;
/**
@@ -139,7 +140,7 @@
/**
* osd鍖烘槸鍚︽纭�
*/
- @Excel(name = "OSD鍖烘槸鍚︽纭�",sort = 14, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD鍖烘槸鍚︽纭�",sort = 15, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdPartCorrect;
/**
@@ -149,7 +150,7 @@
/**
* osd宸︿笅瑙掓槸鍚︽纭�
*/
- @Excel(name = "OSD宸︿笅鏄惁姝ｇ‘",sort = 15, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD宸︿笅鏄惁姝ｇ‘",sort = 16, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdLbCorrect;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 0c418f5..dbf36b9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1194,6 +1194,16 @@
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
for (OsdCheckResult osdCheckResult : resultList) {
OsdCheckResult.getError(osdCheckResult);
+ StringBuilder tag = new StringBuilder("" +
+ (osdCheckResult.getProvinceTag() ? "鐪佸巺銆�" : "") +
+ (osdCheckResult.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") +
+ (osdCheckResult.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") +
+ (osdCheckResult.getDeptTag() ? "閮ㄧ骇銆�" : ""));
+ // 鍒犻櫎瀛楃涓叉湯灏剧殑"銆�"
+ if (tag.toString().endsWith("銆�")) {
+ tag = new StringBuilder(tag.substring(0, tag.length() - 1));
+ }
+ osdCheckResult.setTagStr(tag.toString());
}
ExcelUtil<OsdCheckResult> util = new ExcelUtil<>(OsdCheckResult.class);
String sheetName = "OSD鏍囨敞";
--
Gitblit v1.8.0