From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 52 ++++++----------------------------------------------
1 files changed, 6 insertions(+), 46 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 2a0da58..f48680f 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,24 +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.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
-
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("admin/new/api/v1/config")
@@ -32,35 +28,6 @@
@Resource
private ConfigService configService;
- @Resource
- private AdminUserService adminUserService;
-
-
- @RequestMapping(value = "getConfigList", method = RequestMethod.POST)
- public void getConfigList(PrintWriter out){
- List<Config> configList = configService.getAllList();
- out.print(JsonUtil.loadTrueResult(configList));
- }
-
- @RequestMapping(value = "updateConfig", method = RequestMethod.POST)
- public void updateConfig(String map, PrintWriter out) {
- List<Config> list = configService.getAllList();
- List<Config> newList = new ArrayList<Config>();
- Map<String, String> data = JsonUtil.parseData(map);
- for (Config config : list) {
- String key = config.getKey();
- if(data.containsKey(key)){
- String value =data.get(key);
- if(!config.getValue().equals(value)){
- config.setValue(value);
- newList.add(config);
- }
- }
- }
- configService.update(newList);
- out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
- return;
- }
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
@@ -85,8 +52,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);
@@ -106,19 +76,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涓嶈兘涓虹┖"));
--
Gitblit v1.8.0