From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 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 35b72f7..4feeaef 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
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar.NavbarTypeEnum;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbarUser;
import com.yeshi.fanli.exception.homemodule.HomeNavbarUserException;
+import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.util.StringUtil;
@@ -33,20 +34,52 @@
@Resource
private HomeNavbarUserService homeNavbarUserService;
+
+ @Resource
+ private DeviceSexService deviceSexService;
+
+
/**
- * 鑾峰彇瀵艰埅鏍忓唴瀹�
- *
+ * 鏀瑰彉鎬у埆
* @param acceptData
+ * @param sex
+ * @param out
+ */
+ @RequestMapping(value = "changeSex", method = RequestMethod.POST)
+ public void changeSex(AcceptData acceptData, Integer sex, PrintWriter out) {
+ try {
+ // 鑾峰彇璁惧瀹氫箟鎬у埆
+ int deviceSex = deviceSexService.changeDeviceSex(sex, acceptData.getDevice());
+ JSONObject data = new JSONObject();
+ data.put("sex", deviceSex);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鍒囨崲澶辫触"));
+ }
+ }
+
+
+ /**
+ * 鑾峰彇瀵艰埅鏍忓唴瀹�
+ * @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) {
- List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice());
+
+ // 鑾峰彇璁惧瀹氫箟鎬у埆
+ int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
+
+ List<HomeNavbar> listNavbar = homeNavbarUserService.listEffectiveNavbar(uid, acceptData.getDevice(), deviceSex);
if (listNavbar == null) {
listNavbar = new ArrayList<HomeNavbar>();
}
+
JSONObject data = new JSONObject();
+ data.put("sex", deviceSex);
data.put("count", listNavbar.size());
data.put("listNavbar", JsonUtil.getApiCommonGson().toJson(listNavbar));
out.print(JsonUtil.loadTrueResult(data));
@@ -85,14 +118,14 @@
}
if (homeNavbar.getIsDefault()) {
- listExist.add(homeNavbar);
-
if (homeNavbar.getIsFixed()) {
nonCount++;
}
-
+
+ listExist.add(homeNavbar);
listItems.remove(homeNavbar);
i--;
+ continue;
}
}
@@ -183,6 +216,10 @@
homeNavbarUserService.addNavbarUser(uid, acceptData.getDevice(), list);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+
+ // 璁剧疆涓洪�氱敤
+ deviceSexService.changeDeviceSex(0, acceptData.getDevice());
+
} catch (HomeNavbarUserException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
@@ -201,7 +238,8 @@
int nonCount = 0;
List<HomeNavbar> listExist = new ArrayList<HomeNavbar>();
List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();
-
+
+
List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice());
if (listNavbar != null && listNavbar.size() > 0) {
listItems.addAll(listNavbar);
@@ -220,13 +258,15 @@
if (!homeNavbar.getIsDefault()) {
break;
} else {
+ // 鍥哄畾涓暟
if (homeNavbar.getIsFixed()) {
nonCount++;
}
+ // 榛樿椤�
listExist.add(homeNavbar);
-
listItems.remove(homeNavbar);
i--;
+ continue;
}
}
@@ -235,6 +275,10 @@
data.put("listExist", JsonUtil.getApiCommonGson().toJson(listExist));
data.put("listItems", JsonUtil.getApiCommonGson().toJson(listItems));
out.print(JsonUtil.loadTrueResult(data));
+
+ // 璁剧疆涓洪�氱敤
+ deviceSexService.changeDeviceSex(0, acceptData.getDevice());
+
} catch (HomeNavbarUserException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
--
Gitblit v1.8.0