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 | 53 ++++++++++++++++++++++-------------------------------
1 files changed, 22 insertions(+), 31 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..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
@@ -12,13 +12,14 @@
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.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 org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.util.StringUtil;
@Controller
@RequestMapping("admin/new/api/v1/config")
@@ -27,31 +28,6 @@
@Resource
private ConfigService configService;
- @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;
- }
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
@@ -76,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);
@@ -99,6 +78,7 @@
*/
@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涓嶈兘涓虹┖"));
@@ -111,9 +91,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