From d22bbb827940050d4df2bf3fb16dae79eba91d4e Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 12 十一月 2024 18:45:15 +0800 Subject: [PATCH] 批量审核bug,离线时间点回显 --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 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 db21934..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 @@ -3,6 +3,7 @@ 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; @@ -26,10 +27,14 @@ private String deviceNo; /** - * 鎽勫儚鏈哄搧鐗� + * 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪 */ private Integer deviceBrand; + /** + * 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪 + */ + private String deviceBrandStr; /** * 璁惧绫诲瀷 */ @@ -84,13 +89,29 @@ private Integer osdTimeCorrect; /** + * osdTimeCorrect鏃堕棿鏄惁姝g‘ + */ + private String osdTimeCorrectText; + + /** * osd閫氶亾鍚嶆槸鍚︽纭� 1姝g‘ 0鏈煡 -1閿� */ private Integer osdNameCorrect; + + /** + * osd閫氶亾鍚嶆槸鍚︽纭� 1姝g‘ 0鏈煡 -1閿� + */ + private String osdNameCorrectText; + /** * osd鐪佹槸鍚︽纭� */ private Integer osdProvinceCorrect; + + /** + * osd鐪佹槸鍚︽纭� + */ + private String osdProvinceCorrectText; /** * osd甯傛槸鍚︽纭� @@ -98,10 +119,19 @@ private Integer osdCityCorrect; /** + * osd甯傛槸鍚︽纭� + */ + private String osdCityCorrectText; + + /** * osd鍖烘槸鍚︽纭� */ private Integer osdPartCorrect; + /** + * osd鍖烘槸鍚︽纭� + */ + private String osdPartCorrectText; /** * osd宸︿笅瑙掓槸鍚︽纭� */ @@ -119,4 +149,31 @@ 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("姝g‘"); + else if(ApiConstants.OSD_Error.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("閿欒"); + else { result.setOsdTimeCorrectText("鏈煡"); } + + if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("姝g‘"); + else if(ApiConstants.OSD_Error.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("閿欒"); + else { result.setOsdNameCorrectText("鏈煡"); } + + if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("姝g‘"); + else if(ApiConstants.OSD_Error.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("閿欒"); + else { result.setOsdProvinceCorrectText("鏈煡"); } + + if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("姝g‘"); + else if(ApiConstants.OSD_Error.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("閿欒"); + else { result.setOsdCityCorrectText("鏈煡"); } + + if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("姝g‘"); + 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