From b41a6efe17ba61d150c5a9b7309651cebae54e0d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 九月 2021 16:40:43 +0800
Subject: [PATCH] 韩迷TV相关bug修改，电视直播完善（后台+前端API）

---
 src/main/java/com/yeshi/buwan/domain/special/SearchSpecial.java |  136 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 105 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/domain/special/SearchSpecial.java b/src/main/java/com/yeshi/buwan/domain/special/SearchSpecial.java
index ad16fae..ac0b8c8 100644
--- a/src/main/java/com/yeshi/buwan/domain/special/SearchSpecial.java
+++ b/src/main/java/com/yeshi/buwan/domain/special/SearchSpecial.java
@@ -7,6 +7,7 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鎼滅储涓撻
@@ -20,12 +21,9 @@
     @Indexed
     private String key;
     private String systemId;
-    //涓撹緫鏌ヨ
-    private SolrVideoSearchFilter albumQuery;
-    //鍏ㄧ綉鎼滄煡璇�
-    private SolrVideoSearchFilter internetQuery;
-    //鐭棰�
-    private SolrShortVideoSearchFilter shortQuery;
+
+    //鏌ヨ鏉′欢鐨勭増鏈垎甯冧笌绯荤粺鍒嗗竷
+    private List<QueryConditionsContainer> containerList;
 
     //澶囨敞
     private String remarks;
@@ -64,22 +62,6 @@
         this.systemId = systemId;
     }
 
-    public SolrVideoSearchFilter getAlbumQuery() {
-        return albumQuery;
-    }
-
-    public void setAlbumQuery(SolrVideoSearchFilter albumQuery) {
-        this.albumQuery = albumQuery;
-    }
-
-    public SolrVideoSearchFilter getInternetQuery() {
-        return internetQuery;
-    }
-
-    public void setInternetQuery(SolrVideoSearchFilter internetQuery) {
-        this.internetQuery = internetQuery;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -94,15 +76,6 @@
 
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
-    }
-
-
-    public SolrShortVideoSearchFilter getShortQuery() {
-        return shortQuery;
-    }
-
-    public void setShortQuery(SolrShortVideoSearchFilter shortQuery) {
-        this.shortQuery = shortQuery;
     }
 
     public String getName() {
@@ -128,4 +101,105 @@
     public void setColumn(Integer column) {
         this.column = column;
     }
+
+    public List<QueryConditionsContainer> getContainerList() {
+        return containerList;
+    }
+
+    public void setContainerList(List<QueryConditionsContainer> containerList) {
+        this.containerList = containerList;
+    }
+
+    /**
+     * 鎼滅储涓撻鏌ヨ鐨勬潯浠�
+     */
+    public static class QueryConditions {
+        //涓撹緫鏌ヨ
+        private SolrVideoSearchFilter albumQuery;
+        //鍏ㄧ綉鎼滄煡璇�
+        private SolrVideoSearchFilter internetQuery;
+        //鐭棰�
+        private SolrShortVideoSearchFilter shortQuery;
+
+
+        public QueryConditions(SolrVideoSearchFilter albumQuery, SolrVideoSearchFilter internetQuery, SolrShortVideoSearchFilter shortQuery) {
+            this.albumQuery = albumQuery;
+            this.internetQuery = internetQuery;
+            this.shortQuery = shortQuery;
+        }
+
+        public SolrVideoSearchFilter getAlbumQuery() {
+            return albumQuery;
+        }
+
+        public void setAlbumQuery(SolrVideoSearchFilter albumQuery) {
+            this.albumQuery = albumQuery;
+        }
+
+        public SolrVideoSearchFilter getInternetQuery() {
+            return internetQuery;
+        }
+
+        public void setInternetQuery(SolrVideoSearchFilter internetQuery) {
+            this.internetQuery = internetQuery;
+        }
+
+        public SolrShortVideoSearchFilter getShortQuery() {
+            return shortQuery;
+        }
+
+        public void setShortQuery(SolrShortVideoSearchFilter shortQuery) {
+            this.shortQuery = shortQuery;
+        }
+    }
+
+    public static class QueryConditionsContainer {
+        private QueryConditions queryConditions;
+        private String detailSystemId;
+        private String channel;
+        private int minVersion;
+
+        public QueryConditionsContainer(QueryConditions queryConditions, String detailSystemId, String channel, int minVersion) {
+            this.queryConditions = queryConditions;
+            this.detailSystemId = detailSystemId;
+            this.channel = channel;
+            this.minVersion = minVersion;
+        }
+
+        public QueryConditionsContainer() {
+ 
+        }
+
+        public QueryConditions getQueryConditions() {
+            return queryConditions;
+        }
+
+        public void setQueryConditions(QueryConditions queryConditions) {
+            this.queryConditions = queryConditions;
+        }
+
+        public String getDetailSystemId() {
+            return detailSystemId;
+        }
+
+        public void setDetailSystemId(String detailSystemId) {
+            this.detailSystemId = detailSystemId;
+        }
+
+        public int getMinVersion() {
+            return minVersion;
+        }
+
+        public void setMinVersion(int minVersion) {
+            this.minVersion = minVersion;
+        }
+
+        public String getChannel() {
+            return channel;
+        }
+
+        public void setChannel(String channel) {
+            this.channel = channel;
+        }
+    }
 }

--
Gitblit v1.8.0