加入申请退出小区

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

@@ -3,11 +3,9 @@ package com.java110.api.listener.community;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
-import com.java110.api.listener.property.CheckStaffHasPropertyListener;
 import com.java110.common.constant.BusinessTypeConstant;
 import com.java110.common.constant.CommonConstant;
 import com.java110.common.constant.ServiceCodeConstant;
-import com.java110.common.constant.StoreUserRelConstant;
 import com.java110.common.util.Assert;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
@@ -17,7 +15,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 /**

Api/src/main/java/com/java110/api/listener/community/CommunityMemberQuitListener.java

@@ -0,0 +1,127 @@
+package com.java110.api.listener.community;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+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.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 小区成员退出
+ */
+@Java110Listener("communityMemberQuitListener")
+public class CommunityMemberQuitListener extends AbstractServiceApiDataFlowListener {
+    private final static Logger logger = LoggerFactory.getLogger(CommunityMemberQuitListener.class);
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_MEMBER_QUIT_COMMUNITY;
+    }
+
+    @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);
+
+        //根据 memberId communityId memberTypeCd  query.myCommunity.byMember
+
+        ResponseEntity<String> responseEntity = super.callService(dataFlowContext,"query.myCommunity.byMember",paramObj);
+
+        if(responseEntity.getStatusCode() != HttpStatus.OK){
+            dataFlowContext.setResponseEntity(responseEntity);
+            return ;
+        }
+
+        JSONArray communityMemberInfos = JSONObject.parseObject(responseEntity.getBody().toString()).getJSONArray("communitys");
+        Assert.listIsNull(communityMemberInfos,"当前没有任何小区信息"+paramIn);
+        String communityMemberId = "";
+        for(int _communityMemberIndex = 0 ;_communityMemberIndex < communityMemberInfos.size();_communityMemberIndex++){
+
+            if(communityMemberInfos.getJSONObject(_communityMemberIndex).getString("communityId").equals(paramObj.getString("communityId"))){
+                communityMemberId = communityMemberInfos.getJSONObject(_communityMemberIndex).getString("communityMemberId");
+                break;
+            }
+        }
+
+        Assert.hasLength(communityMemberId,"不存在当前数据"+paramIn);
+
+        paramObj.put("communityMemberId",communityMemberId);
+        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(deleteCommunityMember(paramObj));
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses,dataFlowContext.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+
+         responseEntity = this.callService(dataFlowContext,service.getServiceCode(),paramInObj);
+
+        dataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    /**
+     * 数据校验
+     * @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");
+    }
+
+    /**
+     * 添加小区成员
+     * @param paramInJson
+     * @return
+     */
+    private JSONObject deleteCommunityMember(JSONObject paramInJson){
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_QUIT_COMMUNITY);
+        business.put(CommonConstant.HTTP_SEQ,2);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL,CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessCommunityMember = new JSONObject();
+        businessCommunityMember.put("communityMemberId",paramInJson.getString("communityMemberId"));
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember",businessCommunityMember);
+
+        return business;
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+}

CommunityService/src/main/java/com/java110/community/listener/MemberQuitCommunityListener.java

@@ -82,7 +82,7 @@ public class MemberQuitCommunityListener extends AbstractCommunityBusinessServic
         //小区信息
         Map businessCommunityMember = communityServiceDaoImpl.getBusinessCommunityMember(info);
         if( businessCommunityMember != null && !businessCommunityMember.isEmpty()) {
-            flushBusinessCommunityMember(businessCommunityMember,StatusConstant.STATUS_CD_INVALID);
+            flushBusinessCommunityMember(businessCommunityMember,StatusConstant.STATUS_CD_AUDIT_INVALID);
             communityServiceDaoImpl.updateCommunityMemberInstance(businessCommunityMember);
             dataFlowContext.addParamOut("communityMemberId",businessCommunityMember.get("member_community_id"));
         }

StoreService/src/main/java/com/java110/store/api/StoreApi.java

