From 559e188de93bb05d6c37ec1a0d392ec69ed02567 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 20 十一月 2018 10:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java |   76 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
index 7bd8784..b9a1e7e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
@@ -7,12 +7,17 @@
 
 import javax.annotation.Resource;
 
+import net.sf.json.JSONObject;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.yeshi.fanli.entity.common.Config;
 import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.fanli.util.Constant;
+
 import org.yeshi.utils.JsonUtil;
 
 @Controller
@@ -47,4 +52,75 @@
 		out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
 		return;
 	}
+	
+	/**
+	 * 鏌ヨ鍒楄〃 - 鏂板悗鍙�
+	 * @param callback
+	 * @param key 鏌ヨ璇�  鍚嶇О
+	 * @param pageIndex
+	 * @param out
+	 */
+	@RequestMapping(value = "getNewConfigList")
+	public void getNewConfigList(String callback, String key, Integer pageIndex, PrintWriter out){
+		
+		try {
+			
+			if (pageIndex == null || pageIndex < 0){
+				pageIndex = 1;
+			}
+			
+			List<Config> list =  configService.listObjects(key, pageIndex);
+			
+			if (list == null || list.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
+				return;
+			}
+			
+			int count = configService.getCount(key, pageIndex);
+			PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count);
+			
+			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();
+		}
+	}
+	
+	/**
+	 * 鍙傛暟淇敼 - 鏂板悗鍙�
+	 * @param callback
+	 * @param config
+	 * @param out
+	 */
+	@RequestMapping(value = "saveModify")
+	public void saveModify(String callback, Config config, PrintWriter out) {
+		Long id = config.getId();
+		if (id == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+			return;
+		}
+		
+		try {
+			Config crentconfig = configService.getConfig(id);
+			if (crentconfig == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+				return;
+			}
+			// key 涓嶅彲淇敼
+			config.setKey(crentconfig.getKey());
+			configService.update(config);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+			
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
+			e.printStackTrace();
+		}
+		
+	}
+	
 }

--
Gitblit v1.8.0