From 86672b1313d17f75c2d0219d0817097c459e1dbf Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 02 十二月 2021 14:38:52 +0800
Subject: [PATCH] 房屋租赁修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java | 124 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 55 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
index ba55404..b3b54d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -124,43 +125,49 @@
List<String> housePictures = registerDTO.getHousePictures();
if (!housePictures.isEmpty()) {
housePictures.forEach(e -> {
- RentingHourseFile file = new RentingHourseFile();
- file.setId(Snowflake.getId());
- file.setClassification(RentingHourseFile.Classification.fytp);
- file.setRefId(registerId);
- file.setType(RentingHourseFile.Type.picture);
- file.setUrl(e);
- file.setCreateBy(userId);
- file.setCreateAt(nowDate);
- files.add(file);
+ if (StringUtils.isNotBlank(e)) {
+ RentingHourseFile file = new RentingHourseFile();
+ file.setId(Snowflake.getId());
+ file.setClassification(RentingHourseFile.Classification.fytp);
+ file.setRefId(registerId);
+ file.setType(RentingHourseFile.Type.picture);
+ file.setUrl(e);
+ file.setCreateBy(userId);
+ file.setCreateAt(nowDate);
+ files.add(file);
+ }
});
}
List<String> propertyPictures = registerDTO.getPropertyPictures();
if (!propertyPictures.isEmpty()) {
propertyPictures.forEach(e -> {
- RentingHourseFile file = new RentingHourseFile();
- file.setId(Snowflake.getId());
- file.setClassification(RentingHourseFile.Classification.cqtp);
- file.setRefId(registerId);
- file.setType(RentingHourseFile.Type.picture);
- file.setUrl(e);
- file.setCreateBy(userId);
- file.setCreateAt(nowDate);
- files.add(file);
+ if (StringUtils.isNotBlank(e)) {
+ RentingHourseFile file = new RentingHourseFile();
+ file.setId(Snowflake.getId());
+ file.setClassification(RentingHourseFile.Classification.cqtp);
+ file.setRefId(registerId);
+ file.setType(RentingHourseFile.Type.picture);
+ file.setUrl(e);
+ file.setCreateBy(userId);
+ file.setCreateAt(nowDate);
+ files.add(file);
+ }
});
}
List<String> credentialsPictures = registerDTO.getCredentialsPictures();
if (!credentialsPictures.isEmpty()) {
credentialsPictures.forEach(e -> {
- RentingHourseFile file = new RentingHourseFile();
- file.setId(Snowflake.getId());
- file.setClassification(RentingHourseFile.Classification.zjzq);
- file.setRefId(registerId);
- file.setType(RentingHourseFile.Type.picture);
- file.setUrl(e);
- file.setCreateBy(userId);
- file.setCreateAt(nowDate);
- files.add(file);
+ if (StringUtils.isNotBlank(e)) {
+ RentingHourseFile file = new RentingHourseFile();
+ file.setId(Snowflake.getId());
+ file.setClassification(RentingHourseFile.Classification.zjzq);
+ file.setRefId(registerId);
+ file.setType(RentingHourseFile.Type.picture);
+ file.setUrl(e);
+ file.setCreateBy(userId);
+ file.setCreateAt(nowDate);
+ files.add(file);
+ }
});
}
rentingHourseFileService.saveBatch(files);
@@ -218,15 +225,17 @@
.eq(RentingHourseFile::getClassification, RentingHourseFile.Classification.fytp)
.eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
housePictures.forEach(e -> {
- RentingHourseFile file = new RentingHourseFile();
- file.setId(Snowflake.getId());
- file.setClassification(RentingHourseFile.Classification.fytp);
- file.setRefId(id);
- file.setType(RentingHourseFile.Type.picture);
- file.setUrl(e);
- file.setCreateBy(userId);
- file.setCreateAt(nowDate);
- files.add(file);
+ if (StringUtils.isNotBlank(e)) {
+ RentingHourseFile file = new RentingHourseFile();
+ file.setId(Snowflake.getId());
+ file.setClassification(RentingHourseFile.Classification.fytp);
+ file.setRefId(id);
+ file.setType(RentingHourseFile.Type.picture);
+ file.setUrl(e);
+ file.setCreateBy(userId);
+ file.setCreateAt(nowDate);
+ files.add(file);
+ }
});
}
List<String> propertyPictures = registerDTO.getPropertyPictures();
@@ -236,15 +245,17 @@
.eq(RentingHourseFile::getClassification, RentingHourseFile.Classification.cqtp)
.eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
propertyPictures.forEach(e -> {
- RentingHourseFile file = new RentingHourseFile();
- file.setId(Snowflake.getId());
- file.setClassification(RentingHourseFile.Classification.cqtp);
- file.setRefId(id);
- file.setType(RentingHourseFile.Type.picture);
- file.setUrl(e);
- file.setCreateBy(userId);
- file.setCreateAt(nowDate);
- files.add(file);
+ if (StringUtils.isNotBlank(e)) {
+ RentingHourseFile file = new RentingHourseFile();
+ file.setId(Snowflake.getId());
+ file.setClassification(RentingHourseFile.Classification.cqtp);
+ file.setRefId(id);
+ file.setType(RentingHourseFile.Type.picture);
+ file.setUrl(e);
+ file.setCreateBy(userId);
+ file.setCreateAt(nowDate);
+ files.add(file);
+ }
});
}
List<String> credentialsPictures = registerDTO.getCredentialsPictures();
@@ -254,15 +265,17 @@
.eq(RentingHourseFile::getClassification, RentingHourseFile.Classification.zjzq)
.eq(RentingHourseFile::getType, RentingHourseFile.Type.picture));
credentialsPictures.forEach(e -> {
- RentingHourseFile file = new RentingHourseFile();
- file.setId(Snowflake.getId());
- file.setClassification(RentingHourseFile.Classification.zjzq);
- file.setRefId(id);
- file.setType(RentingHourseFile.Type.picture);
- file.setUrl(e);
- file.setCreateBy(userId);
- file.setCreateAt(nowDate);
- files.add(file);
+ if (StringUtils.isNotBlank(e)) {
+ RentingHourseFile file = new RentingHourseFile();
+ file.setId(Snowflake.getId());
+ file.setClassification(RentingHourseFile.Classification.zjzq);
+ file.setRefId(id);
+ file.setType(RentingHourseFile.Type.picture);
+ file.setUrl(e);
+ file.setCreateBy(userId);
+ file.setCreateAt(nowDate);
+ files.add(file);
+ }
});
}
rentingHourseFileService.saveBatch(files);
@@ -398,7 +411,8 @@
@Override
public R nearby(NearbyDTO nearbyDTO) {
Rectangle rectangle =new NearbyUtil().getRectangle(nearbyDTO.getDistance(), Double.parseDouble(nearbyDTO.getLongitude()), Double.parseDouble(nearbyDTO.getLatitude()));
- return R.ok(this.baseMapper.nearby(rectangle.getMinX(),rectangle.getMaxX(),rectangle.getMinY(),rectangle.getMaxY(),nearbyDTO.getKeyword()));
+ return R.ok(this.baseMapper.nearby(rectangle.getMinX(),rectangle.getMaxX(),
+ rectangle.getMinY(),rectangle.getMaxY(),nearbyDTO.getKeyword(), nearbyDTO.getCommunityId()));
}
@Override
--
Gitblit v1.7.1