@@ -37,7 +37,7 @@ public class StoreApi extends BaseController {
     }
 
     /**
-     * 用户服务统一处理接口
+     * 商户服务统一处理接口
      * @param orderInfo
      * @param request
      * @return

WebService/src/main/java/com/java110/web/components/community/storeExitCommunityComponent.java

@@ -0,0 +1,44 @@
+package com.java110.web.components.community;
+
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.ICommunityServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 商户退出组件
+ */
+@Component("storeExitCommunity")
+public class storeExitCommunityComponent {
+
+    @Autowired
+    private ICommunityServiceSMO communityServiceSMOImpl;
+
+    /**
+     * 商户退出组件
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> exit(IPageData pd){
+        ResponseEntity<String> responseEntity = null;
+        try{
+            responseEntity =  communityServiceSMOImpl.exitCommunity(pd);
+        }catch (Exception e){
+            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }finally {
+            return responseEntity;
+        }
+    }
+
+
+    public ICommunityServiceSMO getCommunityServiceSMOImpl() {
+        return communityServiceSMOImpl;
+    }
+
+    public void setCommunityServiceSMOImpl(ICommunityServiceSMO communityServiceSMOImpl) {
+        this.communityServiceSMOImpl = communityServiceSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/ICommunityServiceSMO.java

@@ -30,4 +30,11 @@ public interface ICommunityServiceSMO {
      * @return
      */
     public ResponseEntity<String> _saveEnterCommunity(IPageData pd);
+
+    /**
+     * 退出小区
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> exitCommunity(IPageData pd);
 }

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

@@ -144,6 +144,43 @@ public class CommunityServiceSMOImpl extends BaseComponentSMO implements ICommun
         return responseEntity;
     }
 
+    /**
+     * 退出小区
+     * @param pd
+     * @return
+     */
+    @Override
+    public ResponseEntity<String> exitCommunity(IPageData pd) {
+        ResponseEntity<String> responseEntity = null;
+        Assert.jsonObjectHaveKey(pd.getReqData(),"communityId","请求信息中未包含communityId");
+        JSONObject _paramObj = JSONObject.parseObject(pd.getReqData());
+
+        String communityId = _paramObj.getString("communityId");
+
+        Assert.hasLength(communityId,"请求报文中communityId为空");
+
+        //权限校验
+        checkUserHasPrivilege(pd,restTemplate, PrivilegeCodeConstant.PRIVILEGE_ENTER_COMMUNITY);
+        responseEntity = super.getStoreInfo(pd,restTemplate);
+        if(responseEntity.getStatusCode() != HttpStatus.OK){
+            return responseEntity;
+        }
+        Assert.jsonObjectHaveKey(responseEntity.getBody().toString(),"storeId","根据用户ID查询商户ID失败，未包含storeId节点");
+
+        String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+        String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+        JSONObject paramInObj = new JSONObject();
+        paramInObj.put("communityId",communityId);
+        paramInObj.put("memberId",storeId);
+        paramInObj.put("memberTypeCd",MappingCache.getValue(MappingConstant.DOMAIN_STORE_TYPE_2_COMMUNITY_MEMBER_TYPE,storeTypeCd));
+
+        responseEntity = this.callCenterService(restTemplate, pd, _paramObj.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/member.quit.community",
+                HttpMethod.POST);
+
+        return responseEntity;
+    }
+
 
     private void freshCommunityAttr(JSONArray community){
         for(int _communityIndex = 0 ;_communityIndex < community.size();_communityIndex++){

WebService/src/main/resources/components/enter-community/enterCommunity.html

@@ -51,8 +51,8 @@
                                 {{community.statusCd == 0 ? '在用': '审核中'}}
                             </td>
                             <td class="text-right">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openExitCommunityModel(community)">退出</button>
+                                <div class="btn-group" v-if="community.statusCd == 0">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openExitCommunityModel(community)">申请退出</button>
                                 </div>
                             </td>
                         </tr>
@@ -71,5 +71,6 @@
         </div>
     </div>
     <vc:create name="storeEnterCommunity"></vc:create>
+    <vc:create name="storeExitCommunity"></vc:create>
 
 </div>

WebService/src/main/resources/components/enter-community/enterCommunity.js

@@ -38,8 +38,8 @@
             _openEnterCommunityModal:function(){
                 vc.emit('storeEnterCommunity','openStoreEnterCommunity',{});
             },
-            _openDeleteStaffPrivilegeModel:function(_community){
-
+            _openExitCommunityModel:function(_community){
+                vc.emit('storeExitCommunity','openStoreExitCommunityModal',_community);
             }
         }
     });

WebService/src/main/resources/components/store-enter-community/storeEnterCommunity.js

@@ -79,7 +79,8 @@
                               },
                              function(json,res){
                                 if(res.status == 200){
-                                    vc.jumpToPage("/flow/login");
+                                    vc.emit('enterCommunity','listMyCommunity',{
+                                    })
                                     return ;
                                 }
                                 vc.component.storeEnterCommunityInfo.errorInfo = json;

WebService/src/main/resources/components/store_exit_community/storeExitCommunity.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="storeExitCommunityModal" tabindex="-1" role="dialog" aria-labelledby="storeExitCommunityModelLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确认退出小区，退出后不可恢复!</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeStoreExitCommunityModal()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteExitCommunity()">确认</button>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/store_exit_community/storeExitCommunity.js

@@ -0,0 +1,45 @@
+(function(vc){
+    vc.extends({
+        data:{
+            storeExitCommunityInfo:{
+                communityInfo:{}
+            }
+        },
+        _initEvent:function(){
+             vc.on('storeExitCommunity','openStoreExitCommunityModal',function(_communityInfo){
+                    vc.component.storeExitCommunityInfo.communityInfo = _communityInfo;
+                    $('#storeExitCommunityModal').modal('show');
+                });
+        },
+        methods:{
+            closeStoreExitCommunityModal:function(){
+                $('#storeExitCommunityModal').modal('hide');
+            },
+            deleteExitCommunity:function(){
+                console.log("开始删除工号：",vc.component.storeExitCommunityInfo);
+                vc.http.post(
+                    'storeExitCommunity',
+                    'exit',
+                    JSON.stringify(vc.component.storeExitCommunityInfo.communityInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#deleteStaffModel').modal('hide');
+                            vc.component.$emit('deleteStaff_reload_event',{});
+                            return ;
+                        }
+                        vc.component.deleteStaffInfo.errorInfo = json;
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.component.deleteStaffInfo.errorInfo = errInfo;
+                     });
+            }
+        }
+    });
+})(window.vc);

