Browse Source

加入小区楼保存协议

wuxw 7 years ago
parent
commit
f1a709ce85

+ 1 - 0
Api/src/main/java/com/java110/api/listener/AbstractServiceApiDataFlowListener.java

@@ -274,6 +274,7 @@ public abstract class AbstractServiceApiDataFlowListener implements ServiceDataF
      * 将rest 协议转为 订单协议
      *
      * @param businesses 多个业务
+     * @param headers 订单头信息
      * @return
      */
     protected JSONObject restToCenterProtocol(JSONArray businesses, Map<String, String> headers) {

+ 22 - 22
Api/src/main/java/com/java110/api/listener/community/CommunityMemberJoinedListener.java

@@ -22,7 +22,7 @@ import org.springframework.http.ResponseEntity;
  */
 @Java110Listener("communityMemberJoinedListener")
 public class CommunityMemberJoinedListener extends AbstractServiceApiDataFlowListener {
-    private final static Logger logger = LoggerFactory.getLogger(CommunityMemberJoinedListener.class);
+    private static Logger logger = LoggerFactory.getLogger(CommunityMemberJoinedListener.class);
 
 
     @Override
@@ -37,7 +37,7 @@ public class CommunityMemberJoinedListener extends AbstractServiceApiDataFlowLis
 
     @Override
     public void soService(ServiceDataFlowEvent event) {
-        logger.debug("ServiceDataFlowEvent : {}",event);
+        logger.debug("ServiceDataFlowEvent : {}", event);
 
         DataFlowContext dataFlowContext = event.getDataFlowContext();
         AppService service = event.getAppService();
@@ -49,55 +49,55 @@ public class CommunityMemberJoinedListener extends AbstractServiceApiDataFlowLis
         JSONObject paramObj = JSONObject.parseObject(paramIn);
 
         HttpHeaders header = new HttpHeaders();
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID,"-1");
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD,"D");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
         //添加商户
         businesses.add(addCommunityMember(paramObj));
 
-        JSONObject paramInObj = super.restToCenterProtocol(businesses,dataFlowContext.getRequestCurrentHeaders());
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders());
 
         //将 rest header 信息传递到下层服务中去
-        super.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+        super.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
 
-        ResponseEntity<String> responseEntity = this.callService(dataFlowContext,service.getServiceCode(),paramInObj);
+        ResponseEntity<String> responseEntity = this.callService(dataFlowContext, service.getServiceCode(), paramInObj);
 
         dataFlowContext.setResponseEntity(responseEntity);
     }
 
     /**
      * 添加小区成员
+     *
      * @param paramInJson
      * @return
      */
-    private JSONObject addCommunityMember(JSONObject paramInJson){
+    private JSONObject addCommunityMember(JSONObject paramInJson) {
 
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
-        business.put(CommonConstant.HTTP_SEQ,2);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL,CommonConstant.HTTP_INVOKE_MODEL_S);
+        business.put(CommonConstant.HTTP_SEQ, 2);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessCommunityMember = new JSONObject();
-        businessCommunityMember.put("communityMemberId","-1");
-        businessCommunityMember.put("communityId",paramInJson.getString("communityId"));
-        businessCommunityMember.put("memberId",paramInJson.getString("memberId"));
+        businessCommunityMember.put("communityMemberId", "-1");
+        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
+        businessCommunityMember.put("memberId", paramInJson.getString("memberId"));
         businessCommunityMember.put("memberTypeCd", paramInJson.getString("memberTypeCd"));
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember",businessCommunityMember);
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
 
         return business;
     }
 
     /**
      * 数据校验
-     * @param paramIn
      *
-     * "communityId": "7020181217000001",
-     *         "memberId": "3456789",
-     *         "memberTypeCd": "390001200001"
+     * @param paramIn "communityId": "7020181217000001",
+     *                "memberId": "3456789",
+     *                "memberTypeCd": "390001200001"
      */
