From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index 3f2c9ed..a07c5c9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,11 +1,13 @@
package com.ycl.platform.domain.result.UY;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
+import java.util.Objects;
/**
* 褰曞儚鍙敤鎬�
@@ -30,11 +32,13 @@
/**
* 鍒涘缓鏃堕棿锛屾牸寮忎负鏃ユ湡鏃堕棿瀛楃涓�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 鎽勫儚鏈篒D
*/
+ @TextIndexed
private String deviceId;
/**
@@ -70,8 +74,14 @@
private Integer recordStatus;
/**
+ * 褰曞儚瀹屾暣鐘舵�侊紝1锛氬畬鏁达紝0锛氶棿姝囷紝-1锛氬紓甯�
+ */
+ private String recordStatusText;
+
+ /**
* 缁熻鏃堕棿锛屾牸寮忎负鏃ユ湡瀛楃涓�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date statTime;
/**
@@ -79,4 +89,16 @@
*/
private String tenantId;
+ public String getRecordStatusText() {
+ if (Objects.equals(recordStatus, 1)) {
+ recordStatusText = "瀹屾暣";
+ }
+ if (Objects.equals(recordStatus, 0)) {
+ recordStatusText = "闂存瓏";
+ }
+ if (Objects.equals(recordStatus, -1)) {
+ recordStatusText = "寮傚父";
+ }
+ return recordStatusText;
+ }
}
--
Gitblit v1.8.0