From 290426983e4a3f2331e74d10790e64ec97323c99 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 14:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
index 2d41919..5f1d164 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
@@ -1,14 +1,12 @@
package com.ycl.platform.domain.entity;
import annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.ycl.platform.base.CheckIndex;
-import com.ycl.system.entity.BaseEntity;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 瑙嗛鎸囨爣姒傜巼鏁版嵁瀵硅薄 t_check_index_video
@@ -96,9 +94,23 @@
@Excel(name = "瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」",width = 25)
private BigDecimal videoTransmissionBoundaryIntegrityDetection;
+ /** 瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」 */
+ @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�",width = 25)
+ private BigDecimal keyCommandImageOnline;
/** 鏈堣繍琛岀巼 */
@Excel(name = "鏈堣繍琛岀巼")
private BigDecimal operatingRate;
+
+ @ExcelIgnore
+ private List<String> quarter;
+
+ public List<String> getQuarter() {
+ return quarter;
+ }
+
+ public void setQuarter(List<String> quarter) {
+ this.quarter = quarter;
+ }
public BigDecimal getPlatformOnline() {
return platformOnline;
@@ -186,6 +198,14 @@
public void setKeyAnnotationAccuracy(BigDecimal keyAnnotationAccuracy) {
this.keyAnnotationAccuracy = keyAnnotationAccuracy;
+ }
+
+ public BigDecimal getKeyCommandImageOnline() {
+ return keyCommandImageOnline;
+ }
+
+ public void setKeyCommandImageOnline(BigDecimal keyCommandImageOnline) {
+ this.keyCommandImageOnline = keyCommandImageOnline;
}
public BigDecimal getKeyTimingAccuracy() {
@@ -311,12 +331,12 @@
}
@Override
- public Long getExamineTag() {
+ public Short getExamineTag() {
return super.getExamineTag();
}
@Override
- public void setExamineTag(Long examineTag) {
+ public void setExamineTag(Short examineTag) {
super.setExamineTag(examineTag);
}
--
Gitblit v1.8.0