From 5d167ea6e943dd1574e0e6ed70ff25b8d4830f61 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 16 六月 2022 11:47:49 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 1 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java
index 514c3e0..7a4ba74 100755
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java
@@ -1,14 +1,17 @@
package com.java110.user.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
import com.java110.dto.user.UserDto;
+import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.user.dao.IOwnerCarAttrServiceDao;
import com.java110.user.dao.IOwnerCarServiceDao;
+import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +38,9 @@
private IOwnerCarServiceDao ownerCarServiceDaoImpl;
@Autowired
+ private IOwnerCarAttrServiceDao ownerCarAttrServiceDaoImpl;
+
+ @Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
@@ -50,7 +56,54 @@
List<OwnerCarDto> ownerCars = BeanConvertUtil.covertBeanList(ownerCarServiceDaoImpl.getOwnerCarInfo(BeanConvertUtil.beanCovertMap(ownerCarDto)), OwnerCarDto.class);
+ if (ownerCars != null && ownerCars.size() > 0) {
+ String[] carIds = getCarIds(ownerCars);
+ Map attrParamInfo = new HashMap();
+ attrParamInfo.put("carIds", carIds);
+ attrParamInfo.put("statusCd", StatusConstant.STATUS_CD_VALID);
+ List<OwnerCarAttrDto> ownerCarAttrDtoList = BeanConvertUtil.covertBeanList(ownerCarAttrServiceDaoImpl.getOwnerCarAttrInfo(attrParamInfo), OwnerCarAttrDto.class);
+ for (OwnerCarDto ownerCarDto1 : ownerCars) {
+ refreshOwnerCars(ownerCarDto1, ownerCarAttrDtoList);
+ }
+ }
return ownerCars;
+ }
+
+ /**
+ * 鑾峰彇carId 淇℃伅
+ *
+ * @param ownerCars 鎴垮眿淇℃伅
+ * @return carId
+ */
+ private String[] getCarIds(List<OwnerCarDto> ownerCars) {
+ List<String> carIds = new ArrayList<String>();
+ for (OwnerCarDto ownerCarDto : ownerCars) {
+ carIds.add(ownerCarDto.getCarId());
+ }
+
+ return carIds.toArray(new String[carIds.size()]);
+ }
+
+ /**
+ * @param ownerCarDto
+ * @param ownerCarAttrDtoList
+ */
+ private void refreshOwnerCars(OwnerCarDto ownerCarDto, List<OwnerCarAttrDto> ownerCarAttrDtoList) {
+
+ if (ownerCarAttrDtoList == null || ownerCarAttrDtoList.size() == 0) {
+ return;
+ }
+ List<OwnerCarAttrDto> tmpOwnerCarAttrDtos = new ArrayList<>();
+ for (OwnerCarAttrDto ownerCarAttrDto : ownerCarAttrDtoList) {
+ if (!ownerCarAttrDto.getCarId().equals(ownerCarDto.getCarId())) {
+ continue;
+ }
+ if (StringUtil.isEmpty(ownerCarAttrDto.getValueName())) {
+ ownerCarAttrDto.setValueName(ownerCarAttrDto.getValue());
+ }
+ tmpOwnerCarAttrDtos.add(ownerCarAttrDto);
+ }
+ ownerCarDto.setOwnerCarAttrDto(tmpOwnerCarAttrDtos);
}
/**
@@ -103,6 +156,7 @@
Map<String, Object> info = new HashMap<>();
info.put("carNums", carNums.toArray(new String[carNums.size()]));
info.put("communityId", tmpImportCarFees.get(0).getCommunityId());
+ info.put("statusCd", "0");
List<OwnerCarDto> ownerCarDtos = BeanConvertUtil.covertBeanList(ownerCarServiceDaoImpl.getOwnerCarInfo(info), OwnerCarDto.class);
for (OwnerCarDto ownerCarDto : ownerCarDtos) {
@@ -118,6 +172,37 @@
return tmpImportCarFees;
}
+ public List<ImportCustomCreateFeeDto> freshCarIdsByImportCustomCreateFee(@RequestBody List<ImportCustomCreateFeeDto> tmpImportCarFees) {
+ List<String> carNums = new ArrayList<>();
+ for (ImportCustomCreateFeeDto importRoomFee : tmpImportCarFees) {
+ if (StringUtil.isEmpty(importRoomFee.getCarNum())) {
+ continue;
+ }
+ carNums.add(importRoomFee.getCarNum());
+ }
+
+ if (carNums.size() < 1) {
+ return tmpImportCarFees;
+ }
+ Map<String, Object> info = new HashMap<>();
+ info.put("carNums", carNums.toArray(new String[carNums.size()]));
+ info.put("communityId", tmpImportCarFees.get(0).getCommunityId());
+ info.put("statusCd", "0");
+ List<OwnerCarDto> ownerCarDtos = BeanConvertUtil.covertBeanList(ownerCarServiceDaoImpl.getOwnerCarInfo(info), OwnerCarDto.class);
+
+ for (OwnerCarDto ownerCarDto : ownerCarDtos) {
+ for (ImportCustomCreateFeeDto importRoomFee : tmpImportCarFees) {
+ if (ownerCarDto.getCarNum().equals(importRoomFee.getCarNum())) {
+ importRoomFee.setPayObjId(ownerCarDto.getCarId());
+ importRoomFee.setOwnerId(ownerCarDto.getOwnerId());
+ importRoomFee.setOwnerName(ownerCarDto.getOwnerName());
+ importRoomFee.setOwnerLink(ownerCarDto.getLink());
+ }
+ }
+ }
+ return tmpImportCarFees;
+ }
+
@Override
public long queryOwnerParkingSpaceCount(@RequestBody OwnerCarDto ownerCarDto) {
return ownerCarServiceDaoImpl.queryOwnerParkingSpaceCount(BeanConvertUtil.beanCovertMap(ownerCarDto));
--
Gitblit v1.8.0