From 9ca86187d65db0180f6d23b8efd13136b6db394c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 20 九月 2024 11:45:40 +0800
Subject: [PATCH] 考核成绩导出优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
index 6e24c3e..eee213c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
@@ -2,6 +2,7 @@
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
@Data
@@ -18,6 +19,7 @@
/**
* IP鍦板潃
*/
+ @TextIndexed
private QualifyResult ip;
/**
* 鐩戞帶鐐逛綅绫诲瀷
@@ -38,6 +40,7 @@
/**
* 璁惧鍚�
*/
+ @TextIndexed
private QualifyResult name;
/**
* 璁惧鐘舵��
@@ -46,6 +49,7 @@
/**
* 璁惧缂栫爜
*/
+ @TextIndexed
private QualifyResult serialNumber;
/**
* 鎽勫儚鏈洪噰闆嗗尯鍩�
@@ -59,6 +63,7 @@
* 绉熸埛id
*/
private QualifyResult tenantId;
+
@Data
public static class QualifyResult {
/**
@@ -69,7 +74,34 @@
/**
* 灞曠ず鍊�
* */
+ @TextIndexed
private String showValue;
+ /**
+ * 鏁版嵁鍘熷鍊硷紝濡傚浗鏍囩爜绛�
+ */
+ @TextIndexed
private String value;
}
+
+ //鍏ㄥ杩攖ure
+ public static boolean correct(MonitorQualifyResult result) {
+ return checkError(result.getName()) &&
+ checkError(result.getCivilCode()) &&
+ checkError(result.getIp()) &&
+ checkError(result.getSerialNumber()) &&
+ checkError(result.getMacdz()) &&
+ checkError(result.getLatitude()) &&
+ checkError(result.getLongitude()) &&
+ checkError(result.getSbzt()) &&
+ checkError(result.getSxjcjqy()) &&
+ checkError(result.getSxjgnlx()) &&
+ checkError(result.getJkdwlx()) &&
+ checkError(result.getIntegrated_device())
+ ;
+ }
+
+ //妫�鏌ユ寚鏍囷紝姝ｅ父杩斿洖true
+ public static boolean checkError(MonitorQualifyResult.QualifyResult result) {
+ return result.getError() != null && !result.getError();
+ }
}
--
Gitblit v1.8.0