From 224c12c7ae9a3b9d0380962ff92dac18812434a6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 10:19:18 +0800
Subject: [PATCH] 报备回显问题

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 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 f2caa67..1c04824 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,6 +2,8 @@
 
 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;
@@ -21,14 +23,17 @@
     /**
      * 鍥芥爣鐮�
      */
-    @TextIndexed
     private String deviceNo;
 
     /**
-     *  鎽勫儚鏈哄搧鐗�
+     *  鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
      */
     private Integer deviceBrand;
 
+    /**
+     *  鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
+     */
+    private String deviceBrandStr;
     /**
      * 璁惧绫诲瀷
      */
@@ -37,7 +42,6 @@
     /**
      * ip
      */
-    @TextIndexed
     private String ip;
 
     /**
@@ -52,10 +56,10 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date setTime;
 
+
     /**
      * osd閫氶亾鍚�
      */
-    @TextIndexed
     private String osdName;
     /**
      * osd鐪�
@@ -83,13 +87,29 @@
     private Integer osdTimeCorrect;
 
     /**
+     * osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
+     */
+    private Boolean osdTimeError;
+
+    /**
      * osd閫氶亾鍚嶆槸鍚︽纭�   1姝ｇ‘  0鏈煡  -1閿�
      */
     private Integer osdNameCorrect;
+
+    /**
+     * osd閫氶亾鍚嶆槸鍚︽纭�
+     */
+    private Boolean osdNameError;
+
     /**
      * osd鐪佹槸鍚︽纭�
      */
     private Integer osdProvinceCorrect;
+
+    /**
+     * osd鐪佹槸鍚︽纭�
+     */
+    private Boolean osdProvinceError;
 
     /**
      * osd甯傛槸鍚︽纭�
@@ -97,15 +117,56 @@
     private Integer osdCityCorrect;
 
     /**
+     * osd甯傛槸鍚︽纭�
+     */
+    private Boolean osdCityError;
+
+    /**
      * osd鍖烘槸鍚︽纭�
      */
     private Integer osdPartCorrect;
 
+    /**
+     * osd鍖烘槸鍚︽纭�
+     */
+    private Boolean osdPartError;
     /**
      * 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 getError(OsdCheckResult result) {
+        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeError(Boolean.FALSE);
+        else {result.setOsdTimeError(Boolean.TRUE); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameError(Boolean.FALSE);
+        else { result.setOsdNameError(Boolean.TRUE); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceError(Boolean.FALSE);
+        else { result.setOsdProvinceError(Boolean.TRUE); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityError(Boolean.FALSE);
+        else { result.setOsdCityError(Boolean.TRUE); }
+
+        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartError(Boolean.FALSE);
+        else { result.setOsdPartError(Boolean.TRUE); }
+
+        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