From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/HomeNavbarController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 372540f..0828019 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
@@ -9,14 +9,14 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
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.System;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.homemodule.SuperHomeNavbarService;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -25,7 +25,7 @@
public class HomeNavbarController<E> {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperHomeNavbarService superHomeNavbarService;
@@ -41,7 +41,7 @@
@RequestMapping(value = "gethomenavbar", method = RequestMethod.POST)
public void gethomenavbar(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -69,7 +69,7 @@
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