From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java b/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java
index f33a51d..8d6affc 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java
@@ -1,5 +1,32 @@
package com.yeshi.buwan.controller.admin.api;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.yeshi.buwan.domain.HomeType;
+import com.yeshi.buwan.domain.HomeVideo;
+import com.yeshi.buwan.domain.SuperHomeType;
+import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
+import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.web.DetailSystemSelect;
+import com.yeshi.buwan.domain.web.HomeTypeAdmin;
+import com.yeshi.buwan.service.imp.HomeTypeService;
+import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
+import com.yeshi.buwan.service.inter.recommend.HomeVideoService;
+import com.yeshi.buwan.util.Constant;
+import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.SystemUtil;
+import com.yeshi.buwan.util.video.VideoUtil;
+import com.yeshi.buwan.web.tag.PageEntity;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import javax.validation.Valid;
import java.io.PrintWriter;
import java.io.Serializable;
import java.util.ArrayList;
@@ -7,41 +34,15 @@
import java.util.List;
import java.util.Map;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
-import javax.validation.Valid;
-
-import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
-import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
-import com.yeshi.buwan.util.SystemUtil;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.yeshi.buwan.domain.system.DetailSystem;
-import com.yeshi.buwan.domain.HomeType;
-import com.yeshi.buwan.domain.HomeVideo;
-import com.yeshi.buwan.domain.SuperHomeType;
-import com.yeshi.buwan.domain.VideoInfo;
-import com.yeshi.buwan.domain.web.DetailSystemSelect;
-import com.yeshi.buwan.domain.web.HomeTypeAdmin;
-import com.yeshi.buwan.service.imp.HomeTypeService;
-import com.yeshi.buwan.util.Constant;
-import com.yeshi.buwan.util.StringUtil;
-import com.yeshi.buwan.web.tag.PageEntity;
-
@Controller
@RequestMapping("admin/new/api/home")
public class HomeTypeController {
@Resource
private HomeTypeService homeTypeService;
+
+ @Resource
+ private HomeVideoService homeVideoService;
@Resource
private HomeRecommendSpecialService homeRecommendSpecialService;
@@ -138,12 +139,14 @@
hv.setTag(tag);
}
hv.setType(new HomeType(ht));
- hv.setVideo(new VideoInfo(vid));
+ hv.setVideoId(vid);
+ hv.setBigPicture(false);
+ hv.setFromType(VideoUtil.getVideoFromType(hv.getVideoId()));
list.add(hv);
}
}
- homeTypeService.addHomeTypeVideo(list);
+ homeVideoService.addHomeVideo(list);
JSONObject object = new JSONObject();
object.put("code", 0);
object.put("msg", "娣诲姞鎴愬姛");
@@ -204,12 +207,15 @@
ht.setActivity(homeType.getActivity());
ht.setColumns(homeType.getColumns());
ht.setHasMore(homeType.isHasMore());
+ ht.setMoreTag(homeType.getMoreTag());
+ ht.setRefreshPosition(homeType.getRefreshPosition());
ht.setIcon(homeType.getIcon());
ht.setIosControl(homeType.getIosControl());
ht.setName(homeType.getName());
ht.setNumber(homeType.getNumber());
ht.setOrderby(homeType.getOrderby());
ht.setParams(homeType.getParams());
+ ht.setBigPicture(homeType.isBigPicture());
// ht.setVideoType(homeType.getVideoType());
ht.setSpecialDataKey(homeType.getSpecialDataKey());
homeTypeService.updateHomeType(ht);
@@ -274,12 +280,12 @@
@RequestMapping(value = "/gethomevideolist", method = RequestMethod.POST)
public void getHomeVideoList(long id, int page, String key, PrintWriter out) {
key = StringUtil.isNullOrEmpty(key) ? "" : key;
- List<HomeVideo> list = homeTypeService.getHomeVideoList(id + "", key, page);
+ List<HomeVideo> list = homeVideoService.getHomeVideoList(id + "", key, page);
for (HomeVideo homeVideo : list) {
homeVideo.setType(null);
homeVideo.setAdmin(null);
}
- long count = homeTypeService.getHomeVideoListCount(id + "", key);
+ long count = homeVideoService.getHomeVideoListCount(id + "", key);
PageEntity pe = new PageEntity();
pe.setPageIndex(page);
pe.setPageSize(Constant.pageCount);
@@ -300,7 +306,7 @@
public void deleteHomeVideo(String ids, PrintWriter out) {
String[] idStrs = ids.split(",");
for (String id : idStrs) {
- homeTypeService.deleteHomeVideo(new HomeVideo(id));
+ homeVideoService.deleteHomeVideo(new HomeVideo(id));
}
JSONObject object = new JSONObject();
object.put("code", 0);
@@ -317,6 +323,9 @@
object.put("msg", "璇ヨ棰戜笉瀛樺湪");
out.print(object);
} else {
+ hv.setAdmin(null);
+ hv.setType(null);
+ hv.getVideo().setAdmin(null);
Gson gson = new GsonBuilder().create();
JSONObject object = new JSONObject();
object.put("code", 0);
@@ -326,7 +335,7 @@
}
@RequestMapping(value = "/updatehomevideo", method = RequestMethod.POST)
- public void updateHomeVideo(long id, String tag, String picture, String orderby, PrintWriter out) {
+ public void updateHomeVideo(long id, String tag, String picture, String orderby, Boolean bigPicture, PrintWriter out) {
HomeVideo hv = homeTypeService.getHomeVideoById(id + "");
if (hv == null) {
JSONObject object = new JSONObject();
@@ -341,7 +350,8 @@
ob = Integer.parseInt(orderby);
}
hv.setOrderby(ob);
- homeTypeService.updateHomeVideo(hv);
+ hv.setBigPicture(bigPicture);
+ homeVideoService.updateHomeVideo(hv);
JSONObject object = new JSONObject();
object.put("code", 0);
object.put("msg", "鏇存柊鎴愬姛");
--
Gitblit v1.8.0