From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 3bbe760..3e283b5
--- a/service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java
@@ -3,15 +3,18 @@
import com.java110.common.dao.ICarBlackWhiteServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.ICarBlackWhiteInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.machine.CarBlackWhiteDto;
+import com.java110.dto.parking.ParkingAreaDto;
+import com.java110.intf.common.ICarBlackWhiteInnerServiceSMO;
+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.List;
/**
@@ -31,6 +34,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
+
@Override
public List<CarBlackWhiteDto> queryCarBlackWhites(@RequestBody CarBlackWhiteDto carBlackWhiteDto) {
@@ -45,9 +51,38 @@
List<CarBlackWhiteDto> carBlackWhites = BeanConvertUtil.covertBeanList(carBlackWhiteServiceDaoImpl.getCarBlackWhiteInfo(BeanConvertUtil.beanCovertMap(carBlackWhiteDto)), CarBlackWhiteDto.class);
+ if (carBlackWhiteDto.getRow() > 15) {
+ return carBlackWhites;
+ }
+ freshCarBlackWhites(carBlackWhites);
return carBlackWhites;
}
+ private void freshCarBlackWhites(List<CarBlackWhiteDto> carBlackWhites) {
+ List<String> paIds = new ArrayList<>();
+ for (CarBlackWhiteDto carBlackWhiteDto : carBlackWhites) {
+ paIds.add(carBlackWhiteDto.getPaId());
+ }
+
+ if (paIds.size() < 1) {
+ return;
+ }
+
+ ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+ parkingAreaDto.setCommunityId(carBlackWhites.get(0).getCommunityId());
+ parkingAreaDto.setPaIds(paIds.toArray(new String[paIds.size()]));
+ List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+ for (ParkingAreaDto tmpParkingAreaDto : parkingAreaDtos) {
+ for (CarBlackWhiteDto carBlackWhiteDto : carBlackWhites) {
+ if (tmpParkingAreaDto.getPaId().endsWith(carBlackWhiteDto.getPaId())) {
+ carBlackWhiteDto.setPaNum(tmpParkingAreaDto.getNum());
+ }
+ }
+ }
+
+ }
+
@Override
public int queryCarBlackWhitesCount(@RequestBody CarBlackWhiteDto carBlackWhiteDto) {
--
Gitblit v1.8.0