Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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()));

      }