From b47a5745a39a12911cb8f15d31ac2d6f117a8b23 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 16 六月 2022 08:54:46 +0800
Subject: [PATCH] 优化 查询房屋功能
---
service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
index ea0152b..c636440 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
@@ -9,7 +9,6 @@
import com.java110.dto.RoomDto;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.community.IFloorInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -21,6 +20,7 @@
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.vo.api.ApiRoomDataVo;
import com.java110.vo.api.ApiRoomVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -126,33 +126,41 @@
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
for (RoomDto roomDto : roomDtos) {
for (OwnerDto tmpOwnerDto : ownerDtos) {
- if (roomDto.getRoomId().equals(tmpOwnerDto.getRoomId())) {
- roomDto.setOwnerId(tmpOwnerDto.getOwnerId());
- roomDto.setOwnerName(tmpOwnerDto.getName());
- //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
- String idCard = tmpOwnerDto.getIdCard();
- if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 15) {
- idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
- }
- //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
- String link = tmpOwnerDto.getLink();
- if (mark.size() == 0 && link != null && !link.equals("") && link.length() > 10) {
- link = link.substring(0, 3) + "****" + link.substring(7);
- }
- roomDto.setIdCard(idCard);
- roomDto.setLink(link);
+ if (!roomDto.getRoomId().equals(tmpOwnerDto.getRoomId())) {
+ continue;
}
+ try {
+ roomDto.setStartTime(DateUtil.getDateFromString(tmpOwnerDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
+ roomDto.setEndTime(DateUtil.getDateFromString(tmpOwnerDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ }catch (Exception e){
+ //
+ }
+ roomDto.setOwnerId(tmpOwnerDto.getOwnerId());
+ roomDto.setOwnerName(tmpOwnerDto.getName());
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = tmpOwnerDto.getIdCard();
+ if (mark.size() == 0 && idCard != null && !idCard.equals("") && idCard.length() > 15) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = tmpOwnerDto.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("") && link.length() > 10) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ }
+ roomDto.setIdCard(idCard);
+ roomDto.setLink(link);
+
//鍟嗛摵绫诲瀷鏌ヨ璧风鏃堕棿
- if (roomDto.getRoomType().equals(RoomDto.ROOM_TYPE_SHOPS)) {
- OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setRoomId(roomDto.getRoomId());
- ownerRoomRelDto.setStatusCd("0");
- List<OwnerRoomRelDto> ownerRoomRelDtoList = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if (ownerRoomRelDtoList != null && ownerRoomRelDtoList.size() == 1) {
- roomDto.setStartTime(ownerRoomRelDtoList.get(0).getStartTime());
- roomDto.setEndTime(ownerRoomRelDtoList.get(0).getEndTime());
- }
- }
+// if (roomDto.getRoomType().equals(RoomDto.ROOM_TYPE_SHOPS)) {
+// OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+// ownerRoomRelDto.setRoomId(roomDto.getRoomId());
+// ownerRoomRelDto.setStatusCd("0");
+// List<OwnerRoomRelDto> ownerRoomRelDtoList = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+// if (ownerRoomRelDtoList != null && ownerRoomRelDtoList.size() == 1) {
+// roomDto.setStartTime(ownerRoomRelDtoList.get(0).getStartTime());
+// roomDto.setEndTime(ownerRoomRelDtoList.get(0).getEndTime());
+// }
+// }
}
}
}
--
Gitblit v1.8.0