From 244f750cde0700c15a9a7f1cc7caadcf8c5da980 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 20 May 2024 16:28:22 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 16 ++++++++++------
src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java | 6 +++++-
src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 2 +-
src/main/java/org/springblade/modules/house/controller/HouseTenantController.java | 2 ++
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 6 +-----
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 26 ++++++++++++++++++++++----
6 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseTenantController.java b/src/main/java/org/springblade/modules/house/controller/HouseTenantController.java
index 3c3d46e..66d9157 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseTenantController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseTenantController.java
@@ -36,6 +36,7 @@
import org.springblade.modules.house.service.IHouseTenantService;
import org.springblade.modules.house.vo.HouseTenantVO;
import org.springblade.modules.house.wrapper.HouseTenantWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -56,6 +57,7 @@
@Api(value = "租户管理", tags = "租户管理接口")
public class HouseTenantController extends BladeController {
+ @Autowired
private final IHouseTenantService houseTenantService;
/**
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index 0ba9196..ac490e7 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import lombok.AllArgsConstructor;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.boot.ctrl.BladeController;
@@ -36,7 +37,6 @@
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.ExportHouseholdExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
-import org.springblade.modules.house.excel.HouseHoldImporter;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
@@ -231,10 +231,10 @@
@PostMapping("import-household")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入住户", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered) {
+ public R importUser(MultipartFile file, Integer isCovered, @RequestParam(value = "isTenant", required = false) String isTenant) {
bladeLogger.info("住户信息导入", JsonUtil.toJson(isCovered));
- String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class),isCovered==1);
- return R.data(200,data,null);
+ String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class), isCovered == 1, isTenant);
+ return R.data(200, data, null);
}
/**
@@ -254,7 +254,7 @@
@GetMapping("/export-template")
@ApiOperationSupport(order = 15)
@ApiOperation(value = "模板下載", notes = "传入response")
- public void exportUser(HttpServletResponse response) {
+ public void exportUser(HttpServletResponse response, @RequestParam(value = "isTenant", required = false) String isTenant) {
List<ImportHouseholdExcel> list = new ArrayList<>();
ImportHouseholdExcel houseHoldExcel = new ImportHouseholdExcel();
// 设置模板数据
@@ -265,7 +265,11 @@
houseHoldExcel.setBirthday("2001-01-01");
houseHoldExcel.setIdCard("360*************0001");
houseHoldExcel.setOtherContact("13112341234");
- houseHoldExcel.setRelationship("1");
+ if (StringUtils.isBlank(isTenant)) {
+ houseHoldExcel.setRelationship("1");
+ } else {
+ houseHoldExcel.setRelationship("18");
+ }
houseHoldExcel.setIsPrimaryContact("1");
houseHoldExcel.setResidentialStatus("1");
houseHoldExcel.setEthnicity("1");
diff --git a/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java b/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java
index 146e632..adbb6c7 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseHoldImporter.java
@@ -3,6 +3,7 @@
import lombok.RequiredArgsConstructor;
import org.springblade.core.excel.support.ExcelImporter;
import org.springblade.modules.house.service.IHouseholdService;
+
import java.util.List;
/**
@@ -16,8 +17,11 @@
private final IHouseholdService iHouseholdService;
private final Boolean isCovered;
+
+ private final String isTenant;
+
@Override
public void save(List<ImportHouseholdExcel> data) {
- iHouseholdService.importUserHouseHold(data, isCovered);
+ iHouseholdService.importUserHouseHold(data, isCovered,isTenant);
}
}
diff --git a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
index 7f94fa7..bd00504 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -79,7 +79,7 @@
*/
List<ExportHouseholdExcel> export(HouseholdVO household);
- String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered);
+ String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered,String isTenant);
Integer statistics(Long userId,String neiCode,Integer confirmFlag);
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 63dd68f..6ed11e4 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -29,15 +29,16 @@
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
-import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.house.entity.HouseRentalEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.excel.ExportHouseholdExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
+import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.service.IUserHouseLabelService;
@@ -82,6 +83,10 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IHouseRentalService iHouseRentalService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -324,12 +329,13 @@
/**
* 导入住户数据
+ *
* @param data
* @param isCovered
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered) {
+ public String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered, String isTenant) {
IHouseService houseService = SpringUtils.getBean(IHouseService.class);
int totalNum = data.size();
int importNum = 0;
@@ -341,8 +347,8 @@
if (Strings.isBlank(householdEntity.getName())
|| Strings.isBlank(householdEntity.getPhoneNumber())
|| Strings.isBlank(householdEntity.getHouseCode())
- ){
- errorNum ++;
+ ) {
+ errorNum++;
continue;
}
// 查询库中是否已存在
@@ -360,6 +366,18 @@
houseService.saveOrUpdateUser(householdEntity);
}
}
+ // 判断是否租户导入
+ if (StringUtils.isNotBlank(isTenant)) {
+ householdEntity.setRelationship(18);
+ HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
+ .eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()));
+ if (houseRentalEntity != null) {
+ householdEntity.setHousingRentalId(houseRentalEntity.getId());
+ } else {
+ errorNum++;
+ continue;
+ }
+ }
/// 是否主要联系人
if (!Strings.isBlank(houseHoldExcel.getIsPrimaryContact())) {
householdEntity.setIsPrimaryContact(Integer.parseInt(houseHoldExcel.getIsPrimaryContact()));
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
index 87125df..3b27df7 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -177,11 +177,6 @@
@ApiModelProperty(value = "未成年 1：否 2：是", example = "")
private Integer minors;
- /**
- * 角色名称
- */
-// private String roleName;
-
// 角色名称
@ApiModelProperty(value = "角色名称", example = "")
private String roleName;
@@ -189,6 +184,7 @@
// 社区编号
@ApiModelProperty(value = "社区编号", example = "")
private String communityCode;
+
@ApiModelProperty(value = "小区id", example = "")
private String districtIds;
--
Gitblit v1.9.3