From 88214b60acac265ab2f8fd57560e6ee5a8a3bfde Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 13 Jun 2024 21:43:17 +0800
Subject: [PATCH] 启动失败
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 324 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 224 insertions(+), 100 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 905645a..3a81999 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,14 +29,17 @@
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;
@@ -59,6 +62,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;
/**
@@ -81,6 +86,10 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IHouseRentalService iHouseRentalService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -300,137 +309,228 @@
return baseMapper.getHouseholdListById(household);
}
+ /**
+ * 导出住户信息
+ * @param household
+ * @return
+ */
@Override
- public List<ImportHouseholdExcel> export(HouseholdVO household) {
- List<ImportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household);
+ public List<ExportHouseholdExcel> export(HouseholdVO household) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
+ // 重点人员与关注人员
+ if (Objects.nonNull(household.getLabelType())) {
+ extracted(household);
+ }
+ List<ExportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList()
+ );
return userHouseHoldExcels;
}
/**
* 导入住户数据
+ *
* @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;
- for (ImportHouseholdExcel houseHoldExcel : data) {
- HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
- // 判断姓名，手机号
- if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getPhoneNumber())){
- errorNum ++;
- continue;
- }
- // 查询库中是否已存在
- 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 (!Strings.isBlank(houseHoldExcel.getRelationship())) {
- householdEntity.setRelationship(Integer.parseInt(houseHoldExcel.getRelationship()));
- // 如果是业主，则需要往用户表插入用户
- if (householdEntity.getRelationship() == 1) {
- houseService.saveOrUpdateUser(householdEntity);
- }
- }
- /// 是否主要联系人
- if (!Strings.isBlank(houseHoldExcel.getIsPrimaryContact())) {
- householdEntity.setIsPrimaryContact(Integer.parseInt(houseHoldExcel.getIsPrimaryContact()));
- }
- // 居住状态
- if (!Strings.isBlank(houseHoldExcel.getResidentialStatus())) {
- householdEntity.setResidentialStatus(Integer.parseInt(houseHoldExcel.getResidentialStatus()));
- }
- // 性别
- if (!Strings.isBlank(houseHoldExcel.getGender())) {
- householdEntity.setGender(Short.parseShort(houseHoldExcel.getGender()));
- }
- // 居民身份证
- if (!Strings.isBlank(houseHoldExcel.getIdCard())) {
- if (IdcardUtil.isValidCard(houseHoldExcel.getIdCard())) {
- // 身份证类型为居民身份证
- householdEntity.setCardType(111);
- }
- }
- // 党员
- if (!Strings.isBlank(houseHoldExcel.getPartyEmber())) {
- householdEntity.setPartyEmber(Integer.parseInt(houseHoldExcel.getPartyEmber()));
- }
- // 民族
- if (!Strings.isBlank(houseHoldExcel.getEthnicity())) {
- householdEntity.setEthnicity(Integer.parseInt(houseHoldExcel.getEthnicity()));
- }
- // 学历
- if (!Strings.isBlank(houseHoldExcel.getEducation())) {
- householdEntity.setEducation(Integer.parseInt(houseHoldExcel.getEducation()));
- }
- // 健康状况
- if (!Strings.isBlank(houseHoldExcel.getHealthStatus())) {
- householdEntity.setHealthStatus(Integer.parseInt(houseHoldExcel.getHealthStatus()));
- }
- // 工作状态
- if (!Strings.isBlank(houseHoldExcel.getWorkStatus())) {
- householdEntity.setWorkStatus(Integer.parseInt(houseHoldExcel.getWorkStatus()));
- }
- // 外出时间
- if (!Strings.isBlank(houseHoldExcel.getGoOutTime())) {
- try {
- Date date = new SimpleDateFormat("yyyy-MM-dd").parse(houseHoldExcel.getGoOutTime());
- householdEntity.setGoOutTime(date);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }
- // 婚姻状态
- if (!Strings.isBlank(houseHoldExcel.getMaritalStatus())) {
- householdEntity.setMaritalStatus(Integer.parseInt(houseHoldExcel.getMaritalStatus()));
- }
- if (one==null){
- // 新增
- this.save(householdEntity);
- importNum++;
- // 处理标签
- handleLabel(householdEntity,houseHoldExcel);
- }else {
- updateNum++;
- if (isCovered){
- // 覆盖更新
- householdEntity.setId(one.getId());
- // 更新
- updateById(householdEntity);
- importNum++;
- // 处理标签
- handleLabel(householdEntity,houseHoldExcel);
+ // 创建一个固定大小的线程池
+ int numberOfThreads = Runtime.getRuntime().availableProcessors(); // 使用可用处理器数量作为线程数
+ ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);
+
+ // 创建Future列表来保存每个任务的结果
+ List<Future<String>> futures = new ArrayList<>();
+
+ for (ImportHouseholdExcel houseHoldExcel : data) {
+ Callable<String> task = () -> importHouseHold(houseHoldExcel,houseService,isCovered,isTenant);
+ futures.add(executorService.submit(task));
+ }
+ // 收集并打印结果
+ for (Future<String> future : futures) {
+ try {
+ String result = future.get();
+ switch (result){
+ case "1":
+ importNum++;
+ break;
+ case "2":
+ updateNum++;
+ break;
+ case "3":
+ errorNum++;
+ break;
}
+ // 获取并打印每个任务的结果
+ } catch (InterruptedException | ExecutionException e) {
+ e.printStackTrace();
}
+ }
+ // 关闭线程池
+ 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(" 条数据，")
- .append("其中有 ").append(updateNum).append(" 条数据已存在。");
- if (errorNum>0){
- builder.append("共有 ").append(errorNum).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 String importHouseHold(ImportHouseholdExcel houseHoldExcel, IHouseService houseService, Boolean isCovered,String isTenant) {
+ HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
+ // 判断姓名，手机号
+ if (Strings.isBlank(householdEntity.getName())
+ || Strings.isBlank(householdEntity.getHouseCode())
+ ) {
+ // errorNum++;
+ // continue;
+ return "3";
+ }
+ // 查询库中是否已存在
+ QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code", householdEntity.getHouseCode())
+ .eq("is_deleted", 0)
+ .eq("name", householdEntity.getName());
+ List<HouseholdEntity> list = this.list(wrapper);
+ // 与角色关系
+ if (!Strings.isBlank(houseHoldExcel.getRelationship())) {
+ householdEntity.setRelationship(Integer.parseInt(houseHoldExcel.getRelationship()));
+ // 如果是业主，则需要往用户表插入用户
+ if (householdEntity.getRelationship() == 1) {
+ 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 {
+ // 新建出租屋
+ 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()));
+ }
+ // 居住状态
+ if (!Strings.isBlank(houseHoldExcel.getResidentialStatus())) {
+ householdEntity.setResidentialStatus(Integer.parseInt(houseHoldExcel.getResidentialStatus()));
+ }
+ // 性别
+ if (!Strings.isBlank(houseHoldExcel.getGender())) {
+ householdEntity.setGender(Short.parseShort(houseHoldExcel.getGender()));
+ }
+ // 居民身份证
+ if (!Strings.isBlank(houseHoldExcel.getIdCard())) {
+ if (IdcardUtil.isValidCard(houseHoldExcel.getIdCard())) {
+ // 身份证类型为居民身份证
+ householdEntity.setCardType(111);
+ }
+ }
+ // 党员
+ if (!Strings.isBlank(houseHoldExcel.getPartyEmber())) {
+ householdEntity.setPartyEmber(Integer.parseInt(houseHoldExcel.getPartyEmber()));
+ }
+ // 民族
+ if (!Strings.isBlank(houseHoldExcel.getEthnicity())) {
+ householdEntity.setEthnicity(Integer.parseInt(houseHoldExcel.getEthnicity()));
+ }
+ // 学历
+ if (!Strings.isBlank(houseHoldExcel.getEducation())) {
+ householdEntity.setEducation(Integer.parseInt(houseHoldExcel.getEducation()));
+ }
+ // 健康状况
+ if (!Strings.isBlank(houseHoldExcel.getHealthStatus())) {
+ householdEntity.setHealthStatus(Integer.parseInt(houseHoldExcel.getHealthStatus()));
+ }
+ // 工作状态
+ if (!Strings.isBlank(houseHoldExcel.getWorkStatus())) {
+ householdEntity.setWorkStatus(Integer.parseInt(houseHoldExcel.getWorkStatus()));
+ }
+ // 外出时间
+ if (!Strings.isBlank(houseHoldExcel.getGoOutTime())) {
+ try {
+ Date date = new SimpleDateFormat("yyyy-MM-dd").parse(houseHoldExcel.getGoOutTime());
+ householdEntity.setGoOutTime(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ // 婚姻状态
+ if (!Strings.isBlank(houseHoldExcel.getMaritalStatus())) {
+ householdEntity.setMaritalStatus(Integer.parseInt(houseHoldExcel.getMaritalStatus()));
+ }
+
+ if (list.size() == 0) {
+ // 新增
+ this.save(householdEntity);
+ // importNum++;
+ // 处理标签
+ handleLabel(householdEntity, houseHoldExcel);
+ return "1";
+ } else {
+ // updateNum++;
+ if (isCovered) {
+ for (HouseholdEntity one : list) {
+ // 覆盖更新
+ householdEntity.setId(one.getId());
+ // 更新
+ updateById(householdEntity);
+ // 处理标签
+ handleLabel(householdEntity, houseHoldExcel);
+ }
+ // importNum++;
+ return "2";
+ }
+ }
+ return "3";
+ }
+
/**
* 标签处理
+ *
* @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){
@@ -742,12 +842,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