From 9f2b31fa43f74dd6a04c2f3fa3af4d8fab6cd588 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期三, 21 十一月 2018 17:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java |  115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 114 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
index 4bcc9b7..cdd6ca4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
@@ -2,6 +2,7 @@
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,9 +14,14 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.JsonUtil;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.entity.bus.activity.ActivityUser;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
+import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.exception.ActivityException;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -400,6 +406,113 @@
 		activityService.deleteRecommendActivity(rsids);
 		out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
 	}
-	// deleteRecommendActivity
+	
+	
+	/**
+	 * 
+	 * @param pageIndex
+	 *            椤垫暟
+	 * @param key
+	 *            鏌ヨ鏉′欢
+	 * @param out
+	 */
+	@RequestMapping(value = "query")
+	public void query(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+		
+		if (pageIndex == null || pageIndex < 1) {
+			pageIndex = 1;
+		}
 
+		if (pageSize == null || pageSize < 1) {
+			pageSize = Constant.PAGE_SIZE;
+		}
+		
+		try {
+			
+			List<RecommendActivity> list = null;
+			if (StringUtil.isNullOrEmpty(key)) {
+				list = activityService.getRecommendActivityList(pageIndex, Constant.PAGE_SIZE);
+			} else {
+				list = activityService.queryRecommendActivityList(key, pageIndex, Constant.PAGE_SIZE);
+			}
+			
+			if (list == null || list.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+				return;
+			}
+			
+			int count = (int) activityService.getRecommendActivityCount();
+
+			int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
+			PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
+			
+			JSONObject data = new JSONObject();
+			data.put("pe", pe);
+			data.put("result_list", list);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+			e.printStackTrace();
+		}
+	}
+	
+	
+	
+	@RequestMapping(value = "saveModify")
+	public void saveModify(String callback, RecommendActivity recommendActivity, PrintWriter out) {
+		try {
+
+			Long id = recommendActivity.getId();
+			if (id == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+				return;
+			}
+			
+			RecommendActivity resultObj = activityService.selectByPrimaryKey(id);
+			if (resultObj == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+				return;
+			}
+
+			activityService.updateByPrimaryKeySelective(recommendActivity);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	
+
+	
+	@RequestMapping(value = "delete")
+	public void delete(String callback, String idArray, PrintWriter out) {
+
+		if (StringUtil.isNullOrEmpty(idArray)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+			return;
+		}
+		
+		try {
+			Gson gson = new Gson();
+			long[] hsids = gson.fromJson(idArray, new TypeToken<long[]>() {}.getType());
+			
+			if (hsids == null || hsids.length == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
+				return;
+			}
+			
+			activityService.deleteRecommendActivity(hsids);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+			
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+			e.printStackTrace();
+		}
+	}
+	
 }

--
Gitblit v1.8.0