优化 我入住的小区查询接口

java110-bean/src/main/java/com/java110/dto/store/StoreDto.java

@@ -24,6 +24,7 @@ public class StoreDto extends PageDto implements Serializable {
     public static final String STORE_DEV = "400000000000000002";
 
     public static final String STORE_TYPE_ADMIN = "800900000001";
+    public static final String STORE_TYPE_DEV = "800900000000";
     public static final String STORE_TYPE_PROPERTY = "800900000003";
 
     public static final String STATE_NORMAL = "48001";

service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java

@@ -7,6 +7,7 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.CommunityMemberDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.dto.workflow.WorkflowDto;
 import com.java110.intf.common.IWorkflowInnerServiceSMO;
 import com.java110.intf.community.ICommunityAttrV1InnerServiceSMO;
@@ -520,7 +521,7 @@ public class CommunityBMOImpl implements ICommunityBMO {
         businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_communityMemberId));
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
-        businessCommunityMember.put("memberId", "400000000000000001");
+        businessCommunityMember.put("memberId", StoreDto.STORE_ADMIN);
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OPT);
         businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
@@ -534,7 +535,7 @@ public class CommunityBMOImpl implements ICommunityBMO {
         businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_communityMemberId));
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
-        businessCommunityMember.put("memberId", "400000000000000002");
+        businessCommunityMember.put("memberId", StoreDto.STORE_DEV);
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.DEV);
         businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);

service-api/src/main/java/com/java110/api/listener/community/ListMyEnteredCommunitysListener.java

@@ -1,38 +1,34 @@
-package com.java110.api.listener.community;
+package com.java110.community.cmd.community;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.user.IOrgCommunityInnerServiceSMO;
-import com.java110.intf.user.IOrgInnerServiceSMO;
-import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.org.OrgCommunityDto;
 import com.java110.dto.org.OrgDto;
 import com.java110.dto.org.OrgStaffRelDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.dto.store.StoreDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
+import com.java110.intf.user.IOrgCommunityInnerServiceSMO;
+import com.java110.intf.user.IOrgInnerServiceSMO;
+import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
 import com.java110.utils.constant.StateConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.community.ApiCommunityDataVo;
 import com.java110.vo.api.community.ApiCommunityVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
-
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listMyEnteredCommunitysListener")
-public class ListMyEnteredCommunitysListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "community.listMyEnteredCommunitys")
+public class ListMyEnteredCommunitysCmd extends AbstractServiceCmdListener {
 
     @Autowired
     private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@@ -46,40 +42,25 @@ public class ListMyEnteredCommunitysListener extends AbstractServiceApiListener
     @Autowired
     private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
 
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_LIST_MY_ENTERED_COMMUNITYS;
-    }
+    @Autowired
+    private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
 
     @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含商户信息");
+        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含用户信息");
     }
 
-
     @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
+        //校验商户是否存在;
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreId(reqJson.getString("storeId"));
+        List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
 
-    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
-        return communityInnerServiceSMOImpl;
-    }
+        Assert.listOnlyOne(storeDtos, "商户不存在");
 
-    public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
-        this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含商户信息");
-        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含用户信息");
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
         //1.0 先查询 员工对应的部门
         OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
         orgStaffRelDto.setStoreId(reqJson.getString("storeId"));
@@ -127,6 +108,18 @@ public class ListMyEnteredCommunitysListener extends AbstractServiceApiListener
                 communitys = new ArrayList<>();
             }
         }
+
+        //兼容 系统刚开始没有小区时
+        if (communitys.size() < 1 && (StoreDto.STORE_TYPE_ADMIN.equals(storeDtos.get(0).getStoreTypeCd()) || StoreDto.STORE_TYPE_DEV.equals(storeDtos.get(0).getStoreTypeCd()))) {
+            ApiCommunityDataVo apiCommunityDataVo = new ApiCommunityDataVo();
+            apiCommunityDataVo.setCommunityId("-1");
+            apiCommunityDataVo.setName("默认小区");
+            apiCommunityDataVo.setTel("18909711234");
+            apiCommunityDataVo.setState("1100");
+            communitys.add(apiCommunityDataVo);
+        }
+
+        //if(communitys.size() < 1 && )
         ApiCommunityVo apiCommunityVo = new ApiCommunityVo();
         apiCommunityVo.setTotal(count);
         apiCommunityVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
@@ -134,20 +127,4 @@ public class ListMyEnteredCommunitysListener extends AbstractServiceApiListener
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiCommunityVo), HttpStatus.OK);
         context.setResponseEntity(responseEntity);
     }
-
-    public IOrgStaffRelInnerServiceSMO getOrgStaffRelInnerServiceSMOImpl() {
-        return orgStaffRelInnerServiceSMOImpl;
-    }
-
-    public void setOrgStaffRelInnerServiceSMOImpl(IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl) {
-        this.orgStaffRelInnerServiceSMOImpl = orgStaffRelInnerServiceSMOImpl;
-    }
-
-    public IOrgInnerServiceSMO getOrgInnerServiceSMOImpl() {
-        return orgInnerServiceSMOImpl;
-    }
-
-    public void setOrgInnerServiceSMOImpl(IOrgInnerServiceSMO orgInnerServiceSMOImpl) {
-        this.orgInnerServiceSMOImpl = orgInnerServiceSMOImpl;
-    }
 }