From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java b/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
index b289899..45c958e 100644
--- a/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/community/ListMyEnteredCommunitysCmd.java
@@ -3,22 +3,23 @@
import com.alibaba.fastjson.JSONObject;
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.Cmd;
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.dto.roleCommunity.RoleCommunityDto;
import com.java110.dto.store.StoreDto;
+import com.java110.dto.user.UserDto;
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.intf.user.*;
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.utils.util.StringUtil;
import com.java110.vo.api.community.ApiCommunityDataVo;
import com.java110.vo.api.community.ApiCommunityVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +28,9 @@
import java.util.ArrayList;
import java.util.List;
+
@Java110Cmd(serviceCode = "community.listMyEnteredCommunitys")
-public class ListMyEnteredCommunitysCmd extends AbstractServiceCmdListener {
+public class ListMyEnteredCommunitysCmd extends Cmd {
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@@ -37,7 +39,7 @@
private IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl;
@Autowired
- private IOrgCommunityInnerServiceSMO orgCommunityInnerServiceSMOImpl;
+ private IRoleCommunityV1InnerServiceSMO roleCommunityV1InnerServiceSMOImpl;
@Autowired
private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
@@ -45,14 +47,36 @@
@Autowired
private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+
+ if (!reqJson.containsKey("storeId") || StringUtil.isEmpty(reqJson.getString("storeId"))) {
+ reqJson.put("storeId", cmdDataFlowContext.getReqHeaders().get("store-id"));
+ }
+
+ if (!reqJson.containsKey("userId") || StringUtil.isEmpty(reqJson.getString("userId"))) {
+ reqJson.put("userId", cmdDataFlowContext.getReqHeaders().get("user-id"));
+ }
+
Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍟嗘埛淇℃伅");
Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+
+ // 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍鏈夊皬鍖�
+ UserDto userDto = new UserDto();
+ userDto.setUserId(reqJson.getString("userId"));
+ userDto.setPage(1);
+ userDto.setRow(1);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
//鏍￠獙鍟嗘埛鏄惁瀛樺湪;
StoreDto storeDto = new StoreDto();
@@ -61,22 +85,9 @@
Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
- //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鏈煡璇㈠埌鍛樺伐瀵瑰簲閮ㄩ棬淇℃伅鎴栨煡璇㈠埌澶氭潯鏁版嵁");
int count = 0;
List<ApiCommunityDataVo> communitys = null;
- if ("9999".equals(orgDtos.get(0).getBelongCommunityId())) {
+ if(UserDto.LEVEL_CD_ADMIN.equals(userDtos.get(0).getLevelCd())){
CommunityDto communityDto = BeanConvertUtil.covertBean(reqJson, CommunityDto.class);
communityDto.setMemberId(reqJson.getString("storeId"));
communityDto.setAuditStatusCd(StateConstant.AGREE_AUDIT);
@@ -89,15 +100,14 @@
} else {
communitys = new ArrayList<>();
}
- } else {
- String companyOrgId = orgDtos.get(0).getOrgId();
- OrgCommunityDto orgCommunityDto = BeanConvertUtil.covertBean(reqJson, OrgCommunityDto.class);
- orgCommunityDto.setOrgId(companyOrgId);
- count = orgCommunityInnerServiceSMOImpl.queryOrgCommunitysCount(orgCommunityDto);
+ }else{
+ RoleCommunityDto orgCommunityDto = BeanConvertUtil.covertBean(reqJson, RoleCommunityDto.class);
+ orgCommunityDto.setStaffId(userDtos.get(0).getUserId());
+ count = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitysNameCount(orgCommunityDto);
if (count > 0) {
- List<OrgCommunityDto> orgCommunityDtos = orgCommunityInnerServiceSMOImpl.queryOrgCommunitys(orgCommunityDto);
- communitys = BeanConvertUtil.covertBeanList(orgCommunityDtos, ApiCommunityDataVo.class);
- for (OrgCommunityDto tmpOrgCommunityDto : orgCommunityDtos) {
+ List<RoleCommunityDto> roleCommunityDtos = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitysName(orgCommunityDto);
+ communitys = BeanConvertUtil.covertBeanList(roleCommunityDtos, ApiCommunityDataVo.class);
+ for (RoleCommunityDto tmpOrgCommunityDto : roleCommunityDtos) {
for (ApiCommunityDataVo tmpApiCommunityDataVo : communitys) {
if (tmpOrgCommunityDto.getCommunityId().equals(tmpApiCommunityDataVo.getCommunityId())) {
tmpApiCommunityDataVo.setName(tmpOrgCommunityDto.getCommunityName());
@@ -107,8 +117,8 @@
} else {
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();
--
Gitblit v1.8.0