Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java

@@ -4,7 +4,9 @@
import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

@@ -83,8 +85,7 @@
         swiperBannerService.insert(swiperBanner);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功"));



      } catch (SwiperBannerException e) {

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

      }

@@ -269,9 +270,38 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

         e.printStackTrace();

      }



   }



	
   @RequestMapping(value = "getEffectiveOption")

   public void getEffectiveOption(String callback, PrintWriter out) {

      try {

         List<Object> list = new ArrayList<Object>();

			
         Map<String,Object> mapDefalut =new HashMap<String,Object>();

         mapDefalut.put("key", 0);

         mapDefalut.put("value", "--未选择--");

         list.add(mapDefalut);

			
         List<SwiperBanner> listBanner = swiperBannerService.getEffectiveOption();

         if (listBanner != null && listBanner.size() > 0) {

            for (SwiperBanner swiperBanner: listBanner) {

               Map<String,Object> map =new HashMap<String,Object>();

               map.put("key", swiperBanner.getId());

               map.put("value", swiperBanner.getTitle());

               list.add(map);

            }

         }

			
         JSONObject data = new JSONObject();

         data.put("result_list", list);

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

			
      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

         e.printStackTrace();

      }

   }

   

   

   /**

@@ -333,6 +363,13 @@
               swiperPicture.setParams("");

            }

            



            String remark = swiperPicture.getRemark();

            if (remark == null) {

               swiperPicture.setRemark("");

            }

				
				
            JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();

            if (jumpDetail == null) {

               // 默认未选择