From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java | 138 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 133 insertions(+), 5 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java
index ea49463..47315c3 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportCommunityInnerServiceSMOImpl.java
@@ -3,11 +3,13 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.RoomDto;
-import com.java110.dto.reportOwnerPayFee.ReportOwnerPayFeeDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerAttrDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
-import com.java110.intf.report.IReportOwnerPayFeeInnerServiceSMO;
-import com.java110.po.reportOwnerPayFee.ReportOwnerPayFeePo;
+import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
import com.java110.report.dao.IReportCommunityServiceDao;
import com.java110.report.dao.IReportOwnerPayFeeServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -15,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -34,7 +37,8 @@
@Autowired
private IReportCommunityServiceDao reportCommunityServiceDaoImpl;
-
+ @Autowired
+ private IOwnerAttrInnerServiceSMO ownerAttrInnerServiceSMOImpl;
@Override
@@ -46,5 +50,129 @@
return roomDtos;
}
+ @Override
+ public List<OwnerCarDto> queryCarStructures(OwnerCarDto ownerCarDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ List<OwnerCarDto> ownerCarDtos = BeanConvertUtil.covertBeanList(reportCommunityServiceDaoImpl.queryCarStructures(BeanConvertUtil.beanCovertMap(ownerCarDto)), OwnerCarDto.class);
+
+ return ownerCarDtos;
+ }
+
+
+ @Override
+ public List<RoomDto> queryRoomsTree(@RequestBody RoomDto roomDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ List<RoomDto> roomDtos = BeanConvertUtil.covertBeanList(reportCommunityServiceDaoImpl.queryRoomsTree(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
+
+ return roomDtos;
+ }
+
+ @Override
+ public int queryHisOwnerCarCount(@RequestBody OwnerCarDto ownerCarDto) {
+ return reportCommunityServiceDaoImpl.queryHisOwnerCarCount(BeanConvertUtil.beanCovertMap(ownerCarDto));
+ }
+
+ @Override
+ public List<OwnerCarDto> queryHisOwnerCars(@RequestBody OwnerCarDto ownerCarDto) {
+
+ int page = ownerCarDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerCarDto.setPage((page - 1) * ownerCarDto.getRow());
+ }
+
+ List<OwnerCarDto> ownerCars = BeanConvertUtil.covertBeanList(reportCommunityServiceDaoImpl.queryHisOwnerCars(BeanConvertUtil.beanCovertMap(ownerCarDto)), OwnerCarDto.class);
+
+ return ownerCars;
+ }
+
+ @Override
+ public int queryHisOwnerCount(@RequestBody OwnerDto ownerDto) {
+ return reportCommunityServiceDaoImpl.queryHisOwnerCount(BeanConvertUtil.beanCovertMap(ownerDto));
+ }
+
+ @Override
+ public List<OwnerDto> queryHisOwners(@RequestBody OwnerDto ownerDto) {
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
+
+ List<OwnerDto> ownerDtos = BeanConvertUtil.covertBeanList(
+ reportCommunityServiceDaoImpl.queryHisOwners(BeanConvertUtil.beanCovertMap(ownerDto)),
+ OwnerDto.class);
+
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ return ownerDtos;
+ }
+ String[] memberIds = getMemberIds(ownerDtos);
+ OwnerAttrDto ownerAttrDto = new OwnerAttrDto();
+ ownerAttrDto.setMemberIds(memberIds);
+ ownerAttrDto.setCommunityId(ownerDto.getCommunityId());
+ List<OwnerAttrDto> ownerAttrDtos = ownerAttrInnerServiceSMOImpl.queryOwnerAttrs(ownerAttrDto);
+
+ for (OwnerDto owner : ownerDtos) {
+ refreshOwner(owner, ownerAttrDtos);
+ }
+
+
+ return ownerDtos;
+ }
+
+ @Override
+ public int queryHisFeeCount(@RequestBody FeeDto feeDto) {
+ return reportCommunityServiceDaoImpl.queryHisFeeCount(BeanConvertUtil.beanCovertMap(feeDto));
+ }
+
+ @Override
+ public List<FeeDto> queryHisFees(@RequestBody FeeDto feeDto) {
+ int page = feeDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ feeDto.setPage((page - 1) * feeDto.getRow());
+ }
+
+ List<FeeDto> feeDtos = BeanConvertUtil.covertBeanList(
+ reportCommunityServiceDaoImpl.queryHisFees(BeanConvertUtil.beanCovertMap(feeDto)),
+ FeeDto.class);
+
+ return feeDtos;
+ }
+
+ /**
+ * 鑾峰彇鎵归噺userId
+ *
+ * @param owners 灏忓尯妤间俊鎭�
+ * @return 鎵归噺userIds 淇℃伅
+ */
+ private String[] getMemberIds(List<OwnerDto> owners) {
+ List<String> memberIds = new ArrayList<String>();
+ for (OwnerDto owner : owners) {
+ memberIds.add(owner.getMemberId());
+ }
+
+ return memberIds.toArray(new String[memberIds.size()]);
+ }
+
+ /**
+ * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
+ *
+ * @param owner 灏忓尯涓氫富淇℃伅
+ */
+ private void refreshOwner(OwnerDto owner, List<OwnerAttrDto> ownerAttrDtos) {
+
+ if (ownerAttrDtos == null || ownerAttrDtos.size() < 1) {
+ return;
+ }
+ List<OwnerAttrDto> tmpOwnerAttrDtos = new ArrayList<>();
+ for (OwnerAttrDto ownerAttrDto : ownerAttrDtos) {
+ if (ownerAttrDto.getMemberId().equals(owner.getMemberId())) {
+ tmpOwnerAttrDtos.add(ownerAttrDto);
+ }
+ }
+
+ owner.setOwnerAttrDtos(tmpOwnerAttrDtos);
+ }
}
--
Gitblit v1.8.0