From 040fe24077c6a57fd0b337fd41cec00d9125eb0e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 12 十二月 2024 00:58:52 +0800
Subject: [PATCH] 一机一档OSD优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 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..ea63c09 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
@@ -58,6 +58,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date setTime;
+
/**
* osd閫氶亾鍚�
*/
@@ -91,7 +92,7 @@
/**
* osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
*/
- private String osdTimeCorrectText;
+ private Boolean osdTimeError;
/**
* osd閫氶亾鍚嶆槸鍚︽纭� 1姝ｇ‘ 0鏈煡 -1閿�
@@ -99,9 +100,9 @@
private Integer osdNameCorrect;
/**
- * osd閫氶亾鍚嶆槸鍚︽纭� 1姝ｇ‘ 0鏈煡 -1閿�
+ * osd閫氶亾鍚嶆槸鍚︽纭�
*/
- private String osdNameCorrectText;
+ private Boolean osdNameError;
/**
* osd鐪佹槸鍚︽纭�
@@ -111,7 +112,7 @@
/**
* osd鐪佹槸鍚︽纭�
*/
- private String osdProvinceCorrectText;
+ private Boolean osdProvinceError;
/**
* osd甯傛槸鍚︽纭�
@@ -121,7 +122,7 @@
/**
* osd甯傛槸鍚︽纭�
*/
- private String osdCityCorrectText;
+ private Boolean osdCityError;
/**
* osd鍖烘槸鍚︽纭�
@@ -131,7 +132,7 @@
/**
* osd鍖烘槸鍚︽纭�
*/
- private String osdPartCorrectText;
+ private Boolean osdPartError;
/**
* osd宸︿笅瑙掓槸鍚︽纭�
*/
@@ -150,26 +151,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