修改小区楼bug floorName 未转换为name问题处理，同时加入编辑小区楼文档

Api/src/main/java/com/java110/api/listener/floor/EditFloorListener.java

@@ -84,7 +84,7 @@ public class EditFloorListener extends AbstractServiceApiDataFlowListener {
      */
     private void validate(String paramIn) {
         Assert.jsonObjectHaveKey(paramIn, "floorId", "请求报文中未包含floorId");
-        Assert.jsonObjectHaveKey(paramIn, "floorName", "请求报文中未包含floorName");
+        Assert.jsonObjectHaveKey(paramIn, "name", "请求报文中未包含name");
         Assert.jsonObjectHaveKey(paramIn, "userId", "请求报文中未包含userId");
         Assert.jsonObjectHaveKey(paramIn, "floorNum", "请求报文中未包含floorNum");
         Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");

Readme.md

@@ -36,11 +36,11 @@ Java + spring cloud + mybatis + mysql + kafka + redis
 
 [视频](https://pan.baidu.com/s/1hnw5u-rnsZrLJjzMVrhI6A)
 
-### 接口接口协议
+### 接口协议
 
-1. [openApi协议](docs/api/Readme.md)
+1. [Api协议](https://www.java110.com/#/api/user/register)
 
-2. [后台协议](docs/services/Readme.md)
+2. [后台协议](https://www.java110.com/#/dictionary)
 
 ### 运行效果（view）
 1.在浏览器输入 https://localhost:8443/ 如下图
@@ -53,6 +53,8 @@ Java + spring cloud + mybatis + mysql + kafka + redis
     
 ![image](WebService/doc/img/staff.png)
 
+![image](WebService/doc/img/community.png)
+
 2.数据模型图
 ![image](dataModel.png)
 

WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java

@@ -137,6 +137,7 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         //数据校验是否 商户是否入驻该小区
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
         paramIn.put("userId", pd.getUserId());
+        paramIn.put("name", paramIn.getString("floorName"));
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/floor.editFloor",
                 HttpMethod.POST);
@@ -151,9 +152,9 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
      */
     private void validateSaveFloor(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "未包含小区ID");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "name", "未包含小区名称");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "floorNum", "未包含小区编码");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区备注");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "floorName", "未包含小区楼名称");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "floorNum", "未包含小区楼编码");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "remark", "未包含小区楼备注");
     }
 
     /**

WebService/src/main/resources/components/edit-floor/editFloor.html

@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加小区楼</h3>
+                <h3 class="m-t-none m-b ">修改小区楼</h3>
                 <div class="ibox-content">
                     <div>
                         <p style="color:red;">{{editFloorInfo.errorInfo}}</p>
@@ -20,7 +20,7 @@
                                 <div class="col-sm-10"><input v-model="editFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
                             </div>
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editFloorInfo()" ><i class="fa fa-check"></i>&nbsp;修改</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editFloorMethod()" ><i class="fa fa-check"></i>&nbsp;修改</button>
                                 <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
                             </div>
                         </div>

WebService/src/main/resources/components/edit-floor/editFloor.js

@@ -15,7 +15,8 @@
          },
          _initEvent:function(){
             vc.on('editFloor','openEditFloorModal',function(_floor){
-                vc.component.editFloorInfo = _floor;
+                vc.component.editFloorInfo.errorInfo="";
+                vc.copyObject(_floor,vc.component.editFloorInfo);
                 $('#editFloorModel').modal('show');
             });
         },
@@ -59,7 +60,7 @@
 
                 });
             },
-            saveFloorInfo:function(){
+            editFloorMethod:function(){
 
                 if(!vc.component.editFloorValidate()){
                     vc.component.editFloorInfo.errorInfo = vc.validate.errInfo;

WebService/src/main/resources/static/js/core.js

@@ -173,6 +173,16 @@
         window.localStorage.clear();
     };
 
+    //将org 对象的属性值赋值给dst 属性名为一直的属性
+    vc.copyObject = function(org,dst){
+        //for(key in Object.getOwnPropertyNames(dst)){
+        for(var key in dst){
+            if (org.hasOwnProperty(key)){
+                dst[key] = org[key]
+            }
+        }
+    }
+
 
 
 })(window.vc);

docs/api/floor/editFloor.md

@@ -0,0 +1,67 @@
+
+
+**1\. 修改小区楼信息**
+###### 接口功能
+> 用户通过web端或APP修改小区楼信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/floor.editFloor](http://api.java110.com:8008/api/floor.editFloor)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数(url部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|floorId|1|String|30|楼ID|-|
+|name|1|String|200|楼名称|001号 002号|
+|floorNum|1|String|12|小区楼编码|如 001 002|
+|remark|?|String|200|备注|-|
+|userId|1|String|30|创建员工ID|-|
+|communityId|1|String|30|小区ID|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/floor.editFloor](http://api.java110.com:8008/api/floor.editFloor)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+无
+
+返回报文：
+{
+    "floorId":"1234567890",
+    "name": "3号楼01",
+    "floorNum": "003",
+    "userId": "123213213",
+    "remark":"备注",
+    "communityId":"小区ID"
+
+}
+
+```