From 4114e871bcb3dce771b6aed64a1027d0bbb95ca6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 五月 2019 15:28:37 +0800
Subject: [PATCH] 增加动态用户

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index 5975090..cf97de9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/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) {
 					// 榛樿鏈�夋嫨

--
Gitblit v1.8.0