From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 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 04136a4..1743487 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,23 +6,20 @@
import java.util.Map;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
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 org.yeshi.utils.JsonUtil;
-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.annotation.RequestNoLogin;
-
-import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.util.StringUtil;
@Controller
@RequestMapping("admin/new/api/v1/config")
@@ -84,8 +81,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);
@@ -105,19 +105,9 @@
* @param config
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "saveModify")
- 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", "*");
+ public void saveModify(String callback, Config config, PrintWriter out) {
- 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涓嶈兘涓虹┖"));
@@ -130,9 +120,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