From 9f1bbc41aa1ac91f1d7e7deeb85476796e95709c Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 18 Jun 2024 14:56:51 +0800
Subject: [PATCH] 警情处置+二手交易
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 207 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 177 insertions(+), 30 deletions(-)
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 7987c78..7b04ed6 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
@@ -23,21 +23,25 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
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.HouseTenantExcel;
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;
@@ -60,6 +64,8 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -70,6 +76,8 @@
*/
@Service
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
+
+ private static Logger logger = LoggerFactory.getLogger(HouseholdServiceImpl.class);
@Autowired
private IUserHouseLabelService userHouseLabelService;
@@ -82,6 +90,10 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IHouseRentalService iHouseRentalService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -324,31 +336,106 @@
/**
* 导入住户数据
+ *
* @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;
int updateNum = 0;
int errorNum = 0;
+
+ // 创建一个固定大小的线程池
+ int numberOfThreads = Runtime.getRuntime().availableProcessors(); // 使用可用处理器数量作为线程数
+ ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);
+
+ // 创建Future列表来保存每个任务的结果
+ List<Future<Map<String, String>>> futures = new ArrayList<>();
+
for (ImportHouseholdExcel houseHoldExcel : data) {
+ Callable<Map<String, String>> task = () -> importHouseHold(houseHoldExcel, houseService, isCovered, isTenant);
+ futures.add(executorService.submit(task));
+ }
+ // 收集并打印结果
+ for (Future<Map<String, String>> future : futures) {
+ try {
+ Map<String, String> stringStringMap = future.get();
+ logger.info("结果：{}", stringStringMap);
+ String result = stringStringMap.get("restult");
+ switch (result) {
+ case "1":
+ importNum++;
+ break;
+ case "2":
+ updateNum++;
+ break;
+ case "3":
+ errorNum++;
+ break;
+ case "4":
+ importNum++;
+ updateNum++;
+ break;
+ default:
+ errorNum++;
+ break;
+ }
+ // 获取并打印每个任务的结果
+ } catch (InterruptedException | ExecutionException e) {
+ errorNum++;
+ logger.error("获取异常-----》", e);
+ }
+ }
+ // 关闭线程池
+ executorService.shutdown();
+ try {
+ if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+ executorService.shutdownNow();
+ }
+ } catch (InterruptedException e) {
+ executorService.shutdownNow();
+ }
+ StringBuilder builder = new StringBuilder("导入完成!");
+ builder.append("其中本次表格共有 ").append(totalNum).append(" 条数据，")
+ .append("成功导入 ").append(importNum).append(" 条数据。");
+ if (updateNum > 0) {
+ builder.append("其中有 ").append(updateNum).append(" 条数据已存在。");
+ }
+ if (errorNum > 0) {
+ builder.append("共有 ").append(errorNum).append(" 条数据由于无姓名或门牌地址编码信息未导入!");
+ }
+ return builder.toString();
+ }
+
+
+ public Map<String, String> importHouseHold(ImportHouseholdExcel houseHoldExcel, IHouseService houseService, Boolean isCovered, String isTenant) {
+ Map<String, String> objectObjectHashMap = new HashMap<>();
+ try {
HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
// 判断姓名，手机号
- if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getPhoneNumber())){
- errorNum ++;
- continue;
+ if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getHouseCode())) {
+ objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
+ objectObjectHashMap.put("restult", "3");
+ return objectObjectHashMap;
+ }
+ // 去除手机号中间空格
+ if (StringUtils.isNotBlank(householdEntity.getPhoneNumber())) {
+ householdEntity.setPhoneNumber(householdEntity.getPhoneNumber().replaceAll(" ", ""));
}
// 查询库中是否已存在
QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
wrapper.eq("house_code", householdEntity.getHouseCode())
.eq("is_deleted", 0)
- .eq("phone_number", householdEntity.getPhoneNumber())
.eq("name", householdEntity.getName());
- HouseholdEntity one = this.getOne(wrapper);
+ // 判断是否租客
+ if (StringUtils.isNotBlank(isTenant)) {
+ wrapper.eq("relationship", 18);
+ }
+ List<HouseholdEntity> list = this.list(wrapper);
// 与角色关系
if (!Strings.isBlank(houseHoldExcel.getRelationship())) {
householdEntity.setRelationship(Integer.parseInt(houseHoldExcel.getRelationship()));
@@ -357,6 +444,29 @@
houseService.saveOrUpdateUser(householdEntity);
}
}
+ // 判断是否租户导入
+ if (StringUtils.isNotBlank(isTenant)) {
+ householdEntity.setRelationship(18);
+ HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
+ .eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()).last("limit 1"));
+ if (houseRentalEntity != null) {
+ householdEntity.setHousingRentalId(houseRentalEntity.getId());
+ } else {
+ // 新建出租屋
+ HouseRentalEntity rentalEntity = new HouseRentalEntity();
+ rentalEntity.setHouseCode(householdEntity.getHouseCode());
+ rentalEntity.setHouseStatus(1);
+ rentalEntity.setAuditStatus(0);
+ rentalEntity.setRentalUse(4);
+ rentalEntity.setTenantRelationship(1);
+ rentalEntity.setRentalTime(new Date());
+ rentalEntity.setDueTime(new Date());
+ rentalEntity.setTerminationTime(new Date());
+ iHouseRentalService.save(rentalEntity);
+ householdEntity.setHousingRentalId(rentalEntity.getId());
+ }
+ }
+
/// 是否主要联系人
if (!Strings.isBlank(houseHoldExcel.getIsPrimaryContact())) {
householdEntity.setIsPrimaryContact(Integer.parseInt(houseHoldExcel.getIsPrimaryContact()));
@@ -410,42 +520,55 @@
householdEntity.setMaritalStatus(Integer.parseInt(houseHoldExcel.getMaritalStatus()));
}
- if (one==null){
+ if (list.size() == 0) {
// 新增
this.save(householdEntity);
- importNum++;
+ // importNum++;
// 处理标签
- handleLabel(householdEntity,houseHoldExcel);
- }else {
- updateNum++;
- if (isCovered){
- // 覆盖更新
- householdEntity.setId(one.getId());
- // 更新
- updateById(householdEntity);
- importNum++;
- // 处理标签
- handleLabel(householdEntity,houseHoldExcel);
+ handleLabel(householdEntity, houseHoldExcel);
+ // return "1";
+ objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
+ objectObjectHashMap.put("restult", "1");
+ return objectObjectHashMap;
+ } else {
+ // updateNum++;
+ if (isCovered) {
+ for (HouseholdEntity one : list) {
+ // 覆盖更新
+ householdEntity.setId(one.getId());
+ // 更新
+ updateById(householdEntity);
+ // 处理标签
+ handleLabel(householdEntity, houseHoldExcel);
+ }
+ // importNum++;
+ // return "4";
+ objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
+ objectObjectHashMap.put("restult", "4");
+ return objectObjectHashMap;
}
+ // return "2";
+ objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
+ objectObjectHashMap.put("restult", "2");
+ return objectObjectHashMap;
}
+ } catch (Exception e) {
+ logger.error("异常导入------------》", e);
+ // return "3";
+ // objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
+ objectObjectHashMap.put("restult", "3");
+ return objectObjectHashMap;
}
- StringBuilder builder = new StringBuilder("导入完成!");
- builder.append("其中本次表格共有 ").append(totalNum).append(" 条数据，")
- .append("成功导入 ").append(importNum).append(" 条数据，")
- .append("其中有 ").append(updateNum).append(" 条数据已存在。");
- if (errorNum>0){
- builder.append("共有 ").append(errorNum).append(" 条数据由于无姓名或手机号信息未导入!");
- }
- return builder.toString();
}
/**
* 标签处理
+ *
* @param householdEntity
* @param houseHoldExcel
*/
public void handleLabel(HouseholdEntity householdEntity, ImportHouseholdExcel houseHoldExcel) {
- if (!Strings.isBlank(houseHoldExcel.getLabelName())){
+ if (!Strings.isBlank(houseHoldExcel.getLabelName())) {
// 查询对应的label集合信息
List<UserHouseLabelEntity> userHouseLabelList = userHouseLabelService.getLabelList(houseHoldExcel.getLabelName());
if (userHouseLabelList.size()>0){
@@ -757,12 +880,36 @@
/**
* 查询对应的住户集合
+ *
* @param i
* @param size
* @return
*/
@Override
public List<HouseholdVO> getAllList(int i, int size) {
- return baseMapper.getAllList(i,size);
+ return baseMapper.getAllList(i, size);
+ }
+
+ @Override
+ public List<HouseTenantExcel> exportTenant(HouseholdVO household) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
+ List<HouseTenantExcel> houseTenantExcels = baseMapper.exportTenant(household,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList()
+ );
+ return houseTenantExcels;
+ }
+
+ @Override
+ public boolean saveOrUpdateHouseholdBatch(List<HouseholdVO> householdVOList) {
+ if (householdVOList.size() == 0) {
+ return false;
+ }
+ AtomicBoolean restult = new AtomicBoolean(false);
+ householdVOList.forEach(item -> {
+ restult.set(saveOrUpdateHousehold(item));
+ });
+ return restult.get();
}
}
--
Gitblit v1.9.3