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 | 69 ----------------------------------
1 files changed, 1 insertions(+), 68 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 e67a717..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
@@ -65,11 +65,6 @@
}
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);
@@ -90,47 +85,7 @@
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners);
return owners;
- }
-
- private boolean updateOwnerPhone(List<OwnerDto> owners) {
- if (owners.size() > 50) {
- 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
@@ -143,7 +98,7 @@
}
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
- if (owners == null || owners.size() == 0) {
+ if (ListUtil.isNull(owners)) {
return owners;
}
@@ -160,7 +115,6 @@
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners);
return owners;
}
@@ -200,21 +154,6 @@
/**
* 鑾峰彇鎵归噺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()]);
- }
-
- /**
- * 鑾峰彇鎵归噺userId
- *
* @param owners 灏忓尯妤间俊鎭�
* @return 鎵归噺userIds 淇℃伅
*/
@@ -246,11 +185,6 @@
public int queryOwnersCount(@RequestBody OwnerDto ownerDto) {
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);
@@ -297,7 +231,6 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
- updateOwnerPhone(owners);
return owners;
}
--
Gitblit v1.8.0