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/notice/SaveNoticeCmd.java | 63 +++++++++----------------------
1 files changed, 18 insertions(+), 45 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/notice/SaveNoticeCmd.java b/service-community/src/main/java/com/java110/community/cmd/notice/SaveNoticeCmd.java
index 0756dc7..ef85d49 100644
--- a/service-community/src/main/java/com/java110/community/cmd/notice/SaveNoticeCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/notice/SaveNoticeCmd.java
@@ -24,9 +24,6 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.notice.NoticeDto;
-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;
@@ -70,21 +67,10 @@
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@Autowired
- private IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl;
-
- @Autowired
- private IOrgCommunityInnerServiceSMO orgCommunityInnerServiceSMOImpl;
-
- @Autowired
- private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
-
- @Autowired
private INoticeV1InnerServiceSMO noticeV1InnerServiceSMOImpl;
-
@Autowired
private IRoleCommunityV1InnerServiceSMO roleCommunityV1InnerServiceSMOImpl;
-
@Autowired
private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
@@ -100,40 +86,34 @@
Assert.hasKeyAndValue(reqJson, "startTime", "蹇呴�夛紝璇峰～鍐欏紑濮嬫椂闂� ");
Assert.hasKeyAndValue(reqJson, "endTime", "蹇呴�夛紝璇峰～鍐欑粨鏉熸椂闂� ");
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+
+ reqJson.put("userId",userId);
+ reqJson.put("storeId",storeId);
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
if (!reqJson.containsKey("isAll") || StringUtil.isEmpty(reqJson.getString("isAll")) || "N".equals(reqJson.getString("isAll"))) {
addNotice(reqJson);
return;
}
-
String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
reqJson.put("storeId", storeId);
-
//鏌ヨ褰撳墠鍛樺伐 鐨勫皬鍖�
-
- //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 = getStoreCommunity(reqJson);
+ /*List<ApiCommunityDataVo> communitys = null;
+ if (reqJson.containsKey("isAll") && !StringUtil.isEmpty(reqJson.getString("isAll")) && reqJson.getString("isAll").equals("N")) {
+ communitys = getStoreCommunity(reqJson);
+ } else if (reqJson.getString("isAll").equals("Y")) {
+ CommunityDto communityDto = new CommunityDto();
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+ communitys = BeanConvertUtil.covertBeanList(communityDtos, ApiCommunityDataVo.class);
+ } else {
+ communitys = new ArrayList<>();
+ }*/
for (ApiCommunityDataVo apiCommunityDataVo : communitys) {
reqJson.put("communityId", apiCommunityDataVo.getCommunityId());
if (reqJson.containsKey("objType") && "001".equals(reqJson.getString("objType"))) {
@@ -141,8 +121,6 @@
}
addNotice(reqJson);
}
-
-
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
@@ -153,21 +131,18 @@
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 communityDto = new CommunityDto();
communityDto.setMemberId(reqJson.getString("storeId"));
communityDto.setAuditStatusCd(StateConstant.AGREE_AUDIT);
+ communityDto.setState("1100"); //1000 寰呭鏍� 1100 瀹℃牳閫氳繃 1200 瀹℃牳鎷掔粷
if (reqJson.containsKey("communityName")) {
communityDto.setName(reqJson.getString("communityName"));
}
@@ -179,7 +154,7 @@
}
} else {
RoleCommunityDto orgCommunityDto = BeanConvertUtil.covertBean(reqJson, RoleCommunityDto.class);
- orgCommunityDto.setStaffId(userDtos.get(0).getStaffId());
+ orgCommunityDto.setStaffId(userDtos.get(0).getUserId());
count = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitysCount(orgCommunityDto);
if (count > 0) {
List<RoleCommunityDto> roleCommunityDtos = roleCommunityV1InnerServiceSMOImpl.queryRoleCommunitys(orgCommunityDto);
@@ -194,13 +169,11 @@
} else {
communitys = new ArrayList<>();
}
-
}
return communitys;
}
public void addNotice(JSONObject paramInJson) {
-
JSONObject businessNotice = new JSONObject();
businessNotice.putAll(paramInJson);
if (!paramInJson.containsKey("state")) {
--
Gitblit v1.8.0