From ebb3551170b255defc25fe93bbf6eb1e84cd321d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 29 十一月 2018 17:46:47 +0800
Subject: [PATCH] 清理多余引用
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 b9a1e7e..2a60376 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
@@ -6,6 +6,7 @@
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -13,10 +14,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
+import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.annotation.RequestNoLogin;
import org.yeshi.utils.JsonUtil;
@@ -26,6 +31,10 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private AdminUserService adminUserService;
+
@RequestMapping(value = "getConfigList", method = RequestMethod.POST)
public void getConfigList(PrintWriter out){
@@ -76,8 +85,11 @@
return;
}
+ int pageSize = Constant.PAGE_SIZE;
+
int count = configService.getCount(key, pageIndex);
- PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
JSONObject data = new JSONObject();
data.put("pe", pe);
@@ -97,8 +109,19 @@
* @param config
* @param out
*/
+ @RequestNoLogin()
@RequestMapping(value = "saveModify")
- public void saveModify(String callback, Config config, PrintWriter out) {
+ public void saveModify(String callback, Config config, Long uid, HttpServletResponse response, PrintWriter out) {
+
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "*");
+
+ AdminUser admin = adminUserService.selectByPrimaryKey(uid);
+ if (admin == null) {
+ out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
+ return;
+ }
+
Long id = config.getId();
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
@@ -111,9 +134,20 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
return;
}
- // key 涓嶅彲淇敼
- config.setKey(crentconfig.getKey());
- configService.update(config);
+
+ if (StringUtil.isNullOrEmpty(config.getName()) || StringUtil.isNullOrEmpty(config.getValue())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇存槑銆佹湁鏁堝�间笉鑳戒负绌�"));
+ return;
+ }
+
+ crentconfig.setName(config.getName());
+ crentconfig.setValue(config.getValue());
+
+ if (!StringUtil.isNullOrEmpty(config.getBeizhu())) {
+ crentconfig.setBeizhu(config.getBeizhu());
+ }
+
+ configService.update(crentconfig);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
} catch (Exception e) {
--
Gitblit v1.8.0