From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 88 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 86 insertions(+), 2 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 df50bda..7a1a108 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
@@ -1,8 +1,12 @@
package com.ycl.platform.domain.result.UY;
+import annotation.Excel;
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;
import java.util.Date;
@@ -20,12 +24,20 @@
/**
* 鍥芥爣鐮�
*/
+ @Excel(name = "璁惧缂栫爜",sort = 1,width = 20)
private String deviceNo;
/**
- * 鎽勫儚鏈哄搧鐗�
+ * 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
*/
private Integer deviceBrand;
+ @Excel(name = "鏍囩",sort = 4)
+ private String tagStr;
+ /**
+ * 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
+ */
+ @Excel(name = "璁惧鍝佺墝",sort = 2)
+ private String deviceBrandStr;
/**
* 璁惧绫诲瀷
*/
@@ -34,73 +46,145 @@
/**
* ip
*/
+ @Excel(name = "IP",sort = 3)
private String ip;
/**
* 妫�娴嬫椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "妫�娴嬫椂闂�",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 11)
private Date checkTime;
/**
* 鏍囨敞鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "OSD鏍囨敞鏃堕棿",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 10)
private Date setTime;
+
/**
* osd閫氶亾鍚�
*/
+ @Excel(name = "閫氶亾鍚嶇О",sort = 5,width = 32)
private String osdName;
/**
* osd鐪�
*/
+ @Excel(name = "OSD鐪�",sort = 6)
private String osdProvince;
/**
* osd甯�
*/
+ @Excel(name = "OSD甯�",sort = 7)
private String osdCity;
/**
* osd鍖�
*/
+ @Excel(name = "OSD鍖�",sort = 8)
private String osdPart;
/**
* osd宸︿笅瑙�
*/
+ @Excel(name = "OSD宸︿笅瑙�",sort = 9)
private String osdLB;
/**
* osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
*/
+ @Excel(name = "鏃堕棿鏄惁姝ｇ‘",sort = 17, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdTimeCorrect;
+
+ /**
+ * osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
+ */
+ private Boolean osdTimeError;
+
+ /**
+ * osd閫氶亾鍚嶆槸鍚︽纭� 1姝ｇ‘ 0鏈煡 -1閿�
+ */
+ @Excel(name = "閫氶亾鍚嶆槸鍚︽纭�",sort = 12, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ private Integer osdNameCorrect;
/**
* osd閫氶亾鍚嶆槸鍚︽纭�
*/
- private Integer osdNameCorrect;
+ private Boolean osdNameError;
+
/**
* osd鐪佹槸鍚︽纭�
*/
+ @Excel(name = "OSD鐪佹槸鍚︽纭�",sort = 13, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdProvinceCorrect;
+
+ /**
+ * osd鐪佹槸鍚︽纭�
+ */
+ private Boolean osdProvinceError;
/**
* osd甯傛槸鍚︽纭�
*/
+ @Excel(name = "OSD甯傛槸鍚︽纭�",sort = 14, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdCityCorrect;
+
+ /**
+ * osd甯傛槸鍚︽纭�
+ */
+ private Boolean osdCityError;
/**
* osd鍖烘槸鍚︽纭�
*/
+ @Excel(name = "OSD鍖烘槸鍚︽纭�",sort = 15, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdPartCorrect;
/**
+ * osd鍖烘槸鍚︽纭�
+ */
+ private Boolean osdPartError;
+ /**
* osd宸︿笅瑙掓槸鍚︽纭�
*/
+ @Excel(name = "OSD宸︿笅鏄惁姝ｇ‘",sort = 16, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
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