From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/activities/SaveActivitiesCmd.java | 134 +++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 70 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/activities/SaveActivitiesCmd.java b/service-community/src/main/java/com/java110/community/cmd/activities/SaveActivitiesCmd.java
index ab3ca7c..18aeb88 100644
--- a/service-community/src/main/java/com/java110/community/cmd/activities/SaveActivitiesCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/activities/SaveActivitiesCmd.java
@@ -18,41 +18,34 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.activitiesType.ActivitiesTypeDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.file.FileDto;
-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.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IActivitiesTypeInnerServiceSMO;
import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
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.intf.user.IUserInnerServiceSMO;
+import com.java110.intf.store.IStoreV1InnerServiceSMO;
+import com.java110.intf.user.*;
import com.java110.po.activities.ActivitiesPo;
import com.java110.po.file.FileRelPo;
-import com.java110.utils.constant.BusinessTypeConstant;
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.ResultVo;
import com.java110.vo.api.community.ApiCommunityDataVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -74,8 +67,6 @@
@Autowired
private IActivitiesV1InnerServiceSMO activitiesV1InnerServiceSMOImpl;
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
private IActivitiesTypeInnerServiceSMO activitiesTypeInnerServiceSMOImpl;
@@ -84,21 +75,19 @@
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@Autowired
- private IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl;
-
- @Autowired
- private IOrgCommunityInnerServiceSMO orgCommunityInnerServiceSMOImpl;
-
- @Autowired
- private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
-
-
- @Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IRoleCommunityV1InnerServiceSMO roleCommunityV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -114,24 +103,24 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
-
+ String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
UserDto userDto = new UserDto();
userDto.setUserId(userId);
userDto.setPage(1);
userDto.setRow(1);
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
- Assert.listOnlyOne(userDtos,"鐢ㄦ埛涓嶅瓨鍦�");
- reqJson.put("userId",userDtos.get(0).getUserId());
- reqJson.put("userName",userDtos.get(0).getName());
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ reqJson.put("userId", userDtos.get(0).getUserId());
+ reqJson.put("userName", userDtos.get(0).getName());
if (!reqJson.containsKey("isMoreCommunity") || "N".equals(reqJson.getString("isMoreCommunity"))) {
addActivities(cmdDataFlowContext, reqJson);
return;
}
+ reqJson.put("storeId", storeId);
List<ApiCommunityDataVo> communityDataVos = getCommunitys(reqJson);
if (communityDataVos == null || communityDataVos.size() < 1) {
@@ -161,63 +150,69 @@
public List<ApiCommunityDataVo> getCommunitys(JSONObject reqJson) {
//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 = new CommunityDto();
+ 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();
+ storeDto.setStoreId(reqJson.getString("storeId"));
+ List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+
+ Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
+
+ int count = 0;
+ 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);
- communitys = BeanConvertUtil.covertBeanList(communityInnerServiceSMOImpl.queryCommunitys(communityDto), ApiCommunityDataVo.class);
+ if (reqJson.containsKey("communityName")) {
+ communityDto.setName(reqJson.getString("communityName"));
+ }
+ count = communityInnerServiceSMOImpl.queryCommunitysCount(communityDto);
+ if (count > 0) {
+ communitys = BeanConvertUtil.covertBeanList(communityInnerServiceSMOImpl.queryCommunitys(communityDto), ApiCommunityDataVo.class);
+ } else {
+ communitys = new ArrayList<>();
+ }
} 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);
+ RoleCommunityDto orgCommunityDto = BeanConvertUtil.covertBean(reqJson, RoleCommunityDto.class);
+ orgCommunityDto.setStaffId(userDtos.get(0).getStaffId());
+ count = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitysCount(orgCommunityDto);
+ if (count > 0) {
+ List<RoleCommunityDto> roleCommunityDtos = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitys(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());
+ }
+ }
+ }
+ } else {
+ communitys = new ArrayList<>();
+ }
}
-
return communitys;
}
public void addActivities(ICmdDataFlowContext context, JSONObject reqJson) {
reqJson.put("activitiesId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_activitiesId));
if (reqJson.containsKey("headerImg") && !StringUtils.isEmpty(reqJson.getString("headerImg"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("headerImg"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-
- reqJson.put("headerImg", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
-
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
fileRelPo.setFileRealName(reqJson.getString("headerImg"));
- fileRelPo.setFileSaveName(reqJson.getString("fileSaveName"));
+ fileRelPo.setFileSaveName(reqJson.getString("headerImg"));
fileRelPo.setObjId(reqJson.getString("activitiesId"));
fileRelPo.setSaveWay("table");
fileRelPo.setRelTypeCd("70000");
int flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇濆瓨骞垮憡澶辫触");
}
}
@@ -226,9 +221,8 @@
activitiesPo.setLikeCount("0");
activitiesPo.setCollectCount("0");
activitiesPo.setState("11000");
-
int flag = activitiesV1InnerServiceSMOImpl.saveActivities(activitiesPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇濆瓨骞垮憡澶辫触");
}
}
--
Gitblit v1.8.0