Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java

@@ -5,8 +5,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

@@ -14,9 +12,11 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.exception.banner.SwiperPictureException;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONObject;



/**

 * 动态

@@ -39,34 +39,30 @@
         return;

      }



      try {

         

         List<SwiperPicture> list = swiperPictureService.getByBannerCard(card);

         if (list == null || list.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         for (SwiperPicture swiperPicture: list) {

            swiperPicture.setBannerId(null);

            swiperPicture.setCreatetime(null);

            swiperPicture.setUpdatetime(null);

            swiperPicture.setState(null);

            swiperPicture.setRemark(null);

         }

			
         GsonBuilder gsonBuilder = new GsonBuilder();

         gsonBuilder.serializeNulls();

         Gson gson = gsonBuilder.create();

			
         JSONObject data = new JSONObject();

         data.put("result_list", gson.toJson(list));

			
         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			
      } catch (SwiperPictureException e) {

         e.printStackTrace();

      List<BannerVO> list = swiperPictureService.getByBannerCard(card);

      if (list == null || list.size() == 0) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

         return;

      }



      for (BannerVO swiperPicture: list) {

         swiperPicture.setBannerId(null);

         swiperPicture.setCreatetime(null);

         swiperPicture.setUpdatetime(null);

         swiperPicture.setState(null);

         swiperPicture.setRemark(null);

      }

		
      GsonBuilder gsonBuilder = new GsonBuilder();

      gsonBuilder.serializeNulls();

      Gson gson = gsonBuilder.create();

		
      JSONObject data = new JSONObject();

      data.put("result_list", gson.toJson(list));

		
      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			
   }



}