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/HomeTypeController.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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 ab7df3d..f33a51d 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
@@ -3,12 +3,16 @@
import java.io.PrintWriter;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
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;
@@ -20,7 +24,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.buwan.domain.DetailSystem;
+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;
@@ -38,6 +42,9 @@
@Resource
private HomeTypeService homeTypeService;
+
+ @Resource
+ private HomeRecommendSpecialService homeRecommendSpecialService;
@RequestMapping(value = "/gethometypelist", method = RequestMethod.POST)
public void getHomeTypeList(HttpSession session, PrintWriter out) {
@@ -59,11 +66,26 @@
}
@RequestMapping(value = "/gethometypelistadmin", method = RequestMethod.POST)
- public void getHomeTypeListAdmin(int page, int detailsystem, String key, HttpSession session, PrintWriter out) {
+ public void getHomeTypeListAdmin(int page, int detailsystem, String special, String key, HttpSession session, PrintWriter out) {
key = StringUtil.isNullOrEmpty(key) ? "" : key;
+ String dataKey = null;
+ if (special != null && !special.equalsIgnoreCase("0")) {
+ HomeRecommendSpecial bean = homeRecommendSpecialService.getSpecial(special);
+ if (bean != null) {
+ dataKey = bean.getDataKey();
+ }
+ }
- List<HomeTypeAdmin> list = homeTypeService.getHomeTypeAdmin(key, SystemUtil.getAdminSelectedSystemId(session), detailsystem, page);
- long count = homeTypeService.getHomeTypeAdminCount(key, SystemUtil.getAdminSelectedSystemId(session), detailsystem);
+
+ List<HomeTypeAdmin> list = homeTypeService.getHomeTypeAdmin(key, SystemUtil.getAdminSelectedSystemId(session), dataKey, detailsystem, page);
+
+ //鎷夊彇鏍囩
+
+
+ Map<String, HomeRecommendSpecial> specialMap = new HashMap<>();
+
+
+ long count = homeTypeService.getHomeTypeAdminCount(key, SystemUtil.getAdminSelectedSystemId(session), detailsystem, dataKey);
PageEntity pe = new PageEntity();
pe.setPageIndex(page);
pe.setPageSize(Constant.pageCount);
@@ -71,6 +93,13 @@
JSONArray array = new JSONArray();
Gson gson = new GsonBuilder().create();
for (HomeTypeAdmin ht : list) {
+ String specialDataKey = ht.getHomeType().getHomeType().getSpecialDataKey();
+ if (specialMap.get(specialDataKey) == null) {
+ specialMap.put(specialDataKey, homeRecommendSpecialService.getSpecialByDataKey(specialDataKey));
+ }
+
+ ht.setSpecial(specialMap.get(specialDataKey));
+
JSONObject root = new JSONObject();
ht.getHomeType().getHomeType().getSystem().setAdmin(null);
root.put("homeType", gson.toJson(ht.getHomeType().getHomeType()));
@@ -80,6 +109,7 @@
darray.add(gson.toJson(dss));
}
root.put("detailSystemList", darray);
+ root.put("special", specialMap.get(specialDataKey));
array.add(root);
}
@@ -95,7 +125,7 @@
@RequestMapping(value = "/addhomevideos", method = RequestMethod.POST)
public void addHomeVideos(String videoids, String tag, String picture, String types, PrintWriter out) {
- List<HomeVideo> list = new ArrayList<HomeVideo>();
+ List<HomeVideo> list = new ArrayList<>();
String[] videos = videoids.split(",");
String[] homeTypes = types.split(",");
@@ -121,12 +151,13 @@
}
@RequestMapping(value = "/addhometype", method = RequestMethod.POST)
- public void addHomeType(@Valid HomeType homeType, String detailsystemids, BindingResult bingdingResult,
+ public void addHomeType(@Valid HomeType homeType, String detailsystemids, BindingResult bingdingResult, HttpSession session,
PrintWriter out) {
if (bingdingResult.hasErrors()) {// 閿欒
}
homeType.setCreatetime(System.currentTimeMillis() + "");
+ homeType.setSystem(SystemUtil.getAdminSelectedSystem(session));
Serializable id = homeTypeService.addHomeType(homeType);
if (id != null && !StringUtil.isNullOrEmpty(detailsystemids)) {
@@ -179,7 +210,8 @@
ht.setNumber(homeType.getNumber());
ht.setOrderby(homeType.getOrderby());
ht.setParams(homeType.getParams());
- ht.setVideoType(homeType.getVideoType());
+// ht.setVideoType(homeType.getVideoType());
+ ht.setSpecialDataKey(homeType.getSpecialDataKey());
homeTypeService.updateHomeType(ht);
JSONObject object = new JSONObject();
object.put("code", 0);
@@ -191,6 +223,8 @@
@RequestMapping(value = "/gethometype", method = RequestMethod.POST)
public void getHomeType(long id, PrintWriter out) {
HomeType ht = homeTypeService.getHomeTypeById(id + "");
+ ht.setSystem(null);
+ ht.setAdmin(null);
List<DetailSystemSelect> selectList = homeTypeService.getDetailSystemSelectByType(id + "");
Gson gson = new GsonBuilder().create();
JSONObject object = new JSONObject();
@@ -241,7 +275,7 @@
public void getHomeVideoList(long id, int page, String key, PrintWriter out) {
key = StringUtil.isNullOrEmpty(key) ? "" : key;
List<HomeVideo> list = homeTypeService.getHomeVideoList(id + "", key, page);
- for(HomeVideo homeVideo:list){
+ for (HomeVideo homeVideo : list) {
homeVideo.setType(null);
homeVideo.setAdmin(null);
}
--
Gitblit v1.8.0