From 983acc56b667c90804dbf5f46dae8f0161876380 Mon Sep 17 00:00:00 2001
From: 曾成 <121184950@qq.com>
Date: 星期六, 28 三月 2020 19:36:36 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java
index 45db324..8413cf8 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/CommunityInnerServiceSMOImpl.java
@@ -1,18 +1,21 @@
package com.java110.community.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.util.BeanConvertUtil;
+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.CommunityDto;
import org.slf4j.Logger;
import org.slf4j.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.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,7 +42,6 @@
if (page != PageDto.DEFAULT_PAGE) {
communityMemberDto.setPage((page - 1) * communityMemberDto.getRow());
- communityMemberDto.setRow(page * communityMemberDto.getRow());
}
List<Map> communityMembers = communityServiceDaoImpl.getCommunityMembers(BeanConvertUtil.beanCovertMap(communityMemberDto));
@@ -53,6 +55,45 @@
return communityServiceDaoImpl.getCommunityMemberCount(BeanConvertUtil.beanCovertMap(communityMemberDto));
}
+ @Override
+ public List<CommunityAttrDto> getCommunityAttrs(@RequestBody CommunityAttrDto communityAttrDto) {
+ return BeanConvertUtil.covertBeanList(communityServiceDaoImpl.getCommunityAttrs(BeanConvertUtil.beanCovertMap(communityAttrDto)), CommunityAttrDto.class);
+ }
+
+ @Override
+ public int getCommunityAttrsCount(@RequestBody CommunityAttrDto communityAttrDto) {
+ logger.debug("queryCommunityAttrsCount锛歿}", JSONObject.toJSONString(communityAttrDto));
+
+ return communityServiceDaoImpl.getCommunityAttrsCount(BeanConvertUtil.beanCovertMap(communityAttrDto));
+ }
+
+ @Override
+ public List<CommunityDto> queryCommunitys(@RequestBody CommunityDto communityDto) {
+
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = communityDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ communityDto.setPage((page - 1) * communityDto.getRow());
+ }
+
+ List<CommunityDto> communitys = BeanConvertUtil.covertBeanList(communityServiceDaoImpl.getCommunityInfoNew(BeanConvertUtil.beanCovertMap(communityDto)), CommunityDto.class);
+
+
+
+ return communitys;
+ }
+
+
+
+
+
+ @Override
+ public int queryCommunitysCount(@RequestBody CommunityDto communityDto) {
+ return communityServiceDaoImpl.queryCommunitysCount(BeanConvertUtil.beanCovertMap(communityDto));
+ }
+
public ICommunityServiceDao getCommunityServiceDaoImpl() {
return communityServiceDaoImpl;
}
--
Gitblit v1.8.0