From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送
---
src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java b/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java
index 830a467..8850d13 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java
@@ -92,7 +92,7 @@
}
@RequestMapping(value = "/videolist", method = RequestMethod.POST)
- public void videoList(int videotype, int page, String key, String type, String resourceIds, int contenttype, String freeType, PrintWriter out) {
+ public void videoList(int videotype, int page, String key, String type, String resourceIds, int contenttype, String freeType, String area, PrintWriter out) {
if (StringUtil.isNullOrEmpty(type)) {
type = "name";
@@ -139,6 +139,8 @@
filter.setFreeType(freeTypeInt);
+ filter.setArea(StringUtil.isNullOrEmpty(area) ? null : area.trim());
+
SolrResultDTO dto = solrAlbumDataManager.find(filter, page, Constant.pageCount);
if (dto.getVideoList() != null)
for (SolrAlbumVideo videoInfo : (List<SolrAlbumVideo>) dto.getVideoList())
@@ -170,8 +172,16 @@
for (VideoAdminInfoVO a : voList) {
VideoInfoExtra extra = maps.get(a.getId());
if (extra != null) {
- if (!StringUtil.isNullOrEmpty(extra.gethPosterPicture()))
- a.setPicture(extra.gethPosterPicture());
+
+ if (a.getHpicture() != null) {
+ if (!StringUtil.isNullOrEmpty(extra.gethPosterPicture()))
+ a.setHpicture(extra.gethPosterPicture());
+ }
+
+ if (a.getVpicture() != null) {
+ if (!StringUtil.isNullOrEmpty(extra.getvPosterPicture()))
+ a.setVpicture(extra.getvPosterPicture());
+ }
}
}
--
Gitblit v1.8.0