-    private void validate(String paramIn){
-        Assert.jsonObjectHaveKey(paramIn,"communityId","请求报文中未包含communityId");
-        Assert.jsonObjectHaveKey(paramIn,"memberId","请求报文中未包含memberId");
-        Assert.jsonObjectHaveKey(paramIn,"memberTypeCd","请求报文中未包含memberTypeCd");
+    private void validate(String paramIn) {
+        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
+        Assert.jsonObjectHaveKey(paramIn, "memberId", "请求报文中未包含memberId");
+        Assert.jsonObjectHaveKey(paramIn, "memberTypeCd", "请求报文中未包含memberTypeCd");
     }
 
     @Override

+ 1 - 1
Api/src/main/java/com/java110/api/listener/floor/QueryFloorsListener.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@Java110Listener("QueryFloorsListener")
+@Java110Listener("queryFloorsListener")
 public class QueryFloorsListener extends AbstractServiceApiDataFlowListener {
 
     @Autowired

+ 128 - 0
Api/src/main/java/com/java110/api/listener/floor/SaveFloorListener.java

@@ -0,0 +1,128 @@
+package com.java110.api.listener.floor;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+import com.java110.api.listener.community.CommunityMemberJoinedListener;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * @ClassName SaveFloorListener
+ * @Description 保存小区楼信息
+ * @Author wuxw
+ * @Date 2019/4/26 14:51
+ * @Version 1.0
+ * add by wuxw 2019/4/26
+ **/
+
+@Java110Listener("saveFloorListener")
+public class SaveFloorListener extends AbstractServiceApiDataFlowListener {
+
+
+    //默认序列
+    private static final int DEFAULT_SEQ = 1;
+
+
+    private static Logger logger = LoggerFactory.getLogger(SaveFloorListener.class);
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_SAVE_FLOOR;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public void soService(ServiceDataFlowEvent event) {
+
+        logger.debug("ServiceDataFlowEvent : {}", event);
+
+        DataFlowContext dataFlowContext = event.getDataFlowContext();
+        AppService service = event.getAppService();
+
+        String paramIn = dataFlowContext.getReqData();
+
+        //校验数据
+        validate(paramIn);
+        JSONObject paramObj = JSONObject.parseObject(paramIn);
+
+        HttpHeaders header = new HttpHeaders();
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+        //添加商户
+        businesses.add(addFloor(paramObj));
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
+
+        ResponseEntity<String> responseEntity = this.callService(dataFlowContext, service.getServiceCode(), paramInObj);
+
+        dataFlowContext.setResponseEntity(responseEntity);
+
+    }
+
+
+    /**
+     * 添加小区楼信息
+     *
+     * @param paramInJson 接口调用放传入入参
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject addFloor(JSONObject paramInJson) {
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessFloor = new JSONObject();
+        businessFloor.put("floorId", "-1");
+        businessFloor.put("name", paramInJson.getString("name"));
+        businessFloor.put("remark", paramInJson.getString("remark"));
+        businessFloor.put("userId", paramInJson.getString("userId"));
+        businessFloor.put("floorNum", paramInJson.getString("floorNum"));
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloorInfo", businessFloor);
+
+        return business;
+    }
+
+    /**
+     * 数据校验
+     *
+     * @param paramIn "communityId": "7020181217000001",
+     *                "memberId": "3456789",
+     *                "memberTypeCd": "390001200001"
+     */
+    private void validate(String paramIn) {
+        Assert.jsonObjectHaveKey(paramIn, "name", "请求报文中未包含name");
+        Assert.jsonObjectHaveKey(paramIn, "userId", "请求报文中未包含userId");
+        Assert.jsonObjectHaveKey(paramIn, "floorNum", "请求报文中未包含floorNum");
+    }
+
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+}

+ 95 - 91
Api/src/main/java/com/java110/api/listener/store/SaveStoreServiceListener.java

@@ -37,41 +37,42 @@ public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener
     /**
      * 协议:
      * {
-     *
-     *     "businessStore": {
-     "storeId": "-1",
-     "userId": "用户ID",
-     "name": "齐天超时(王府井店)",
-     "address": "青海省西宁市城中区129号",
-     "password": "ERCBHDUYFJDNDHDJDNDJDHDUDHDJDDKDK",
-     "tel": "15897089471",
-     "storeTypeCd": "M",
-     "nearbyLandmarks": "王府井内",
-     "mapX": "101.801909",
-     "mapY": "36.597263"
-     },
-     "businessStoreAttr": [{
-     "storeId": "-1",
-     "attrId":"-1",
-     "specCd":"1001",
-     "value":"01"
-     }],
-     "businessStorePhoto":[{
-     "storePhotoId":"-1",
-     "storeId":"-1",
-     "storePhotoTypeCd":"T",
-     "photo":"12345678.jpg"
-     }],
-     "businessStoreCerdentials":[{
-     "storeCerdentialsId":"-1",
-     "storeId":"-1",
-     "credentialsCd":"1",
-     "value":"632126XXXXXXXX2011",
-     "validityPeriod":"有效期,长期有效请写3000/01/01",
-     "positivePhoto":"正面照片地址,1234567.jpg",
-     "negativePhoto":"反面照片地址,没有不填写"
-     }]
+     * <p>
+     * "businessStore": {
+     * "storeId": "-1",
+     * "userId": "用户ID",
+     * "name": "齐天超时(王府井店)",
+     * "address": "青海省西宁市城中区129号",
+     * "password": "ERCBHDUYFJDNDHDJDNDJDHDUDHDJDDKDK",
+     * "tel": "15897089471",
+     * "storeTypeCd": "M",
+     * "nearbyLandmarks": "王府井内",
+     * "mapX": "101.801909",
+     * "mapY": "36.597263"
+     * },
+     * "businessStoreAttr": [{
+     * "storeId": "-1",
+     * "attrId":"-1",
+     * "specCd":"1001",
+     * "value":"01"
+     * }],
+     * "businessStorePhoto":[{
+     * "storePhotoId":"-1",
+     * "storeId":"-1",
+     * "storePhotoTypeCd":"T",
+     * "photo":"12345678.jpg"
+     * }],
+     * "businessStoreCerdentials":[{
+     * "storeCerdentialsId":"-1",
+     * "storeId":"-1",
+     * "credentialsCd":"1",
+     * "value":"632126XXXXXXXX2011",
+     * "validityPeriod":"有效期,长期有效请写3000/01/01",
+     * "positivePhoto":"正面照片地址,1234567.jpg",
+     * "negativePhoto":"反面照片地址,没有不填写"
+     * }]
      * }
+     *
      * @param event
      */
     @Override
@@ -82,14 +83,14 @@ public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener
         DataFlowContext dataFlowContext = event.getDataFlowContext();
         AppService service = event.getAppService();
         String paramIn = dataFlowContext.getReqData();
-        Assert.isJsonObject(paramIn,"添加员工时请求参数有误,不是有效的json格式 "+paramIn);
+        Assert.isJsonObject(paramIn, "添加员工时请求参数有误,不是有效的json格式 " + paramIn);
 
         //校验json 格式中是否包含 name,email,levelCd,tel
-        Assert.jsonObjectHaveKey(paramIn,"businessStore","请求参数中未包含businessStore 节点,请确认");
+        Assert.jsonObjectHaveKey(paramIn, "businessStore", "请求参数中未包含businessStore 节点,请确认");
         JSONObject paramObj = JSONObject.parseObject(paramIn);
         HttpHeaders header = new HttpHeaders();
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID,"-1");
-        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD,"D");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
+        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
         JSONArray businesses = new JSONArray();
         //添加商户
         businesses.add(addStore(paramObj));
