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/smo/impl/CommunityInnerServiceSMOImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 8 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 8413cf8..12a2408
--- a/service-community/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java
@@ -1,20 +1,23 @@
package com.java110.community.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.community.CommunityAttrDto;
-import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.ICommunityServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.PageDto;
+import com.java110.dto.community.CommunityAttrDto;
import com.java110.dto.community.CommunityDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.po.community.CommunityAttrPo;
+import com.java110.po.community.CommunityPo;
+import com.java110.utils.util.BeanConvertUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -49,8 +52,40 @@
}
@Override
+ public List<CommunityDto> getStoreCommunitys(CommunityMemberDto communityMemberDto) {
+ List<Map> communityMembers = communityServiceDaoImpl.getStoreCommunitys(BeanConvertUtil.beanCovertMap(communityMemberDto));
+ List<CommunityDto> communitys = BeanConvertUtil.covertBeanList(communityMembers, CommunityDto.class);
+
+ List<String> communityIds = new ArrayList<>();
+
+ if (communitys == null || communitys.size() < 1) {
+ return communitys;
+ }
+ for (CommunityDto tmpCommunityDto : communitys) {
+ communityIds.add(tmpCommunityDto.getCommunityId());
+ }
+ Map info = new HashMap();
+ info.put("communityIds", communityIds.toArray(new String[communityIds.size()]));
+ List<CommunityAttrDto> communityAttrDtos = BeanConvertUtil.covertBeanList(communityServiceDaoImpl.getCommunityAttrs(info), CommunityAttrDto.class);
+
+ if (communityAttrDtos == null || communityAttrDtos.size() < 1) {
+ return communitys;
+ }
+ for (CommunityDto tmpCommunityDto : communitys) {
+ List<CommunityAttrDto> tmpCommunityAttrDtos = new ArrayList<>();
+ for (CommunityAttrDto communityAttrDto : communityAttrDtos) {
+ if (tmpCommunityDto.getCommunityId().equals(communityAttrDto.getCommunityId())) {
+ tmpCommunityAttrDtos.add(communityAttrDto);
+ }
+ }
+ tmpCommunityDto.setCommunityAttrDtos(tmpCommunityAttrDtos);
+ }
+ return communitys;
+ }
+
+ @Override
public int getCommunityMemberCount(@RequestBody CommunityMemberDto communityMemberDto) {
- logger.debug("getCommunityMemberCount锛歿}", JSONObject.toJSONString(communityMemberDto));
+ logger.debug("getCommunityMemberCount锛歿}", JSONObject.toJSONString(communityMemberDto));
return communityServiceDaoImpl.getCommunityMemberCount(BeanConvertUtil.beanCovertMap(communityMemberDto));
}
@@ -67,6 +102,16 @@
return communityServiceDaoImpl.getCommunityAttrsCount(BeanConvertUtil.beanCovertMap(communityAttrDto));
}
+ /**
+ * 淇濆瓨灏忓尯灞炴��
+ * @param communityAttrPo 鏁版嵁瀵硅薄鍒嗕韩
+ * @return
+ */
+ @Override
+ public int saveCommunityAttr(CommunityAttrPo communityAttrPo) {
+ return communityServiceDaoImpl.saveCommunityAttr(BeanConvertUtil.beanCovertMap(communityAttrPo));
+ }
+
@Override
public List<CommunityDto> queryCommunitys(@RequestBody CommunityDto communityDto) {
@@ -80,13 +125,36 @@
List<CommunityDto> communitys = BeanConvertUtil.covertBeanList(communityServiceDaoImpl.getCommunityInfoNew(BeanConvertUtil.beanCovertMap(communityDto)), CommunityDto.class);
+ List<String> communityIds = new ArrayList<>();
+ if (communitys == null || communitys.size() < 1) {
+ return communitys;
+ }
+ for (CommunityDto tmpCommunityDto : communitys) {
+ communityIds.add(tmpCommunityDto.getCommunityId());
+ }
+ Map info = new HashMap();
+ info.put("communityIds", communityIds.toArray(new String[communityIds.size()]));
+ List<CommunityAttrDto> communityAttrDtos = BeanConvertUtil.covertBeanList(communityServiceDaoImpl.getCommunityAttrs(info), CommunityAttrDto.class);
+
+ if (communityAttrDtos == null || communityAttrDtos.size() < 1) {
+ return communitys;
+ }
+
+
+ for (CommunityDto tmpCommunityDto : communitys) {
+ List<CommunityAttrDto> tmpCommunityAttrDtos = new ArrayList<>();
+ for (CommunityAttrDto communityAttrDto : communityAttrDtos) {
+ if (tmpCommunityDto.getCommunityId().equals(communityAttrDto.getCommunityId())) {
+ tmpCommunityAttrDtos.add(communityAttrDto);
+ }
+ }
+ tmpCommunityDto.setCommunityAttrDtos(tmpCommunityAttrDtos);
+
+ }
return communitys;
}
-
-
-
@Override
@@ -94,6 +162,12 @@
return communityServiceDaoImpl.queryCommunitysCount(BeanConvertUtil.beanCovertMap(communityDto));
}
+// @Override
+// public int saveCommunity(@RequestBody CommunityPo communityPo) {
+// return communityServiceDaoImpl.saveCommunity(BeanConvertUtil.beanCovertMap(communityPo));
+// }
+
+
public ICommunityServiceDao getCommunityServiceDaoImpl() {
return communityServiceDaoImpl;
}
--
Gitblit v1.8.0