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/MonitoringDetailResult.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
index 11bf95c..d4105dd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
@@ -2,35 +2,42 @@
 
 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;
+
 /**
- * 閲囬泦璁惧灞炴�х洃娴嬬粨鏋�
+ * 閲囬泦璁惧灞炴�х洃娴嬬粨鏋滐細浜鸿劯锛堜汉鑴稿崱鍙d俊鎭噰闆嗗噯纭巼锛�
  *
  * @author gonghl
  */
 @Data
-@Document(collection = "monitoring_detail")
+@Document(collection = "hk_monitoring_detail")
 public class MonitoringDetailResult extends BaseResult {
 
     /**
      * 缁勭粐缂栧彿
      */
+    @TextIndexed
     private String orgCode;
 
     /**
      * 閲囬泦璁惧鍐呯爜
      */
+    @TextIndexed
     private String indexCode;
 
     /**
      * 鍥芥爣缂栫爜锛堝鐮侊級
      */
+    @TextIndexed
     private String externalIndexCode;
 
     /**
      * 閲囬泦璁惧鍚嶇О
      */
+    @TextIndexed
     private String cameraName;
 
     /**
@@ -49,9 +56,21 @@
     private Integer lalType;
 
     /**
+     * 缁忕含搴︾洃娴嬬粨鏋滐紝琛ㄧず缁忕含搴︿俊鎭殑鐩戞祴鐘舵�併��
+     * 1:姝e父 2:缁忕含搴︾己澶� 3:涓嶅湪杈栧尯 4:绮惧害杩囦綆
+     */
+    private String lalTypeText;
+
+    /**
      * 鍥芥爣缂栫爜鐩戞祴缁撴灉: 1:姝e父 2:缂栫爜闀垮害涓嶇瓑浜�20浣� 3:鍓�6浣嶄笉绗﹀悎鏍囧噯 4:11鑷�13浣嶄笉绗﹀悎鏍囧噯
      */
     private Integer gbCodeType;
+
+    /**
+     * 鍥芥爣缂栫爜鐩戞祴缁撴灉锛岃〃绀哄浗鏍囩紪鐮佺殑鐩戞祴鐘舵�併��
+     * 1:姝e父 2:缂栫爜闀垮害涓嶇瓑浜�20浣� 3:鍓�6浣嶄笉绗﹀悎鏍囧噯 4:11鑷�13浣嶄笉绗﹀悎鏍囧噯
+     */
+    private String gbCodeTypeText;
 
     /**
      * 鏅�氳兘鍔涢泦
@@ -63,4 +82,37 @@
      */
     private String intelligentSet;
 
+
+    public String getLalTypeText() {
+        if (Objects.equals(lalType, 1)) {
+            lalTypeText = "姝e父";
+        }
+        if (Objects.equals(lalType, 2)) {
+            lalTypeText = "缁忕含搴︾己澶�";
+        }
+        if (Objects.equals(lalType, 3)) {
+            lalTypeText = "涓嶅湪杈栧尯";
+        }
+        if (Objects.equals(lalType, 4)) {
+            lalTypeText = "绮惧害杩囦綆";
+        }
+        return lalTypeText;
+    }
+
+    public String getGbCodeTypeText() {
+        if (Objects.equals(gbCodeType, 1)) {
+            gbCodeTypeText = "姝e父";
+        }
+        if (Objects.equals(gbCodeType, 2)) {
+            gbCodeTypeText = "缂栫爜闀垮害涓嶇瓑浜�20浣�";
+        }
+        if (Objects.equals(gbCodeType, 3)) {
+            gbCodeTypeText = "鍓�6浣嶄笉绗﹀悎鏍囧噯";
+        }
+        if (Objects.equals(gbCodeType, 4)) {
+            gbCodeTypeText = "11鑷�13浣嶄笉绗﹀悎鏍囧噯";
+        }
+        return gbCodeTypeText;
+    }
+
 }

--
Gitblit v1.8.0