From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 95 +++++++----------------------------------------
1 files changed, 15 insertions(+), 80 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
index ff5d8b1..7697a07 100755
--- 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
@@ -19,6 +19,7 @@
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;
@@ -64,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;
}
@@ -89,53 +85,20 @@
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners);
return owners;
- }
-
- private boolean updateOwnerPhone(List<OwnerDto> owners) {
- if (owners.size() > 15) {
- return true;
- }
-
- List<String> memberIds = new ArrayList<>();
-
- for (OwnerDto tmpOwnerDto : owners) {
- memberIds.add(tmpOwnerDto.getMemberId());
- }
-
- FileRelDto fileRelDto = new FileRelDto();
- //fileRelDto.setObjId(owners.get(0).getMemberId());
- fileRelDto.setObjIds(memberIds.toArray(new String[memberIds.size()]));
- List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-
- if (fileRelDtos == null || fileRelDtos.size() < 1) {
- return true;
- }
-
- String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
-
- for (OwnerDto tmpOwnerDto : owners) {
- for (FileRelDto tmpFileRelDto : fileRelDtos) {
- if (!tmpOwnerDto.getMemberId().equals(tmpFileRelDto.getObjId())) {
- continue;
- }
-
- if (tmpFileRelDto.getFileSaveName().startsWith("http")) {
- tmpOwnerDto.setUrl(tmpFileRelDto.getFileSaveName());
- } else {
- tmpOwnerDto.setUrl(imgUrl + tmpFileRelDto.getFileSaveName());
- }
- }
- }
-
- return false;
}
@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;
}
@@ -152,8 +115,12 @@
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners);
return owners;
+ }
+
+ @Override
+ public int queryOwnersMemberCount(@RequestBody OwnerDto ownerDto) {
+ return ownerServiceDaoImpl.getOwnerInfoCount(BeanConvertUtil.beanCovertMap(ownerDto));
}
/**
@@ -182,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()]);
}
/**
@@ -232,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);
@@ -295,7 +231,6 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners);
return owners;
}
--
Gitblit v1.8.0