From 983acc56b667c90804dbf5f46dae8f0161876380 Mon Sep 17 00:00:00 2001
From: 曾成 <121184950@qq.com>
Date: 星期六, 28 三月 2020 19:36:36 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java | 44 ++------------------------------------------
1 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java
index aa6c078..9e1df75 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java
@@ -7,8 +7,8 @@
import com.java110.core.smo.parkingSpace.IParkingSpaceInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.ParkingSpaceDto;
-import com.java110.dto.UserDto;
+import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -46,47 +46,7 @@
List<ParkingSpaceDto> parkingSpaces = BeanConvertUtil.covertBeanList(parkingSpaceServiceDaoImpl.getParkingSpaceInfo(BeanConvertUtil.beanCovertMap(parkingSpaceDto)), ParkingSpaceDto.class);
- if (parkingSpaces == null || parkingSpaces.size() == 0) {
- return parkingSpaces;
- }
-
- String[] userIds = getUserIds(parkingSpaces);
- //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
-
- for (ParkingSpaceDto parkingSpace : parkingSpaces) {
- refreshParkingSpace(parkingSpace, users);
- }
return parkingSpaces;
- }
-
- /**
- * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
- *
- * @param parkingSpace 灏忓尯鍋滆溅浣嶄俊鎭�
- * @param users 鐢ㄦ埛鍒楄〃
- */
- private void refreshParkingSpace(ParkingSpaceDto parkingSpace, List<UserDto> users) {
- for (UserDto user : users) {
- if (parkingSpace.getUserId().equals(user.getUserId())) {
- BeanConvertUtil.covertBean(user, parkingSpace);
- }
- }
- }
-
- /**
- * 鑾峰彇鎵归噺userId
- *
- * @param parkingSpaces 灏忓尯妤间俊鎭�
- * @return 鎵归噺userIds 淇℃伅
- */
- private String[] getUserIds(List<ParkingSpaceDto> parkingSpaces) {
- List<String> userIds = new ArrayList<String>();
- for (ParkingSpaceDto parkingSpace : parkingSpaces) {
- userIds.add(parkingSpace.getUserId());
- }
-
- return userIds.toArray(new String[userIds.size()]);
}
@Override
--
Gitblit v1.8.0