From e1cc0d03fadc2d251d36c0dc3650f75e830d5363 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 四月 2022 19:12:42 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java
index fa7ad43..e8283b8 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/config/SystemConfigAdminController.java
@@ -2,8 +2,12 @@
import com.google.gson.*;
import com.yeshi.makemoney.app.entity.config.SystemConfig;
+import com.yeshi.makemoney.app.entity.config.SystemConfigKey;
+import com.yeshi.makemoney.app.entity.config.SystemConfigType;
import com.yeshi.makemoney.app.service.inter.config.SystemConfigService;
import com.yeshi.makemoney.app.service.query.config.SystemConfigQuery;
+import com.yeshi.makemoney.app.vo.AcceptAdminData;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,15 +29,15 @@
private SystemConfigService systemConfigService;
- private String loadPrint(String callback, String root){
- return root;
+ private String loadPrint(String callback, String root) {
+ return root;
}
@ResponseBody
@RequestMapping("list")
public String list(SystemConfigQuery query, int page, int limit, String callback) {
- List<SystemConfig> list = systemConfigService.list(query,page,limit);
- long count = systemConfigService.count(query);
+ List<SystemConfig> list = systemConfigService.listByType(SystemConfigType.common);
+ long count = list.size();
JSONObject data = new JSONObject();
Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -50,11 +54,12 @@
@ResponseBody
@RequestMapping("add")
- public String add(SystemConfig bean, HttpSession session, String callback) {
- try{
+ public String add(SystemConfig bean, AcceptAdminData acceptAdminData, String callback) {
+ try {
+ bean.setSystem(acceptAdminData.getSystem());
systemConfigService.add(bean);
return loadPrint(callback, JsonUtil.loadTrueResult(""));
- }catch(Exception e){
+ } catch (Exception e) {
return loadPrint(callback, JsonUtil.loadFalseResult(e.getMessage()));
}
}
@@ -63,7 +68,7 @@
@RequestMapping("get")
public String get(String id, HttpSession session, String callback) {
SystemConfig entity = systemConfigService.get(id);
- if (entity !=null){
+ if (entity != null) {
return loadPrint(callback, JsonUtil.loadTrueResult(entity));
} else {
return loadPrint(callback, JsonUtil.loadFalseResult("ID涓嶅瓨鍦�"));
@@ -73,17 +78,33 @@
@ResponseBody
@RequestMapping("update")
- public String update(SystemConfig bean, HttpSession session,String callback) {
+ public String update(SystemConfig bean, HttpSession session, String callback) {
if (bean.getId() == null) {
return loadPrint(callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
}
- try{
+ try {
systemConfigService.update(bean);
- }catch(Exception e){
+ } catch (Exception e) {
return loadPrint(callback, JsonUtil.loadFalseResult(e.getMessage()));
}
return loadPrint(callback, JsonUtil.loadTrueResult(""));
}
+ @ResponseBody
+ @RequestMapping("getKeyList")
+ public String getKeyList() {
+ JSONArray array = new JSONArray();
+ for (SystemConfigKey key : SystemConfigKey.values()) {
+ if (key.getType() == SystemConfigType.common) {
+ JSONObject data = new JSONObject();
+ data.put("key", key.name());
+ data.put("value", key.getDesc());
+ array.add(data);
+ }
+ }
+ return JsonUtil.loadTrueResult(array);
+ }
+
+
}
--
Gitblit v1.8.0