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/test/java/com/hxh/spring/test/video/SearchSpecialTest.java | 48 +++++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/test/java/com/hxh/spring/test/video/SearchSpecialTest.java b/src/test/java/com/hxh/spring/test/video/SearchSpecialTest.java index d45166c..f90200d 100644 --- a/src/test/java/com/hxh/spring/test/video/SearchSpecialTest.java +++ b/src/test/java/com/hxh/spring/test/video/SearchSpecialTest.java @@ -1,6 +1,7 @@ package com.hxh.spring.test.video; +import com.yeshi.buwan.dao.search.SearchSpecialDao; import com.yeshi.buwan.domain.solr.SolrShortVideo; import com.yeshi.buwan.domain.special.SearchSpecial; import com.yeshi.buwan.domain.special.SearchSpecialPosition; @@ -18,6 +19,7 @@ import javax.annotation.Resource; import java.util.Arrays; +import java.util.List; // @RunWith(SpringJUnit4ClassRunner.class) //浣跨敤junit4杩涜娴嬭瘯 @@ -33,6 +35,9 @@ @Resource private SearchSpecialPositionMapService searchSpecialPositionMapService; + + @Resource + private SearchSpecialDao searchSpecialDao; @Test @@ -64,8 +69,8 @@ filter.setArea("闊╁浗"); filter.setContentType(1); filter.setVideoType(150); - searchSpecial.setAlbumQuery(filter); - searchSpecial.setInternetQuery(filter); + filter.setResourceIds(Arrays.asList(new String[]{"25","28"})); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(filter, filter, null), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -77,8 +82,7 @@ filter.setArea("闊╁浗"); filter.setContentType(1); filter.setVideoType(151); - searchSpecial.setAlbumQuery(filter); - searchSpecial.setInternetQuery(filter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(filter, filter, null), "48", null, 1)})); searchSpecial.setColumn(3); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -90,8 +94,7 @@ filter.setArea("闊╁浗"); filter.setContentType(1); filter.setVideoType(152); - searchSpecial.setAlbumQuery(filter); - searchSpecial.setInternetQuery(filter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(filter, filter, null), "48", null, 1)})); searchSpecial.setColumn(3); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -103,8 +106,7 @@ filter.setArea("鏃ユ湰"); // filter.setContentType(1); filter.setVideoType(153); - searchSpecial.setAlbumQuery(filter); - searchSpecial.setInternetQuery(filter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(filter, filter, null), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -117,7 +119,7 @@ sfilter.setAreas(Arrays.asList(new String[]{"闊╁浗", "鏃ラ煩"})); sfilter.setRootVideoType(155); // sfilter.setTag(); - searchSpecial.setShortQuery(sfilter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, sfilter), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -130,7 +132,7 @@ sfilter.setAreas(Arrays.asList(new String[]{"闊╁浗", "鏃ラ煩"})); sfilter.setRootVideoType(155); sfilter.setTag("鍏崷"); - searchSpecial.setShortQuery(sfilter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, sfilter), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -142,7 +144,7 @@ sfilter.setAreas(Arrays.asList(new String[]{"闊╁浗", "鏃ラ煩"})); sfilter.setRootVideoType(155); sfilter.setTag("鏂伴椈"); - searchSpecial.setShortQuery(sfilter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, sfilter), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -154,7 +156,7 @@ sfilter.setAreas(Arrays.asList(new String[]{"闊╁浗", "鏃ラ煩"})); sfilter.setRootVideoType(155); sfilter.setTag("鏄庢槦"); - searchSpecial.setShortQuery(sfilter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, sfilter), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -166,7 +168,7 @@ sfilter.setAreas(Arrays.asList(new String[]{"闊╁浗", "鏃ラ煩"})); sfilter.setRootVideoType(155); sfilter.setTag("鐑偣"); - searchSpecial.setShortQuery(sfilter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, sfilter), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -179,7 +181,7 @@ sfilter.setAreas(Arrays.asList(new String[]{"闊╁浗", "鏃ラ煩"})); sfilter.setRootVideoType(155); sfilter.setTag("闊充箰"); - searchSpecial.setShortQuery(sfilter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, sfilter), "48", null, 1)})); searchSpecial.setColumn(2); searchSpecial.setSystemId(systemId + ""); searchSpecialService.save(searchSpecial); @@ -195,9 +197,7 @@ filter.setRootVideoType(155); filter.setSortKey("third_update_time"); - searchSpecial.setAlbumQuery(null); - searchSpecial.setInternetQuery(null); - searchSpecial.setShortQuery(filter); + searchSpecial.setContainerList(Arrays.asList(new SearchSpecial.QueryConditionsContainer[]{new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(null, null, filter), "48", null, 1)})); searchSpecial.setColumn(1); searchSpecial.setSystemId(2 + ""); searchSpecialService.save(searchSpecial); @@ -311,4 +311,18 @@ searchSpecialPositionMapService.add(map); } + @Test + public void repaireSpecial() { + SearchSpecial special = searchSpecialDao.get("3#hanju-shaoer"); + SolrVideoSearchFilter filter = new SolrVideoSearchFilter(); + filter.setArea("鏃ユ湰"); + filter.setContentType(1); + filter.setVideoType(153); + filter.setResourceIds(Arrays.asList(new String[]{"25","28"})); + special.getContainerList().add(new SearchSpecial.QueryConditionsContainer(new SearchSpecial.QueryConditions(filter, null, null), "48", "meizu", 1)); + + special.setContainerList(special.getContainerList()); + searchSpecialDao.save(special); + } + } -- Gitblit v1.8.0