From 2550c2f19ed73305835906b47017dfd78521aa28 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 7 Jun 2017 11:29:35 +0800
Subject: [PATCH] commit

---
 .../web/controller/BasicConfigController.java      |  2 +-
 .../operate/web/facade/BasicConfigFacade.java      |  2 +-
 .../web/request/BasicConfigUpdateRequest.java      | 36 ++++++++++++++--------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
index d81d2d2..c021823 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
@@ -53,7 +53,7 @@ public class BasicConfigController extends BaseController {
     @RequestMapping(method = RequestMethod.PUT, value = "/basicConfig/{id}")
     @ResponseBody
     public BaseResponse updateOneBasicConfigById(@PathVariable("id")
-                                                 String id, @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) {
+                                                 String id, @RequestBody @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) {
         basicConfigUpdateRequest.setId(id);
         return basicConfigFacade.updateOneBasicConfig(basicConfigUpdateRequest);
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
index 195265a..7a4ef1f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
@@ -82,7 +82,7 @@ public class BasicConfigFacade {
         obj.setEnable(basicConfigUpdateRequest.getEnable());
         obj.setTypeId(basicConfigUpdateRequest.getTypeId());
         obj.setScore(basicConfigUpdateRequest.getScore());
-        obj.setDescribe(basicConfigUpdateRequest.getDescribe());
+        obj.setDescribe(basicConfigUpdateRequest.getDesc());
         BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
         basicConfigQuery.setId(basicConfigUpdateRequest.getId());
         basicConfigQuery.setYn(YnEnums.YES.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
index 8cbb041..87b5eaf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
@@ -1,24 +1,36 @@
 package com.lyms.platform.operate.web.request;
 
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
 
-import com.lyms.platform.common.core.annotation.form.Form;
-import com.lyms.platform.common.core.annotation.form.FormParam;
 
-@Form
 public class BasicConfigUpdateRequest {
     private String id;
 
-    @FormParam
 //    @NotEmpty(message = "名称不能为空.")
     private String name;
-
     private String code;
-    @FormParam
     private int enable;
     private String typeId;
     private Integer score;
-    private String describe;
+    private String desc;
+    private String parentId;
+    private List childConfigs;
+
+    public List getChildConfigs() {
+        return childConfigs;
+    }
+
+    public void setChildConfigs(List childConfigs) {
+        this.childConfigs = childConfigs;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 
     public String getTypeId() {
         return typeId;
@@ -36,12 +48,12 @@ public class BasicConfigUpdateRequest {
         this.score = score;
     }
 
-    public String getDescribe() {
-        return describe;
+    public String getDesc() {
+        return desc;
     }
 
-    public void setDescribe(String describe) {
-        this.describe = describe;
+    public void setDesc(String desc) {
+        this.desc = desc;
     }
 
     public int getEnable() {
-- 
1.8.3.1