From 3dc714284a95fe9677a964ec039b2b547547e30d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 05 十一月 2024 11:20:37 +0800 Subject: [PATCH] 工单异步获取图片、工单导出时间参数bug --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 64 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 74a0033..f2cde76 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,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.domain.result.BaseResult; +import constant.ApiConstants; 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 +22,14 @@ /** * 鍥芥爣鐮� */ + @TextIndexed private String deviceNo; /** - * 鎽勫儚鏈哄搧鐗� + * 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪 */ private Integer deviceBrand; + /** * 璁惧绫诲瀷 */ @@ -34,6 +38,7 @@ /** * ip */ + @TextIndexed private String ip; /** @@ -51,6 +56,7 @@ /** * osd閫氶亾鍚� */ + @TextIndexed private String osdName; /** * osd鐪� @@ -78,13 +84,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甯傛槸鍚︽纭� @@ -92,15 +114,56 @@ 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("姝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("鏈煡"); } + } } -- Gitblit v1.8.0