统一审核 状态

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

@@ -83,7 +83,7 @@ public class CommunityMemberJoinedListener extends AbstractServiceApiDataFlowLis
         businessCommunityMember.put("memberId", paramInJson.getString("memberId"));
         businessCommunityMember.put("memberTypeCd", paramInJson.getString("memberTypeCd"));
         String auditStatusCd = MappingCache.getValue(MappingConstant.DOMAIN_COMMUNITY_MEMBER_AUDIT, paramInJson.getString("memberTypeCd"));
-        auditStatusCd = StringUtils.isEmpty(auditStatusCd) ? StatusConstant.STATUS_CD_AUDIT_COMPLETE : auditStatusCd;
+        auditStatusCd = StringUtils.isEmpty(auditStatusCd) ? StateConstant.AGREE_AUDIT : auditStatusCd;
         businessCommunityMember.put("auditStatusCd", auditStatusCd);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
 

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

@@ -76,7 +76,7 @@ public class SaveCommunityListener extends AbstractServiceApiListener {
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", paramInJson.getString("storeId"));
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.AGENT);
-        businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
+        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
         businesses.add(business);
 
@@ -91,7 +91,7 @@ public class SaveCommunityListener extends AbstractServiceApiListener {
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", "400000000000000001");
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OPT);
-        businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
+        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
         businesses.add(business);
 
@@ -104,7 +104,7 @@ public class SaveCommunityListener extends AbstractServiceApiListener {
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", "400000000000000002");
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.DEV);
-        businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
+        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
         businesses.add(business);
 

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

@@ -3,12 +3,7 @@ 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.common.constant.BusinessTypeConstant;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.constant.CommunityMemberTypeConstant;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.constant.ServiceCodeConstant;
-import com.java110.common.constant.StatusConstant;
+import com.java110.common.constant.*;
 import com.java110.common.exception.ListenerExecuteException;
 import com.java110.common.util.Assert;
 import com.java110.core.annotation.Java110Listener;
@@ -150,7 +145,7 @@ public class SaveFloorListener extends AbstractServiceApiDataFlowListener {
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", paramInJson.getString("floorId"));
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR);
-        businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
+        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
 
         return business;

Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java

@@ -153,7 +153,7 @@ public class SaveOwnerListener extends AbstractServiceApiDataFlowListener {
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", paramInJson.getString("ownerId"));
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OWNER);
-        businessCommunityMember.put("auditStatusCd", StatusConstant.STATUS_CD_AUDIT_COMPLETE);
+        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
 
         return business;

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

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

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

