From ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 九月 2020 18:31:23 +0800
Subject: [PATCH] 淘口令格式兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
index 72c23e8..bf74b96 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONObject;
@@ -50,9 +51,9 @@
public void changeSex(AcceptData acceptData, Integer sex, PrintWriter out) {
try {
// 鑾峰彇璁惧瀹氫箟鎬у埆
- int deviceSex = deviceSexService.changeDeviceSex(sex, acceptData.getDevice());
+ deviceSexService.save(acceptData.getDevice(), sex);
JSONObject data = new JSONObject();
- data.put("sex", deviceSex);
+ data.put("sex", sex);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍒囨崲澶辫触"));
@@ -64,21 +65,33 @@
* 鑾峰彇瀵艰埅鏍忓唴瀹�
* @param acceptData
* @param uid
- * @param sex 0閫氱敤 1鐢� 2濂�
* @param out
*/
@RequestMapping(value = "getHomeItems", method = RequestMethod.POST)
public void getHomeItems(AcceptData acceptData, Long uid, PrintWriter out) {
// 鑾峰彇璁惧瀹氫箟鎬у埆
- int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
- List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice(), deviceSex);
- if (listNavbar == null) {
- listNavbar = new ArrayList<HomeNavbar>();
+ int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice(),acceptData.getSystem());
+ List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice(), deviceSex,acceptData.getSystem());
+
+ List<HomeNavbar> list = new ArrayList<HomeNavbar>();
+ if (listNavbar != null) {
+ list.addAll(listNavbar);
}
+
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ for (int i = 0; i < list.size(); i ++) {
+ NavbarTypeEnum type = list.get(i).getType();
+ if (type == NavbarTypeEnum.commonTemplate) {
+ list.remove(i);
+ i--;
+ }
+ }
+ }
+
JSONObject data = new JSONObject();
data.put("sex", deviceSex);
- data.put("count", listNavbar.size());
- data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(listNavbar));
+ data.put("count", list.size());
+ data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(list));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -95,7 +108,7 @@
List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();
// 绯荤粺榛樿瀵艰埅鏍�
- List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar();
+ List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar(acceptData.getSystem());
if (listNavbar != null && listNavbar.size() > 0) {
listItems.addAll(listNavbar);
}
@@ -215,7 +228,7 @@
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
// 璁剧疆涓洪�氱敤
- deviceSexService.changeDeviceSex(0, acceptData.getDevice());
+ deviceSexService.save(acceptData.getDevice(), 0);
} catch (HomeNavbarUserException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
@@ -237,7 +250,7 @@
List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();
- List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice());
+ List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice(),acceptData.getSystem());
if (listNavbar != null && listNavbar.size() > 0) {
listItems.addAll(listNavbar);
}
@@ -274,7 +287,7 @@
out.print(JsonUtil.loadTrueResult(data));
// 璁剧疆涓洪�氱敤
- deviceSexService.changeDeviceSex(0, acceptData.getDevice());
+ deviceSexService.save(acceptData.getDevice(), 0);
} catch (HomeNavbarUserException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
--
Gitblit v1.8.0