From 7a93f4097430703dc60c4aee0240ed348a0ab1df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 06 一月 2025 18:12:00 +0800
Subject: [PATCH] 核算重构

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 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 f46261c..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
@@ -23,7 +23,6 @@
     /**
      * 鍥芥爣鐮�
      */
-    @TextIndexed
     private String deviceNo;
 
     /**
@@ -43,7 +42,6 @@
     /**
      * ip
      */
-    @TextIndexed
     private String ip;
 
     /**
@@ -58,10 +56,10 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date setTime;
 
+
     /**
      * osd閫氶亾鍚�
      */
-    @TextIndexed
     private String osdName;
     /**
      * osd鐪�
@@ -91,7 +89,7 @@
     /**
      * osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
      */
-    private String osdTimeCorrectText;
+    private Boolean osdTimeError;
 
     /**
      * osd閫氶亾鍚嶆槸鍚︽纭�   1姝ｇ‘  0鏈煡  -1閿�
@@ -99,9 +97,9 @@
     private Integer osdNameCorrect;
 
     /**
-     * osd閫氶亾鍚嶆槸鍚︽纭�   1姝ｇ‘  0鏈煡  -1閿�
+     * osd閫氶亾鍚嶆槸鍚︽纭�
      */
-    private String osdNameCorrectText;
+    private Boolean osdNameError;
 
     /**
      * osd鐪佹槸鍚︽纭�
@@ -111,7 +109,7 @@
     /**
      * osd鐪佹槸鍚︽纭�
      */
-    private String osdProvinceCorrectText;
+    private Boolean osdProvinceError;
 
     /**
      * osd甯傛槸鍚︽纭�
@@ -121,7 +119,7 @@
     /**
      * osd甯傛槸鍚︽纭�
      */
-    private String osdCityCorrectText;
+    private Boolean osdCityError;
 
     /**
      * osd鍖烘槸鍚︽纭�
@@ -131,7 +129,7 @@
     /**
      * osd鍖烘槸鍚︽纭�
      */
-    private String osdPartCorrectText;
+    private Boolean osdPartError;
     /**
      * osd宸︿笅瑙掓槸鍚︽纭�
      */
@@ -150,26 +148,21 @@
         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("鏈煡"); }
+    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.setOsdNameCorrectText("姝ｇ‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("閿欒");
-        else { result.setOsdNameCorrectText("鏈煡"); }
+        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameError(Boolean.FALSE);
+        else { result.setOsdNameError(Boolean.TRUE); }
 
-        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.getOsdProvinceCorrect())) result.setOsdProvinceError(Boolean.FALSE);
+        else { result.setOsdProvinceError(Boolean.TRUE); }
 
-        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.getOsdCityCorrect())) result.setOsdCityError(Boolean.FALSE);
+        else { result.setOsdCityError(Boolean.TRUE); }
 
-        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("姝ｇ‘");
-        else if(ApiConstants.OSD_Error.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("閿欒");
-        else { result.setOsdPartCorrectText("鏈煡"); }
+        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());

--
Gitblit v1.8.0