docs/_sidebar.md

@@ -32,7 +32,8 @@
   * [评论服务接口测试文档](services/comment/comment_test.md)
   * [编码生成服务接口协议](services/code/code)
   * [编码生成服务接口测试文档](services/code/code_test)
-  * [小区成员入驻](services/community/community.md)
+  * [小区成员入驻](services/community/communityMemberJoined.md)
+  * [小区成员退出](services/community/communityMemberQuit.md)
 
 * 工具类接口
 

docs/api/community/communityMemberExit.md

@@ -0,0 +1,61 @@
+
+
+**1\. 小区成员退出**
+###### 接口功能
+> 用户通过web端或APP物业代理商等退出小区中接口
+
+###### URL
+> [http://api.java110.com:8008/api/member.quit.community](http://api.java110.com:8008/api/member.quit.community)
+
+###### 支持格式
+> 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|
+
+###### 请求参数(body部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|memberId|1|String|30|小区成员ID|-|
+|communityId|1|String|30|小区ID|-|
+|memberTypeCd|1|String|12|成员角色|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+
+###### 举例
+> 地址：[http://api.java110.com:8008/api/member.quit.community](http://api.java110.com:8008/api/member.quit.community)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文：
+
+无
+
+返回报文：
+{
+	"memberId": "390001200001",
+	"communityId": "1234444",
+	"memberTypeCd": "12221222"
+}
+
+```

docs/services/community/communityMemberQuit.md

@@ -0,0 +1,113 @@
+
+
+**1\. 小区成员纳入**
+###### 接口功能
+> API服务做小区成员退出时调用该接口
+
+###### URL
+> [http://community-service/communityApi/service](http://community-service/communityApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessCommunityMember|1|Object|-|小区成员|小区成员|
+|businessCommunityMember|communityMemberId|1|String|30|小区成员ID|小区成员ID|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+
+
+
+###### 举例
+> 地址：[http://community-service/communityApi/service](http://community-service/communityApi/service)
+
+``` javascript
+请求头信息：
+Content-Type:application/json
+
+请求报文：
+
+{
+  "orders": {
+    "appId": "外系统ID，分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "500100040002",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessCommunityMember": {
+        "communityMemberId": "123123213"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文：
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

java110-common/src/main/java/com/java110/common/constant/StatusConstant.java

@@ -39,6 +39,18 @@ public class StatusConstant {
      */
     public final static String STATUS_CD_INVALID = "1";
 
+
+    /**
+     * 有效的，在用的
+     */
+    public final static String STATUS_CD_AUDIT_VALID = "1000";
+
+
+    /**
+     * 无效的，不在用的
+     */
+    public final static String STATUS_CD_AUDIT_INVALID = "1001";
+
     public final static String REQUEST_BUSINESS_TYPE = "Q";
     public final static String REQUEST_BUSINESS_TYPE_BUSINESS = "B";
     public final static String REQUEST_BUSINESS_TYPE_INSTANCE = "I";

java110-config/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -244,7 +244,7 @@
     <!-- 小区成员加入 instance表中 add by wuxw 2018-10-27 -->
     <insert id="saveCommunityMemberInstance" parameterType="Map">
         insert into s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd)
-        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'0'
+        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'1000'
         from business_community_member ms where
         ms.operate = 'ADD' and ms.b_id=#{bId}
     </insert>