@@ -2,7 +2,7 @@ package com.java110.web.components.community;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.CommunityStateConstant;
+import com.java110.common.constant.StateConstant;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.web.smo.community.IAuditCommunitySMO;
@@ -37,7 +37,7 @@ public class AuditCommunityManageComponent {
     public ResponseEntity<String> list(IPageData pd) {
 
         JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
-        reqParam.put("state", CommunityStateConstant.NO_AUDIT);
+        reqParam.put("state", StateConstant.NO_AUDIT);
 
         IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getToken(),
                 reqParam.toJSONString(), pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId());

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

@@ -0,0 +1,74 @@
+package com.java110.web.components.community;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.StateConstant;
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.web.smo.community.IAuditCommunitySMO;
+import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 小区审核
+ * <p>
+ * add by wuxw
+ * <p>
+ * 2019-06-29
+ */
+@Component("auditEnterCommunityManage")
+public class AuditEnterCommunityManageComponent {
+
+    @Autowired
+    private IListAuditEnterCommunitysSMO listAuditEnterCommunitysSMOImpl;
+
+    @Autowired
+    private IAuditCommunitySMO auditCommunitySMOImpl;
+
+    /**
+     * 查询小区列表
+     *
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd) {
+
+        JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
+        reqParam.put("state", StateConstant.AGREE_AUDIT);
+
+        IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getToken(),
+                reqParam.toJSONString(), pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId());
+
+        return listAuditEnterCommunitysSMOImpl.listAuditEnterCommunitys(newPd);
+    }
+
+    /**
+     * 审核 小区
+     *
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> audit(IPageData pd) {
+        return auditCommunitySMOImpl.auditCommunity(pd);
+    }
+
+
+    public IAuditCommunitySMO getAuditCommunitySMOImpl() {
+        return auditCommunitySMOImpl;
+    }
+
+    public void setAuditCommunitySMOImpl(IAuditCommunitySMO auditCommunitySMOImpl) {
+        this.auditCommunitySMOImpl = auditCommunitySMOImpl;
+    }
+
+    public IListAuditEnterCommunitysSMO getListAuditEnterCommunitysSMOImpl() {
+        return listAuditEnterCommunitysSMOImpl;
+    }
+
+    public void setListAuditEnterCommunitysSMOImpl(IListAuditEnterCommunitysSMO listAuditEnterCommunitysSMOImpl) {
+        this.listAuditEnterCommunitysSMOImpl = listAuditEnterCommunitysSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/smo/community/IListAuditEnterCommunitysSMO.java

@@ -0,0 +1,21 @@
+package com.java110.web.smo.community;
+
+import com.java110.common.exception.SMOException;
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 小区管理服务接口类
+ *
+ * add by wuxw 2019-06-29
+ */
+public interface IListAuditEnterCommunitysSMO {
+
+    /**
+     * 查询小区信息
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象数据
+     * @throws SMOException 业务代码层
+     */
+    ResponseEntity<String> listAuditEnterCommunitys(IPageData pd) throws SMOException;
+}

WebService/src/main/java/com/java110/web/smo/community/impl/ListAuditEnterCommunitysSMOImpl.java

@@ -0,0 +1,70 @@
+package com.java110.web.smo.community.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
+import com.java110.common.constant.ServiceConstant;
+import com.java110.common.constant.StoreTypeConstant;
+import com.java110.common.exception.SMOException;
+import com.java110.common.util.BeanConvertUtil;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.web.core.AbstractComponentSMO;
+import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
+import com.java110.web.smo.community.IListCommunitysSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+/**
+ * 查询需要查询审核的小区
+ */
+@Service("listAuditEnterCommunitysSMOImpl")
+public class ListAuditEnterCommunitysSMOImpl extends AbstractComponentSMO implements IListAuditEnterCommunitysSMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public ResponseEntity<String> listAuditEnterCommunitys(IPageData pd) throws SMOException {
+        return businessProcess(pd);
+    }
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        super.validatePageInfo(pd);
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        Map paramMap = BeanConvertUtil.beanCovertMap(result);
+        paramIn.putAll(paramMap);
+
+        paramIn.put("memberId", result.getStoreId());
+        paramIn.put("storeTypeCd",result.getStoreTypeCd());
+
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/community.listAuditEnterCommunitys" + mapToUrlParam(paramIn);
+
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        return responseEntity;
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.java110.web.smo.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.common.constant.ServiceConstant;
+import com.java110.common.constant.StateConstant;
 import com.java110.common.constant.StatusConstant;
 import com.java110.common.util.CommonUtil;
 import com.java110.core.context.IPageData;
@@ -109,7 +110,7 @@ public class NavServiceSMOImpl extends BaseComponentSMO implements INavServiceSM
         for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
             tempCommunity = communitys.getJSONObject(communityIndex);
 
-            if (!StatusConstant.STATUS_CD_AUDIT_COMPLETE.equals(tempCommunity.getString("auditStatusCd"))) {
+            if (!StateConstant.AGREE_AUDIT.equals(tempCommunity.getString("auditStatusCd"))) {
                 continue;
             }
             newCommunity = new JSONObject();

WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html

@@ -0,0 +1,66 @@
+<div id="component">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>入驻审核</h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                        <tr>
+                            <th>小区ID</th>
+                            <th>小区名称</th>
+                            <th>小区地址</th>
+                            <th>附近地标</th>
+                            <th>城市编码</th>
+                            <th>小区维度</th>
+                            <th>小区经度</th>
+                            <th>状态</th>
+                            <th class="text-right">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="community in auditEnterCommunityManageInfo.communitys">
+                            <td>{{community.communityId}}</td>
+                            <td>{{community.name}}</td>
+                            <td>{{community.address}}</td>
+                            <td>{{community.nearbyLandmarks}}</td>
+                            <td>{{community.cityCode}}</td>
+                            <td>{{community.mapX}}</td>
+                            <td>{{community.mapY}}</td>
+                            <td>{{community.stateName}}</td>
+                            <td>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEnterAuditCommunityModal(community)">审核
+                                    </button>
+                                </div>
+
+
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create name="pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+    <vc:create name="audit"
+               callBackListener="auditEnterCommunityManage"
+               callBackFunction="notifyAuditInfo"
+    ></vc:create>
+
+</div>

WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.js

@@ -0,0 +1,87 @@
+/**
+    入驻小区
+**/
+(function(vc){
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data:{
+            auditEnterCommunityManageInfo:{
+                communitys:[],
+                total:0,
+                records:1,
+                currentCommunityId:''
+            }
+        },
+        _initMethod:function(){
+            vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent:function(){
+            vc.on('auditEnterCommunityManage','listCommunity',function(_param){
+                  vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('auditEnterCommunityManage','notifyAuditInfo',function(_auditInfo){
+                  vc.component._auditEnterCommunityState(_auditInfo);
+            });
+             vc.on('pagination','page_event',function(_currentPage){
+                vc.component._listCommunitys(_currentPage,DEFAULT_ROWS);
+            });
+        },
+        methods:{
+            _listCommunitys:function(_page, _rows){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_rows
+                    }
+
+               }
+               //发送get请求
+               vc.http.get('auditEnterCommunityManage',
+                            'list',
+                             param,
+                             function(json,res){
+                                var _auditEnterCommunityManageInfo=JSON.parse(json);
+                                vc.component.auditEnterCommunityManageInfo.total = _auditEnterCommunityManageInfo.total;
+                                vc.component.auditEnterCommunityManageInfo.records = _auditEnterCommunityManageInfo.records;
+                                vc.component.auditEnterCommunityManageInfo.communitys = _auditEnterCommunityManageInfo.communitys;
+                                vc.emit('pagination','init',{
+                                    total:vc.component.auditEnterCommunityManageInfo.records,
+                                    currentPage:_page
+                                });
+                             },function(errInfo,error){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            _openEnterAuditCommunityModal:function(_community){
+                vc.component.auditEnterCommunityManageInfo.currentCommunityId = _community.communityId;
+                vc.emit('audit','openAuditModal',{});
+            },
+            _auditEnterCommunityState:function(_auditInfo){
+                _auditInfo.communityId = vc.component.auditEnterCommunityManageInfo.currentCommunityId;
+                vc.http.post(
+                    'auditEnterCommunityManage',
+                    'audit',
+                    JSON.stringify(_auditInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                             vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+                        vc.message(errInfo);
+                });
+            }
+
+        }
+    });
+})(window.vc);

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

@@ -44,9 +44,9 @@
             _showCommunityStatus(_statusCd){
                 if(_statusCd == '1000'){
                     return "入驻审核";
-                }else if(_statusCd == '1001'){
-                    return "退出审核";
-                }else if(_statusCd == '0000'){
+                }else if(_statusCd == '1200'){
+                    return "入驻失败";
+                }else if(_statusCd == '1100'){
                     return "入驻成功";
                 }
 

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

@@ -1,27 +0,0 @@
-package com.java110.common.constant;
-
-
-/**
- * 权限编码常量类
- */
-public final class CommunityStateConstant {
-
-    private CommunityStateConstant() {
-
-    }
-
-    //未审核
-    public static final String NO_AUDIT = "1000";
-
-
-    //审核同意
-    public static final String AGREE_AUDIT = "1100";
-
-    //审核拒绝
-    public static final String REJECT_AUDIT = "1200";
-
-
-
-
-
-}

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

@@ -6,26 +6,19 @@ package com.java110.common.constant;
  */
 public class StateConstant {
 
-    /**
-     * 添加数据
-     */
-    public static final String STATE_ADD = "ADD";
-
-    /**
-     * 修改数据
-     */
-    public static final String STATE_MOD = "MOD";
-
-
-    /**
-     * 删除数据
-     */
-    public static final String STATE_DEL = "DEL";
-
-    /**
-     * 保持数据
-     */
-    public static final String STATE_KIP = "KIP";
+    private StateConstant() {
+
+    }
+
+    //未审核
+    public static final String NO_AUDIT = "1000";
+
+
+    //审核同意
+    public static final String AGREE_AUDIT = "1100";
+
+    //审核拒绝
+    public static final String REJECT_AUDIT = "1200";
 
 
 }

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

@@ -40,22 +40,6 @@ 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 STATUS_CD_AUDIT_COMPLETE = "0000";
-
     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";