@@ -97,10 +98,10 @@ public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener
         businesses.add(addStaff(paramObj));
 
 
-        String paramInObj = super.restToCenterProtocol(businesses,dataFlowContext.getRequestCurrentHeaders()).toJSONString();
+        String paramInObj = super.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders()).toJSONString();
 
         //将 rest header 信息传递到下层服务中去
-        super.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+        super.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
 
         HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj, header);
         //http://user-service/test/sayHello
@@ -108,65 +109,66 @@ public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener
 
         //super.doResponse(dataFlowContext);
 
-        if(dataFlowContext.getResponseEntity().getStatusCode() != HttpStatus.OK){
+        if (dataFlowContext.getResponseEntity().getStatusCode() != HttpStatus.OK) {
             return;
         }
         String resData = dataFlowContext.getResponseEntity().getBody().toString();
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONArray.parseArray(resData).get(0).toString(), HttpStatus.OK);
         dataFlowContext.setResponseEntity(responseEntity);
         //如果不成功直接返回
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
-            return ;
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return;
         }
 
         //赋权
-        privilegeUserDefault(dataFlowContext,paramObj);
-
+        privilegeUserDefault(dataFlowContext, paramObj);
 
 
     }
 
     /**
      * 用户赋权
+     *
      * @return
      */
-    private void privilegeUserDefault(DataFlowContext dataFlowContext,JSONObject paramObj){
-        ResponseEntity responseEntity= null;
+    private void privilegeUserDefault(DataFlowContext dataFlowContext, JSONObject paramObj) {
+        ResponseEntity responseEntity = null;
         AppService appService = DataFlowFactory.getService(dataFlowContext.getAppId(), ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE);
-        if(appService == null){
-            responseEntity = new ResponseEntity<String>("当前没有权限访问"+ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE,HttpStatus.UNAUTHORIZED);
+        if (appService == null) {
+            responseEntity = new ResponseEntity<String>("当前没有权限访问" + ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE, HttpStatus.UNAUTHORIZED);
             dataFlowContext.setResponseEntity(responseEntity);
-            return ;
+            return;
         }
         String requestUrl = appService.getUrl();
         HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_SERVICE.toLowerCase(),ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE);
-        super.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+        header.add(CommonConstant.HTTP_SERVICE.toLowerCase(), ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE);
+        super.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
         JSONObject paramInObj = new JSONObject();
-        paramInObj.put("userId",paramObj.getJSONObject("businessStore").getString("userId"));
-        paramInObj.put("storeTypeCd",paramObj.getJSONObject("businessStore").getString("storeTypeCd"));
-        paramInObj.put("userFlag","admin");
+        paramInObj.put("userId", paramObj.getJSONObject("businessStore").getString("userId"));
+        paramInObj.put("storeTypeCd", paramObj.getJSONObject("businessStore").getString("storeTypeCd"));
+        paramInObj.put("userFlag", "admin");
         HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj.toJSONString(), header);
-        doRequest(dataFlowContext,appService,httpEntity);
+        doRequest(dataFlowContext, appService, httpEntity);
         responseEntity = dataFlowContext.getResponseEntity();
 
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
             dataFlowContext.setResponseEntity(responseEntity);
         }
     }
 
     /**
      * 添加商户
+     *
      * @param paramInJson
      * @return
      */
