From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java
index eebbc9e..cd2130e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java
@@ -13,10 +13,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
-import com.yeshi.fanli.entity.bus.homemodule.SuperHomeNavbar;
-import com.yeshi.fanli.entity.system.BusinessSystem;
-import com.yeshi.fanli.service.inter.config.BusinessSystemService;
-import com.yeshi.fanli.service.inter.homemodule.SuperHomeNavbarService;
+import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import net.sf.json.JSONObject;
@@ -25,11 +22,7 @@
public class HomeNavbarController<E> {
@Resource
- private BusinessSystemService businessSystemService;
-
- @Resource
- private SuperHomeNavbarService superHomeNavbarService;
-
+ private HomeNavbarService homeNavbarService;
/**
@@ -40,36 +33,14 @@
*/
@RequestMapping(value = "gethomenavbar", method = RequestMethod.POST)
public void gethomenavbar(AcceptData acceptData, PrintWriter out) {
-
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
- List<SuperHomeNavbar> listSuper = superHomeNavbarService.listBySystemCache(system.getId());
- if (listSuper == null || listSuper.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- List<HomeNavbar> listNavbar = new ArrayList<HomeNavbar>();
-
- for (SuperHomeNavbar superHomeNavbar : listSuper) {
- HomeNavbar homeNavbar = superHomeNavbar.getHomeNavbar();
- if (homeNavbar == null) {
- continue;
- }
-
- homeNavbar.setCreatetime(null);
- homeNavbar.setUpdatetime(null);
-
- listNavbar.add(homeNavbar);
+ List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar();
+ if (listNavbar == null) {
+ listNavbar = new ArrayList<HomeNavbar>();
}
JSONObject data = new JSONObject();
data.put("count", listNavbar.size());
- data.put("listNavbar", listNavbar);
+ data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(listNavbar));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0