From e40889177c25035496c526dbc12a9665d5b61ceb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 20 三月 2025 12:00:53 +0800
Subject: [PATCH] 优化小区房屋和小区业主 支持按小区查询数据
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 98 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 3c52f59..7697a07
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -1,21 +1,25 @@
package com.java110.user.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.community.CommunityMemberDto;
import com.java110.dto.PageDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerAttrDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.owner.OwnerPo;
import com.java110.user.dao.IOwnerServiceDao;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.OwnerTypeConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -48,6 +52,9 @@
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public List<OwnerDto> queryOwners(@RequestBody OwnerDto ownerDto) {
@@ -58,15 +65,10 @@
}
Map ownerInfo = BeanConvertUtil.beanCovertMap(ownerDto);
- ownerInfo.put("communityId", ownerDto.getCommunityId());
- ownerInfo.put("ownerTypeCd", OwnerTypeConstant.OWNER);
- // ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
- //ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
- ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(ownerInfo), OwnerDto.class);
- if (owners == null || owners.size() == 0) {
+ if (ListUtil.isNull(owners)) {
return owners;
}
@@ -82,13 +84,21 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
+
return owners;
}
@Override
public List<OwnerDto> queryOwnerMembers(@RequestBody OwnerDto ownerDto) {
+
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
+
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
- if (owners == null || owners.size() == 0) {
+ if (ListUtil.isNull(owners)) {
return owners;
}
@@ -104,7 +114,13 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
+
return owners;
+ }
+
+ @Override
+ public int queryOwnersMemberCount(@RequestBody OwnerDto ownerDto) {
+ return ownerServiceDaoImpl.getOwnerInfoCount(BeanConvertUtil.beanCovertMap(ownerDto));
}
/**
@@ -133,21 +149,6 @@
}
owner.setOwnerAttrDtos(tmpOwnerAttrDtos);
- }
-
- /**
- * 鑾峰彇鎵归噺userId
- *
- * @param communityMemberDtos 灏忓尯妤间俊鎭�
- * @return 鎵归噺userIds 淇℃伅
- */
- private String[] getOwnerIds(List<CommunityMemberDto> communityMemberDtos) {
- List<String> ownerIds = new ArrayList<String>();
- for (CommunityMemberDto communityMemberDto : communityMemberDtos) {
- ownerIds.add(communityMemberDto.getMemberId());
- }
-
- return ownerIds.toArray(new String[ownerIds.size()]);
}
/**
@@ -183,23 +184,7 @@
@Override
public int queryOwnersCount(@RequestBody OwnerDto ownerDto) {
- //璋冪敤 灏忓尯鏈嶅姟鏌ヨ 灏忓尯鎴愬憳涓氫富淇℃伅
- /*CommunityMemberDto communityMemberDto = new CommunityMemberDto();
- communityMemberDto.setCommunityId(ownerDto.getCommunityId());
- communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
- return communityInnerServiceSMOImpl.getCommunityMemberCount(communityMemberDto);*/
- int page = ownerDto.getPage();
-
- if (page != PageDto.DEFAULT_PAGE) {
- ownerDto.setPage((page - 1) * ownerDto.getRow());
- }
-
Map ownerInfo = BeanConvertUtil.beanCovertMap(ownerDto);
- ownerInfo.put("communityId", ownerDto.getCommunityId());
- ownerInfo.put("ownerTypeCd", OwnerTypeConstant.OWNER);
- // ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
- //ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
- ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
return ownerServiceDaoImpl.getOwnerInfoCount(ownerInfo);
@@ -210,11 +195,11 @@
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
- int page = ownerDto.getPage();
-
- if (page != PageDto.DEFAULT_PAGE) {
- ownerDto.setPage((page - 1) * ownerDto.getRow());
- }
+// int page = ownerDto.getPage();
+//
+// if (page != PageDto.DEFAULT_PAGE) {
+// ownerDto.setPage((page - 1) * ownerDto.getRow());
+// }
return ownerServiceDaoImpl.queryOwnersCount(BeanConvertUtil.beanCovertMap(ownerDto));
}
@@ -268,11 +253,32 @@
@Override
public int updateOwnerMember(OwnerPo ownerPo) {
Map info = BeanConvertUtil.beanCovertMap(ownerPo);
- info.put("statusCd","0");
+ info.put("statusCd", "0");
ownerServiceDaoImpl.updateOwnerInfoInstance(info);
return 1;
}
+ @Override
+ public int queryOwnerLogsCountByRoom(@RequestBody OwnerDto ownerDto) {
+ return ownerServiceDaoImpl.queryOwnerLogsCountByRoom(BeanConvertUtil.beanCovertMap(ownerDto));
+ }
+
+ @Override
+ public List<OwnerDto> queryOwnerLogsByRoom(@RequestBody OwnerDto ownerDto) {
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
+ return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnerLogsByRoom(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+ }
+
+ @Override
+ public List<OwnerDto> queryAllOwners(@RequestBody OwnerDto ownerDto) {
+ List<OwnerDto> allOwners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+ return allOwners;
+ }
+
public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
return userInnerServiceSMOImpl;
}
--
Gitblit v1.8.0