From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 9 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..ff5d8b1
--- 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,18 +1,21 @@
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;
@@ -48,6 +51,9 @@
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public List<OwnerDto> queryOwners(@RequestBody OwnerDto ownerDto) {
@@ -62,7 +68,7 @@
ownerInfo.put("ownerTypeCd", OwnerTypeConstant.OWNER);
// ownerInfo.put("ownerIds", getOwnerIds(communityMemberDtos));
//ownerInfo.put("ownerTypeCd", ownerDto.getOwnerTypeCd());
- ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
+ // ownerInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
List<OwnerDto> owners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(ownerInfo), OwnerDto.class);
@@ -82,7 +88,48 @@
for (OwnerDto owner : owners) {
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
@@ -104,6 +151,8 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
+
+ updateOwnerPhone(owners);
return owners;
}
@@ -210,11 +259,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));
}
@@ -246,6 +295,7 @@
for (OwnerDto owner : owners) {
refreshOwner(owner, users, ownerAttrDtos);
}
+ updateOwnerPhone(owners);
return owners;
}
@@ -268,11 +318,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