From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/smo/impl/ParkingAreaInnerServiceSMOImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ParkingAreaInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ParkingAreaInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 2c2f78a..f3efe3a
--- a/service-community/src/main/java/com/java110/community/smo/impl/ParkingAreaInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/ParkingAreaInnerServiceSMOImpl.java
@@ -1,18 +1,23 @@
package com.java110.community.smo.impl;
+import com.java110.community.dao.IParkingAreaAttrServiceDao;
import com.java110.community.dao.IParkingAreaServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.community.IParkingAreaInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.parking.ParkingAreaDto;
+import com.java110.dto.parkingAreaAttr.ParkingAreaAttrDto;
+import com.java110.intf.community.IParkingAreaInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -27,6 +32,8 @@
@Autowired
private IParkingAreaServiceDao parkingAreaServiceDaoImpl;
+ @Autowired
+ private IParkingAreaAttrServiceDao parkingAreaAttrServiceDaoImpl;
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -44,10 +51,38 @@
List<ParkingAreaDto> parkingAreas = BeanConvertUtil.covertBeanList(parkingAreaServiceDaoImpl.getParkingAreaInfo(BeanConvertUtil.beanCovertMap(parkingAreaDto)), ParkingAreaDto.class);
+ freshParkingAreas(parkingAreas);
return parkingAreas;
}
+ private void freshParkingAreas(List<ParkingAreaDto> parkingAreas) {
+ List<String> paIds = new ArrayList<>();
+
+ if (parkingAreas == null || parkingAreas.size() < 1) {
+ return;
+ }
+ for (ParkingAreaDto parkingArea : parkingAreas) {
+ paIds.add(parkingArea.getPaId());
+ }
+
+ Map info = new HashMap();
+ info.put("paIds", paIds.toArray(new String[paIds.size()]));
+ List<ParkingAreaAttrDto> parkingAreaAttrDtos = BeanConvertUtil.covertBeanList(parkingAreaAttrServiceDaoImpl.getParkingAreaAttrInfo(info), ParkingAreaAttrDto.class);
+
+ if (parkingAreaAttrDtos == null || parkingAreaAttrDtos.size() < 1) {
+ return;
+ }
+ for (ParkingAreaDto parkingArea : parkingAreas) {
+ List<ParkingAreaAttrDto> tmpParkingAreaAttrDtos = new ArrayList<>();
+ for (ParkingAreaAttrDto parkingAreaAttrDto : parkingAreaAttrDtos) {
+ if (parkingArea.getPaId().equals(parkingAreaAttrDto.getPaId())) {
+ tmpParkingAreaAttrDtos.add(parkingAreaAttrDto);
+ }
+ }
+ parkingArea.setAttrs(tmpParkingAreaAttrDtos);
+ }
+ }
@Override
--
Gitblit v1.8.0