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/HK/SnapshotDataMonitorResult.java | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java index ce8d7ae..049c639 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java @@ -1,16 +1,20 @@ package com.ycl.platform.domain.result.HK; +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.Objects; + /** - * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� + * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滐細杞﹁締锛堣鍥惧簱瀵规帴绋冲畾鎬с�佺偣浣嶅湪绾跨巼銆侊級 * * @author gonghl */ @Data -@Document(collection = "snapshot_data_monitor") -public class SnapshotDataMonitorResult extends BaseResult{ +@Document(collection = "hk_snapshot_data_monitor") +public class SnapshotDataMonitorResult extends BaseResult { /** * 鏁版嵁绫诲瀷 */ @@ -18,21 +22,25 @@ /** * dataType涓�1锛氬崱鍙e唴鐮� dataType涓�2鎴�11锛氶噰闆嗚澶囧唴鐮� */ + @TextIndexed private String indexCode; /** * 璁惧鎴栧崱鍙e浗鏍囩紪鐮� */ + @TextIndexed private String externalIndexCode; /** * 璁惧鎴栧崱鍙e悕绉� */ + @TextIndexed private String deviceName; /** * 缁勭粐缂栧彿 */ + @TextIndexed private String orgCode; /** @@ -60,4 +68,24 @@ */ private int resultType; + /** + * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� 1:姝e父 2:鏃犳暟鎹� 3:鏁版嵁绐侀檷 4:鏁版嵁閲忓皯 + */ + private String resultTypeText; + + public String getResultTypeText() { + if (Objects.equals(resultType, 1)) { + resultTypeText = "姝e父"; + } + if (Objects.equals(resultType, 2)) { + resultTypeText = "鏃犳暟鎹�"; + } + if (Objects.equals(resultType, 3)) { + resultTypeText = "鏁版嵁绐侀檷"; + } + if (Objects.equals(resultType, 4)) { + resultTypeText = "鏁版嵁閲忓皯"; + } + return resultTypeText; + } } -- Gitblit v1.8.0