From 95f69d1183a56f5768e6d56d043b0c6e5a878bb5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 十二月 2024 21:30:26 +0800
Subject: [PATCH] 空指针校验

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 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 cc87869..f46261c 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
@@ -2,7 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.platform.domain.result.BaseResult;
+import constant.ApiConstants;
+import enumeration.DeviceType;
 import lombok.Data;
+import org.springframework.data.mongodb.core.index.TextIndexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
@@ -20,12 +23,18 @@
     /**
      * 鍥芥爣鐮�
      */
+    @TextIndexed
     private String deviceNo;
 
     /**
-     *  鎽勫儚鏈哄搧鐗�
+     *  鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
      */
     private Integer deviceBrand;
+
+    /**
+     *  鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
+     */
+    private String deviceBrandStr;
     /**
      * 璁惧绫诲瀷
      */
@@ -34,6 +43,7 @@
     /**
      * ip
      */
+    @TextIndexed
     private String ip;
 
     /**
@@ -51,6 +61,7 @@
     /**
      * osd閫氶亾鍚�
      */
+    @TextIndexed
     private String osdName;
     /**
      * osd鐪�
@@ -68,7 +79,7 @@
     private String osdPart;
 
     /**
-     * osd 宸︿笅瑙�
+     * osd宸︿笅瑙�
      */
     private String osdLB;
 
@@ -78,13 +89,29 @@
     private Integer osdTimeCorrect;
 
     /**
-     * osd閫氶亾鍚嶆槸鍚︽纭�
+     * osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
+     */
+    private String osdTimeCorrectText;
+
+    /**
+     * osd閫氶亾鍚嶆槸鍚︽纭�   1姝ｇ‘  0鏈煡  -1閿�
      */
     private Integer osdNameCorrect;
+
+    /**
+     * osd閫氶亾鍚嶆槸鍚︽纭�   1姝ｇ‘  0鏈煡  -1閿�
+     */
+    private String osdNameCorrectText;
+
     /**
      * osd鐪佹槸鍚︽纭�
      */
     private Integer osdProvinceCorrect;
+
+    /**
+     * osd鐪佹槸鍚︽纭�
+     */
+    private String osdProvinceCorrectText;
 
     /**
      * osd甯傛槸鍚︽纭�
@@ -92,15 +119,61 @@
     private Integer osdCityCorrect;
 
     /**
+     * osd甯傛槸鍚︽纭�
+     */
+    private String osdCityCorrectText;
+
+    /**
      * osd鍖烘槸鍚︽纭�
      */
     private Integer osdPartCorrect;
 
+    /**
+     * osd鍖烘槸鍚︽纭�
+     */
+    private String osdPartCorrectText;
     /**
      * osd宸︿笅瑙掓槸鍚︽纭�
      */
     private Integer osdLbCorrect;
 
 
+    public static Boolean checkOsd(OsdCheckResult result) {
+        return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect()) &&
+                ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect()) &&
+                ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect()) &&
+                ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect()) &&
+                ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect());
+    }
 
+    public static Boolean checkTime(OsdCheckResult result) {
+        return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
+    }
+
+    public static void getText(OsdCheckResult result) {
+        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("姝ｇ‘");
+        else if(ApiConstants.OSD_Error.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("閿欒");
+        else { result.setOsdTimeCorrectText("鏈煡"); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("姝ｇ‘");
+        else if(ApiConstants.OSD_Error.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("閿欒");
+        else { result.setOsdNameCorrectText("鏈煡"); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("姝ｇ‘");
+        else if(ApiConstants.OSD_Error.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("閿欒");
+        else { result.setOsdProvinceCorrectText("鏈煡"); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("姝ｇ‘");
+        else if(ApiConstants.OSD_Error.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("閿欒");
+        else { result.setOsdCityCorrectText("鏈煡"); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("姝ｇ‘");
+        else if(ApiConstants.OSD_Error.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("閿欒");
+        else { result.setOsdPartCorrectText("鏈煡"); }
+
+        if(DeviceType.DH.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.DH.getDesc());
+        else if(DeviceType.HK.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.HK.getDesc());
+        else if(DeviceType.YS.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.YS.getDesc());
+        else { result.setDeviceBrandStr("鏈煡"); }
+    }
 }

--
Gitblit v1.8.0