-    private JSONObject addStore(JSONObject paramInJson){
+    private JSONObject addStore(JSONObject paramInJson) {
         JSONObject business = JSONObject.parseObject("{}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_STORE_INFO);
-        business.put(CommonConstant.HTTP_SEQ,1);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL,CommonConstant.HTTP_INVOKE_MODEL_S);
+        business.put(CommonConstant.HTTP_SEQ, 1);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
 
-        business.put(CommonConstant.HTTP_BUSINESS_DATAS,refreshParamIn(paramInJson));
+        business.put(CommonConstant.HTTP_BUSINESS_DATAS, refreshParamIn(paramInJson));
 
         return business;
 
@@ -174,79 +176,81 @@ public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener
 
     /**
      * 添加员工
+     *
      * @param paramInJson
      * @return
      */
-    private JSONObject addStaff(JSONObject paramInJson){
+    private JSONObject addStaff(JSONObject paramInJson) {
 
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_STORE_USER);
-        business.put(CommonConstant.HTTP_SEQ,2);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL,CommonConstant.HTTP_INVOKE_MODEL_S);
+        business.put(CommonConstant.HTTP_SEQ, 2);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONArray businessStoreUsers = new JSONArray();
         JSONObject businessStoreUser = new JSONObject();
-        businessStoreUser.put("storeId","-1");
-        businessStoreUser.put("storeUserId","-1");
-        businessStoreUser.put("userId",paramInJson.getJSONObject("businessStore").getString("userId"));
-        businessStoreUser.put("relCd",StoreUserRelConstant.REL_ADMIN);
+        businessStoreUser.put("storeId", "-1");
+        businessStoreUser.put("storeUserId", "-1");
+        businessStoreUser.put("userId", paramInJson.getJSONObject("businessStore").getString("userId"));
+        businessStoreUser.put("relCd", StoreUserRelConstant.REL_ADMIN);
         businessStoreUsers.add(businessStoreUser);
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessStoreUser",businessStoreUsers);
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessStoreUser", businessStoreUsers);
 
         return business;
     }
 
     /**
      * 对请求报文处理
+     *
      * @param paramObj
      * @return
      */
-    private JSONObject refreshParamIn(JSONObject paramObj){
+    private JSONObject refreshParamIn(JSONObject paramObj) {
 
-        if(paramObj.containsKey("businessStore")){
+        if (paramObj.containsKey("businessStore")) {
             JSONObject businessStoreObj = paramObj.getJSONObject("businessStore");
-            businessStoreObj.put("storeId","-1");
-            if(!businessStoreObj.containsKey("password")){
+            businessStoreObj.put("storeId", "-1");
+            if (!businessStoreObj.containsKey("password")) {
                 String staffDefaultPassword = MappingCache.getValue(MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
-                Assert.hasLength(staffDefaultPassword,"映射表中未设置员工默认密码,请检查"+MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
-                businessStoreObj.put("password",staffDefaultPassword);
+                Assert.hasLength(staffDefaultPassword, "映射表中未设置员工默认密码,请检查" + MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
+                businessStoreObj.put("password", staffDefaultPassword);
             }
 
-            if(!businessStoreObj.containsKey("mapX")){
-                businessStoreObj.put("mapX","");
+            if (!businessStoreObj.containsKey("mapX")) {
+                businessStoreObj.put("mapX", "");
             }
 
-            if(!businessStoreObj.containsKey("mapY")){
-                businessStoreObj.put("mapY","");
+            if (!businessStoreObj.containsKey("mapY")) {
+                businessStoreObj.put("mapY", "");
             }
         }
 
-        if(paramObj.containsKey("businessStoreAttr")){
+        if (paramObj.containsKey("businessStoreAttr")) {
             JSONArray attrs = paramObj.getJSONArray("businessStoreAttr");
 
-            for (int businessStoreAttrIndex = 0 ;businessStoreAttrIndex < attrs.size();businessStoreAttrIndex ++ ){
+            for (int businessStoreAttrIndex = 0; businessStoreAttrIndex < attrs.size(); businessStoreAttrIndex++) {
                 JSONObject attr = attrs.getJSONObject(businessStoreAttrIndex);
-                attr.put("storeId","-1");
-                attr.put("attrId","-"+(businessStoreAttrIndex+1));
+                attr.put("storeId", "-1");
+                attr.put("attrId", "-" + (businessStoreAttrIndex + 1));
             }
         }
 
-        if(paramObj.containsKey("businessStorePhoto")){
+        if (paramObj.containsKey("businessStorePhoto")) {
             JSONArray photos = paramObj.getJSONArray("businessStorePhoto");
 
-            for (int businessStorePhotoIndex = 0 ;businessStorePhotoIndex < photos.size();businessStorePhotoIndex ++ ){
+            for (int businessStorePhotoIndex = 0; businessStorePhotoIndex < photos.size(); businessStorePhotoIndex++) {
                 JSONObject attr = photos.getJSONObject(businessStorePhotoIndex);
-                attr.put("storeId","-1");
-                attr.put("storePhotoId","-"+(businessStorePhotoIndex+1));
+                attr.put("storeId", "-1");
+                attr.put("storePhotoId", "-" + (businessStorePhotoIndex + 1));
             }
         }
 
-        if(paramObj.containsKey("businessStoreCerdentials")){
+        if (paramObj.containsKey("businessStoreCerdentials")) {
             JSONArray cerdentials = paramObj.getJSONArray("businessStoreCerdentials");
 
-            for (int businessStoreCerdentialsIndex = 0 ;businessStoreCerdentialsIndex < cerdentials.size();businessStoreCerdentialsIndex ++ ){
+            for (int businessStoreCerdentialsIndex = 0; businessStoreCerdentialsIndex < cerdentials.size(); businessStoreCerdentialsIndex++) {
                 JSONObject attr = cerdentials.getJSONObject(businessStoreCerdentialsIndex);
-                attr.put("storeId","-1");
-                attr.put("storeCerdentialsId","-"+(businessStoreCerdentialsIndex+1));
+                attr.put("storeId", "-1");
+                attr.put("storeCerdentialsId", "-" + (businessStoreCerdentialsIndex + 1));
             }
         }
 

+ 79 - 69
Api/src/main/java/com/java110/api/rest/RestApi.java

@@ -13,14 +13,17 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- *
  * rest api
  * Created by wuxw on 2018/10/16.
  */
@@ -29,167 +32,174 @@ import java.util.Map;
 @Api(value = "对外统一提供服务接口服务")
 public class RestApi extends BaseController {
 
-    private final static Logger logger = LoggerFactory.getLogger(RestApi.class);
+    private static Logger logger = LoggerFactory.getLogger(RestApi.class);
     @Autowired
     private IApiServiceSMO apiServiceSMOImpl;
 
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
     /**
      * 健康检查 服务
+     *
      * @return
      */
-    @RequestMapping(path = "/health",method = RequestMethod.GET)
-    @ApiOperation(value="服务健康检查", notes="test: 返回 2XX 表示服务正常")
-    public String health(){
+    @RequestMapping(path = "/health", method = RequestMethod.GET)
+    @ApiOperation(value = "服务健康检查", notes = "test: 返回 2XX 表示服务正常")
+    public String health() {
         return "";
     }
 
     /**
      * 健康检查 服务
+     *
      * @return
      */
-    @RequestMapping(path = "/checkUserServiceVersion",method = RequestMethod.GET)
-    @ApiOperation(value="检查用服务版本", notes="test: 返回 2XX 表示服务正常")
-    public String checkUserServiceVersion(){
+    @RequestMapping(path = "/checkUserServiceVersion", method = RequestMethod.GET)
+    @ApiOperation(value = "检查用服务版本", notes = "test: 返回 2XX 表示服务正常")
+    public String checkUserServiceVersion() {
         return userInnerServiceSMOImpl.getUserServiceVersion("test");
     }
 
 
     /**
      * 资源请求 post方式
-     * @param service 请求接口方式
+     *
+     * @param service  请求接口方式
      * @param postInfo post内容
-     * @param request 请求对象 查询头信息 url等信息
+     * @param request  请求对象 查询头信息 url等信息
      * @return http status 200 成功 其他失败
      */
 
-    @RequestMapping(path = "/{service:.+}",method = RequestMethod.POST )
-    @ApiOperation(value="资源post请求", notes="test: 返回 2XX 表示服务正常")
-    @ApiImplicitParam(paramType="query", name = "service", value = "用户编号", required = true, dataType = "String")
+    @RequestMapping(path = "/{service:.+}", method = RequestMethod.POST)
+    @ApiOperation(value = "资源post请求", notes = "test: 返回 2XX 表示服务正常")
+    @ApiImplicitParam(paramType = "query", name = "service", value = "用户编号", required = true, dataType = "String")
     public ResponseEntity<String> servicePost(@PathVariable String service,
                                               @RequestBody String postInfo,
-                                              HttpServletRequest request){
+                                              HttpServletRequest request) {
         ResponseEntity<String> responseEntity = null;
         try {
             Map<String, String> headers = new HashMap<String, String>();
             this.getRequestInfo(request, headers);
-            headers.put(CommonConstant.HTTP_SERVICE,service);
-            headers.put(CommonConstant.HTTP_METHOD,CommonConstant.HTTP_METHOD_POST);
-            logger.debug("api:{} 请求报文为:{},header信息为:{}",service,postInfo,headers);
-            responseEntity = apiServiceSMOImpl.service(postInfo,headers);
-        }catch (Throwable e){
-            logger.error("请求post 方法["+service+"]失败:"+postInfo,e);
-            responseEntity = new ResponseEntity<String>("请求发生异常,"+e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+            headers.put(CommonConstant.HTTP_SERVICE, service);
+            headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_POST);
+            logger.debug("api:{} 请求报文为:{},header信息为:{}", service, postInfo, headers);
+            responseEntity = apiServiceSMOImpl.service(postInfo, headers);
+        } catch (Throwable e) {
+            logger.error("请求post 方法[" + service + "]失败:" + postInfo, e);
+            responseEntity = new ResponseEntity<String>("请求发生异常," + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        logger.debug("api:{} 返回信息为:{}",service,responseEntity);
+        logger.debug("api:{} 返回信息为:{}", service, responseEntity);
 
         return responseEntity;
     }
 
     /**
      * 资源请求 get方式
+     *
      * @param service 请求接口方式
      * @param request 请求对象 查询头信息 url等信息
      * @return http status 200 成功 其他失败
      */
 
-    @RequestMapping(path = "/{service:.+}",method = RequestMethod.GET )
-    @ApiOperation(value="资源get请求", notes="test: 返回 2XX 表示服务正常")
-    @ApiImplicitParam(paramType="query", name = "service", value = "用户编号", required = true, dataType = "String")
+    @RequestMapping(path = "/{service:.+}", method = RequestMethod.GET)
+    @ApiOperation(value = "资源get请求", notes = "test: 返回 2XX 表示服务正常")
+    @ApiImplicitParam(paramType = "query", name = "service", value = "用户编号", required = true, dataType = "String")
     public ResponseEntity<String> serviceGet(@PathVariable String service,
-                                              HttpServletRequest request){
+                                             HttpServletRequest request) {
         ResponseEntity<String> responseEntity = null;
         try {
             Map<String, String> headers = new HashMap<String, String>();
             this.getRequestInfo(request, headers);
-            headers.put(CommonConstant.HTTP_SERVICE,service);
-            headers.put(CommonConstant.HTTP_METHOD,CommonConstant.HTTP_METHOD_GET);
-            logger.debug("api:{} 请求报文为:{},header信息为:{}","",headers);
-            responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)),headers);
-        }catch (Throwable e){
-            logger.error("请求get 方法["+service+"]失败:",e);
-            responseEntity = new ResponseEntity<String>("请求发生异常,"+e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+            headers.put(CommonConstant.HTTP_SERVICE, service);
+            headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
+            logger.debug("api:{} 请求报文为:{},header信息为:{}", "", headers);
+            responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
+        } catch (Throwable e) {
+            logger.error("请求get 方法[" + service + "]失败:", e);
+            responseEntity = new ResponseEntity<String>("请求发生异常," + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        logger.debug("api:{} 返回信息为:{}",service,responseEntity);
+        logger.debug("api:{} 返回信息为:{}", service, responseEntity);
 
         return responseEntity;
     }
 
     /**
      * 资源请求 put方式
-     * @param service 请求接口方式
+     *
+     * @param service  请求接口方式
      * @param postInfo 修改内容
-     * @param request 请求对象 查询头信息 url等信息
+     * @param request  请求对象 查询头信息 url等信息
      * @return http status 200 成功 其他失败
      */
 
-    @RequestMapping(path = "/{service:.+}",method = RequestMethod.PUT )
-    @ApiOperation(value="资源put请求", notes="test: 返回 2XX 表示服务正常")
-    @ApiImplicitParam(paramType="query", name = "service", value = "用户编号", required = true, dataType = "String")
+    @RequestMapping(path = "/{service:.+}", method = RequestMethod.PUT)
+    @ApiOperation(value = "资源put请求", notes = "test: 返回 2XX 表示服务正常")
+    @ApiImplicitParam(paramType = "query", name = "service", value = "用户编号", required = true, dataType = "String")
     public ResponseEntity<String> servicePut(@PathVariable String service,
                                              @RequestBody String postInfo,
-                                             HttpServletRequest request){
+                                             HttpServletRequest request) {
         ResponseEntity<String> responseEntity = null;
         try {
             Map<String, String> headers = new HashMap<String, String>();
             this.getRequestInfo(request, headers);
-            headers.put(CommonConstant.HTTP_SERVICE,service);
-            headers.put(CommonConstant.HTTP_METHOD,CommonConstant.HTTP_METHOD_PUT);
-            logger.debug("api:{} 请求报文为:{},header信息为:{}",service,postInfo,headers);
-            responseEntity = apiServiceSMOImpl.service(postInfo,headers);
-        }catch (Throwable e){
-            logger.error("请求put 方法["+service+"]失败:",e);
-            responseEntity = new ResponseEntity<String>("请求发生异常,"+e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+            headers.put(CommonConstant.HTTP_SERVICE, service);
+            headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_PUT);
+            logger.debug("api:{} 请求报文为:{},header信息为:{}", service, postInfo, headers);
+            responseEntity = apiServiceSMOImpl.service(postInfo, headers);
+        } catch (Throwable e) {
+            logger.error("请求put 方法[" + service + "]失败:", e);
+            responseEntity = new ResponseEntity<String>("请求发生异常," + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        logger.debug("api:{} 返回信息为:{}",service,responseEntity);
+        logger.debug("api:{} 返回信息为:{}", service, responseEntity);
         return responseEntity;
     }
 
     /**
      * 资源请求 delete方式
+     *
      * @param service 请求接口方式
      * @param request 请求对象 查询头信息 url等信息
      * @return http status 200 成功 其他失败
      */
 
-    @RequestMapping(path = "/{service:.+}",method = RequestMethod.DELETE )
-    @ApiOperation(value="资源delete请求", notes="test: 返回 2XX 表示服务正常")
-    @ApiImplicitParam(paramType="query", name = "service", value = "用户编号", required = true, dataType = "String")
+    @RequestMapping(path = "/{service:.+}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "资源delete请求", notes = "test: 返回 2XX 表示服务正常")
+    @ApiImplicitParam(paramType = "query", name = "service", value = "用户编号", required = true, dataType = "String")
     public ResponseEntity<String> serviceDelete(@PathVariable String service,
-                                             HttpServletRequest request){
+                                                HttpServletRequest request) {
         ResponseEntity<String> responseEntity = null;
         try {
             Map<String, String> headers = new HashMap<String, String>();
             this.getRequestInfo(request, headers);
-            headers.put(CommonConstant.HTTP_SERVICE,service);
-            headers.put(CommonConstant.HTTP_METHOD,CommonConstant.HTTP_METHOD_DELETE);
-            logger.debug("api:{} 请求报文为:{},header信息为:{}",service,"",headers);
-
-            responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)),headers);
-        }catch (Throwable e){
-            logger.error("请求delete 方法["+service+"]失败:",e);
-            responseEntity = new ResponseEntity<String>("请求发生异常,"+e.getMessage(),HttpStatus.INTERNAL_SERVER_ERROR);
+            headers.put(CommonConstant.HTTP_SERVICE, service);
+            headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_DELETE);
+            logger.debug("api:{} 请求报文为:{},header信息为:{}", service, "", headers);
+
+            responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
+        } catch (Throwable e) {
+            logger.error("请求delete 方法[" + service + "]失败:", e);
+            responseEntity = new ResponseEntity<String>("请求发生异常," + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
-        logger.debug("api:{} 返回信息为:{}",service,responseEntity);
+        logger.debug("api:{} 返回信息为:{}", service, responseEntity);
         return responseEntity;
     }
 
 
-
     /**
      * 获取请求信息
+     *
      * @param request
      * @param headers
      * @throws RuntimeException
      */
-    private void getRequestInfo(HttpServletRequest request,Map headers) throws Exception{
-        try{
-            super.initHeadParam(request,headers);
-            super.initUrlParam(request,headers);
-        }catch (Exception e){
-            logger.error("加载头信息失败",e);
+    private void getRequestInfo(HttpServletRequest request, Map headers) throws Exception {
+        try {
+            super.initHeadParam(request, headers);
+            super.initUrlParam(request, headers);
+        } catch (Exception e) {
+            logger.error("加载头信息失败", e);
             throw e;
         }
     }

+ 38 - 28
OrderService/src/main/java/com/java110/order/api/OrderApi.java

@@ -32,15 +32,20 @@ import java.util.Map;
 @RequestMapping(path = "/orderApi")
 public class OrderApi extends BaseController {
 
-    private final static Logger logger = LoggerFactory.getLogger(OrderApi.class);
+    private static Logger logger = LoggerFactory.getLogger(OrderApi.class);
 
     @Autowired
     private IOrderServiceSMO orderServiceSMOImpl;
 
-
-    @RequestMapping(path = "/service",method= RequestMethod.POST)
-    @ApiOperation(value="中心服务订单受理", notes="test: 返回 200 表示服务受理成功,其他表示失败")
-    @ApiImplicitParam(paramType="query", name = "orderInfo", value = "订单受理信息", required = true, dataType = "String")
+    /**
+     * 订单请求服务
+     * @param orderInfo 订单信息
+     * @param request 请求对象
+     * @return ResponseEntity 对象
+     */
+    @RequestMapping(path = "/service", method = RequestMethod.POST)
+    @ApiOperation(value = "中心服务订单受理", notes = "test: 返回 200 表示服务受理成功,其他表示失败")
+    @ApiImplicitParam(paramType = "query", name = "orderInfo", value = "订单受理信息", required = true, dataType = "String")
     public ResponseEntity<String> servicePost(@RequestBody String orderInfo, HttpServletRequest request) {
 
         ResponseEntity<String> responseEntity = null;
@@ -48,62 +53,67 @@ public class OrderApi extends BaseController {
         try {
             Map<String, String> headers = new HashMap<String, String>();
             getRequestInfo(request, headers);
-            logger.debug("订单服务请求报文为: {},请求头为:{}",orderInfo,headers);
+            logger.debug("订单服务请求报文为: {},请求头为:{}", orderInfo, headers);
             //接受请求事件
-            DataFlowEventPublishing.receiveRequest(orderInfo,headers);
+            DataFlowEventPublishing.receiveRequest(orderInfo, headers);
             //预校验
             preValiateOrderInfo(orderInfo);
-            responseEntity =  orderServiceSMOImpl.service(orderInfo, headers);
-        }catch (Exception e){
-            logger.error("请求订单异常",e);
-            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+            responseEntity = orderServiceSMOImpl.service(orderInfo, headers);
+        } catch (Exception e) {
+            logger.error("请求订单异常", e);
+            responseEntity = new ResponseEntity<String>("请求中心服务发生异常," + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        } finally {
 
-            logger.debug("订单服务返回报文为: {}",responseEntity);
+            logger.debug("订单服务返回报文为: {}", responseEntity);
             return responseEntity;
         }
     }
+
     /**
      * 这里预校验,请求报文中不能有 dataFlowId
+     *
      * @param orderInfo
      */
     private void preValiateOrderInfo(String orderInfo) {
 
-        Assert.jsonObjectHaveKey(orderInfo,"orders","请求报文中未包含orders节点,"+orderInfo);
+        Assert.jsonObjectHaveKey(orderInfo, "orders", "请求报文中未包含orders节点," + orderInfo);
 
-        Assert.jsonObjectHaveKey(orderInfo,"business","请求报文中未包含business节点,"+orderInfo);
+        Assert.jsonObjectHaveKey(orderInfo, "business", "请求报文中未包含business节点," + orderInfo);
 
-        if(JSONObject.parseObject(orderInfo).getJSONObject("orders").containsKey("dataFlowId")){
-            throw new BusinessException(ResponseConstant.RESULT_CODE_ERROR,"报文中不能存在dataFlowId节点");
+        if (JSONObject.parseObject(orderInfo).getJSONObject("orders").containsKey("dataFlowId")) {
+            throw new BusinessException(ResponseConstant.RESULT_CODE_ERROR, "报文中不能存在dataFlowId节点");
         }
     }
+
     /**
      * 这里预校验,请求报文中不能有 dataFlowId
+     *
      * @param orderInfo
      */
-    private void preValiateOrderInfo(String orderInfo,Map<String, String> headers) {
+    private void preValiateOrderInfo(String orderInfo, Map<String, String> headers) {
 
-        Assert.hasKey(headers,"serviceCode","没有包含serviceCode");
+        Assert.hasKey(headers, "serviceCode", "没有包含serviceCode");
 
-        Assert.hasLength(headers.get("serviceCode"),"serviceCode 不能为空");
+        Assert.hasLength(headers.get("serviceCode"), "serviceCode 不能为空");
 
-        Assert.hasKey(headers,"appId","没有包含appId");
+        Assert.hasKey(headers, "appId", "没有包含appId");
 
-        Assert.hasLength(headers.get("appId"),"appId 不能为空");
+        Assert.hasLength(headers.get("appId"), "appId 不能为空");
     }
 
     /**
      * 获取请求信息
+     *
      * @param request
      * @param headers
      * @throws RuntimeException
      */
-    private void getRequestInfo(HttpServletRequest request,Map headers) throws Exception{
-        try{
-            super.initHeadParam(request,headers);
-            super.initUrlParam(request,headers);
-        }catch (Exception e){
-            logger.error("加载头信息失败",e);
+    private void getRequestInfo(HttpServletRequest request, Map headers) throws Exception {
+        try {
+            super.initHeadParam(request, headers);
+            super.initUrlParam(request, headers);
+        } catch (Exception e) {
+            logger.error("加载头信息失败", e);
             throw e;
         }
     }

+ 2 - 2
OrderService/src/main/java/com/java110/order/smo/IOrderServiceSMO.java

@@ -16,12 +16,12 @@ public interface IOrderServiceSMO {
      * @param reqJson 请求报文json
      * @return
      */
-    public ResponseEntity<String> service(String reqJson, Map<String, String> headers) throws SMOException;
+     ResponseEntity<String> service(String reqJson, Map<String, String> headers) throws SMOException;
 
     /**
      * 接受业务系统通知消息
      * @param receiveJson 接受报文
      * @throws SMOException
      */
-    public void receiveBusinessSystemNotifyMessage(String receiveJson) throws SMOException;
+     void receiveBusinessSystemNotifyMessage(String receiveJson) throws SMOException;
 }

+ 18 - 16
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java

@@ -2,10 +2,10 @@ package com.java110.web.smo.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.common.constant.PrivilegeCodeConstant;
+import com.java110.common.constant.ResponseConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.exception.SMOException;
 import com.java110.common.util.Assert;
-import com.java110.common.util.StringUtil;
 import com.java110.core.context.IPageData;
 import com.java110.web.core.BaseComponentSMO;
 import com.java110.web.smo.IFloorServiceSMO;
@@ -27,7 +27,9 @@ import org.springframework.web.client.RestTemplate;
 @Service("floorServiceSMOImpl")
 public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServiceSMO {
 
-    private  static Logger logger = LoggerFactory.getLogger(FloorServiceSMOImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(FloorServiceSMOImpl.class);
+
+    private static final int MAX_ROW = 50;
 
     @Autowired
     private RestTemplate restTemplate;
@@ -62,10 +64,11 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
         String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
         //数据校验是否 商户是否入驻该小区
-        super.checkStoreEnterCommunity(pd,storeId,storeTypeCd,communityId,restTemplate);
+        super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
 
         responseEntity = this.callCenterService(restTemplate, pd, "",
-                    ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId=" + communityId , HttpMethod.GET);
+                ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId=" + communityId,
+                HttpMethod.GET);
 
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return responseEntity;
@@ -94,8 +97,7 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
         String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
         //数据校验是否 商户是否入驻该小区
-        super.checkStoreEnterCommunity(pd,storeId,storeTypeCd,communityId,restTemplate);
-
+        super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
 
 
         return null;
@@ -103,13 +105,14 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
 
     /**
      * 校验保存小区楼 信息
-     * @param pd
+     *
+     * @param pd 页面数据封装
      */
-    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","未包含小区备注");
+    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", "未包含小区备注");
     }
 
     /**
@@ -124,13 +127,12 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         Assert.isInteger(paramIn.getString("page"), "page不是数字");
         Assert.isInteger(paramIn.getString("rows"), "rows不是数字");
-        Assert.hasLength(paramIn.getString("communityId"),"小区ID不能为空");
+        Assert.hasLength(paramIn.getString("communityId"), "小区ID不能为空");
         int rows = Integer.parseInt(paramIn.getString("rows"));
 
 
-
-        if (rows > 50) {
-            throw new SMOException(1999, "rows 数量不能大于50");
+        if (rows > MAX_ROW) {
+            throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "rows 数量不能大于50");
         }
 
     }

+ 1 - 0
docs/_sidebar.md

@@ -19,6 +19,7 @@
   * [小区成员入驻](api/community/communityMemberJoined.md)
   * [小区成员退出](api/community/communityMemberQuit.md)
   * [查询小区楼信息](api/floor/queryFloors.md)
+  * [添加小区楼信息](api/floor/saveFloor.md)
 
 * 服务端接口协议
 

+ 65 - 0
docs/api/floor/saveFloor.md

@@ -0,0 +1,65 @@
+
+
+**1\. 添加小区楼信息**
+###### 接口功能
+> 用户通过web端或APP添加小区楼信息接口
+
+###### URL
+> [http://api.java110.com:8008/api/floor.saveFloor](http://api.java110.com:8008/api/floor.saveFloor)
+
+###### 支持格式
+> 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|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+###### 举例
+> 地址:[http://api.java110.com:8008/api/floor.saveFloor](http://api.java110.com:8008/api/floor.saveFloor)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文:
+
+无
+
+返回报文:
+{
+
+    "name": "3号楼01",
+    "floorNum": "003",
+    "userId": "123213213",
+    "remark":"备注"
+
+}
+
+```

+ 3 - 0
java110-common/src/main/java/com/java110/common/constant/ServiceCodeConstant.java

@@ -358,5 +358,8 @@ public class ServiceCodeConstant {
     //查询小区楼
     public static final String SERVICE_CODE_QUERY_FLOOR = "floor.queryFloors";
 
+    // 保存小区楼信息
+    public static final String SERVICE_CODE_SAVE_FLOOR = "floor.saveFloor";
+
 
 }