Просмотр исходного кода

优化 建议在信息发布设立一个通用专栏,在这个板块发布的信息,该物业旗下所有小区都能看见。不用每个小区单独发布。

java110 лет назад: 5
Родитель
Сommit
a46fa9413e

+ 75 - 1
service-api/src/main/java/com/java110/api/listener/notice/SaveNoticeListener.java

@@ -6,11 +6,25 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+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.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.user.IOrgCommunityInnerServiceSMO;
+import com.java110.intf.user.IOrgInnerServiceSMO;
+import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.constant.StateConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.api.community.ApiCommunityDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 
+import java.util.List;
+
 /**
  * 保存小区侦听
  * add by wuxw 2019-06-30
@@ -20,6 +34,18 @@ public class SaveNoticeListener extends AbstractServiceApiPlusListener {
     @Autowired
     private INoticeBMO noticeBMOImpl;
 
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgCommunityInnerServiceSMO orgCommunityInnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -36,7 +62,55 @@ public class SaveNoticeListener extends AbstractServiceApiPlusListener {
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
 
-        noticeBMOImpl.addNotice(reqJson, context);
+        if (!reqJson.containsKey("isAll") || StringUtil.isEmpty(reqJson.getString("isAll"))) {
+            noticeBMOImpl.addNotice(reqJson, context);
+            return;
+        }
+
+        //查询当前员工 的小区
+
+        //1.0 先查询 员工对应的部门
+        OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+        orgStaffRelDto.setStoreId(reqJson.getString("storeId"));
+        orgStaffRelDto.setStaffId(reqJson.getString("userId"));
+        List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelInnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
+
+        Assert.listOnlyOne(orgStaffRelDtos, "未查询到相应员工对应的部门信息或查询到多条");
+
+        //2.0 再根据 部门对应的 小区ID查询小区信息
+        OrgDto orgDto = new OrgDto();
+        orgDto.setOrgId(orgStaffRelDtos.get(0).getParentOrgId());
+        orgDto.setStoreId(reqJson.getString("storeId"));
+        orgDto.setOrgLevel("2");
+        List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
+
+        Assert.listOnlyOne(orgDtos, "根据组织ID未查询到员工对应部门信息或查询到多条数据");
+
+        List<ApiCommunityDataVo> communitys = null;
+        if ("9999".equals(orgDtos.get(0).getBelongCommunityId())) {
+            CommunityDto communityDto = BeanConvertUtil.covertBean(reqJson, CommunityDto.class);
+            communityDto.setMemberId(reqJson.getString("storeId"));
+            communityDto.setAuditStatusCd(StateConstant.AGREE_AUDIT);
+            communitys = BeanConvertUtil.covertBeanList(communityInnerServiceSMOImpl.queryCommunitys(communityDto), ApiCommunityDataVo.class);
+        } else {
+            String companyOrgId = orgDtos.get(0).getOrgId();
+            OrgCommunityDto orgCommunityDto = BeanConvertUtil.covertBean(reqJson, OrgCommunityDto.class);
+            orgCommunityDto.setOrgId(companyOrgId);
+
+            List<OrgCommunityDto> orgCommunityDtos = orgCommunityInnerServiceSMOImpl.queryOrgCommunitys(orgCommunityDto);
+            communitys = BeanConvertUtil.covertBeanList(orgCommunityDtos, ApiCommunityDataVo.class);
+        }
+
+        if (communitys == null || communitys.size() < 1) {
+            return;
+        }
+
+        for (ApiCommunityDataVo apiCommunityDataVo : communitys) {
+            reqJson.put("communityId", apiCommunityDataVo.getCommunityId());
+            noticeBMOImpl.addNotice(reqJson, context);
+        }
+
+
     }
 
     @Override

+ 8 - 7
service-front/src/main/java/com/java110/front/smo/notice/impl/AddNoticeSMOImpl.java

@@ -1,17 +1,18 @@
 package com.java110.front.smo.notice.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.AbstractComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.front.smo.notice.IAddNoticeSMO;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
-import com.java110.front.smo.notice.IAddNoticeSMO;
-import org.springframework.web.client.RestTemplate;
-import com.java110.core.context.IPageData;
-import com.java110.core.component.AbstractComponentSMO;
-import org.springframework.stereotype.Service;
 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;
 
 /**
  * 添加小区服务实现类
@@ -37,7 +38,6 @@ public class AddNoticeSMOImpl extends AbstractComponentSMO implements IAddNotice
         Assert.hasKeyAndValue(paramIn, "endTime", "必选,请填写结束时间 ");
 
 
-
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.HAS_LIST_NOTICE);
 
     }
@@ -45,9 +45,10 @@ public class AddNoticeSMOImpl extends AbstractComponentSMO implements IAddNotice
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
 
         paramIn.put("userId", pd.getUserId());
+        paramIn.put("storeId", result.getStoreId());
 
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/notice.saveNotice",