From 9d0d134447c84abcf34ddfda1f31099af7037c18 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 24 四月 2025 10:46:56 +0800
Subject: [PATCH] 录像可用率判断方式，海康的接口调整
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 1cdc1eb..a6c498e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -31,7 +31,7 @@
private String workOrderNo;
private Integer id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鏁呴殰鏃堕棿",sort = 6,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏁呴殰鏃堕棿",sort = 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -40,41 +40,55 @@
/** 杩愮淮鍗曚綅 */
private Integer unitId;
- @Excel(name = "杩愮淮鍗曚綅",sort = 5)
+ @Excel(name = "杩愮淮鍗曚綅",sort = 6)
private String unitName;
private String unitContact;
private String unitContactPhone;
/** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
- @Excel(name = "璁惧鍚嶇О",sort = 3)
+ @Excel(name = "璁惧鍚嶇О",sort = 3,width = 25)
private String source;
/** ip */
- @Excel(name = "IP",sort = 4)
+ @Excel(name = "IP",sort = 5)
private String ip;
/**
* 璁惧缂栧彿
*/
- @Excel(name = "璁惧缂栧彿",sort = 2)
+ @Excel(name = "璁惧缂栧彿",sort = 2,width = 22)
private String serialNumber;
-
- private Boolean provinceTag;
-
- private Boolean importantTag;
-
- private Boolean importantCommandImageTag;
+ /**
+ * 鑰冩牳鏍囩
+ * @param entity
+ * @param vo
+ * @return
+ */
+ @Excel(name = "鑰冩牳鏍囩",sort = 4)
+ private String tag;
/**
* 鏄惁閲嶇偣鐐逛綅
*/
- private Boolean important;
+ private Boolean importantTag;
+ private Boolean importantCommandImageTag;
+ private Boolean deptTag;
+ private Boolean provinceTagVideo;
+ private Boolean provinceTagCar;
+ private Boolean provinceTagFace;
/** 鏁呴殰绫诲瀷 */
private List<String> errorTypeList;
/** 鏁呴殰绫诲瀷 */
- @Excel(name = "鏁呴殰绫诲瀷")
+ @Excel(name = "鏁呴殰绫诲瀷",sort = 8)
private String errorType;
-
+ /**
+ * 璁惧鏍囩
+ * @param entity
+ * @param vo
+ * @return
+ */
+ @Excel(name = "璁惧鏍囩",sort = 9,width = 30)
+ private String dynamicTag;
/** 宸ュ崟妫�娴嬪浘鐗� */
private String imgListStr;
@@ -82,12 +96,18 @@
/** 杩愮淮浜哄憳 */
private Integer ywPeopleId;
-
+ private Long pointId;
private String ywPeopleName;
/** 杩愮淮澶勭悊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "杩愮淮澶勭悊鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime ywHandleTime;
+
+ /** 瀹℃牳閫氳繃鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "瀹℃牳鏃堕棿",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime passTime;
/** 杩愮淮缁撴灉 */
private String ywResult;
@@ -105,7 +125,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date distributeTime;
- private Date auditTime;
/** 涓嬪彂浜� */
private String realName;
@@ -113,6 +132,13 @@
* 鏄惁鎵ｈ繃绉垎
*/
private Boolean deduct;
+ //澶勭悊鏃堕棿鐐归泦鍚�
+ private List<Date> handleTimeList;
+ private Date handleTime;
+ //瀹℃牳鏃堕棿鐐归泦鍚�
+ private List<Date> auditTimeList;
+ private Date auditTime;
+
public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
if(vo == null) {
--
Gitblit v1.8.0