From fe81eb39c7402082f54e6aaee491efbcbb1aa50a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 13:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 154 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 143 insertions(+), 11 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 9bbb1e9..905645a 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
@@ -16,7 +16,7 @@
*/
package org.springblade.modules.house.service.impl;
-import com.alibaba.fastjson.JSON;
+import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,14 +29,15 @@
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
-import org.springblade.core.mp.support.Condition;
+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.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
-import org.springblade.modules.house.excel.HouseHoldExcel;
+import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
+import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseholdLabelVO;
@@ -44,7 +45,6 @@
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
-import org.springblade.modules.label.vo.LabelVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.system.entity.DictBiz;
@@ -56,6 +56,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StopWatch;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -299,19 +301,149 @@
}
@Override
- public List<HouseHoldExcel> export(HouseholdVO household) {
- List<HouseHoldExcel> userHouseHoldExcels = baseMapper.export(household);
+ public List<ImportHouseholdExcel> export(HouseholdVO household) {
+ List<ImportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household);
return userHouseHoldExcels;
}
+ /**
+ * 导入住户数据
+ * @param data
+ * @param isCovered
+ */
@Override
@Transactional(rollbackFor = Exception.class)
- public void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered) {
- data.forEach(houseHoldExcel -> {
- HouseholdEntity houseHoldEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
- this.save(houseHoldEntity);
- });
+ public String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered) {
+ 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);
+ }
+ }
+ }
+ 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())){
+ // 查询对应的label集合信息
+ List<UserHouseLabelEntity> userHouseLabelList = userHouseLabelService.getLabelList(houseHoldExcel.getLabelName());
+ if (userHouseLabelList.size()>0){
+ for (UserHouseLabelEntity userHouseLabelEntity : userHouseLabelList) {
+ userHouseLabelEntity.setHouseCode(householdEntity.getHouseCode());
+ userHouseLabelEntity.setHouseholdId(householdEntity.getId());
+ userHouseLabelEntity.setUserId(householdEntity.getAssociatedUserId());
+ userHouseLabelEntity.setLableType(1);
+ userHouseLabelEntity.setColor("green");
+ userHouseLabelService.saveOrUpdateHouseholdLabel(userHouseLabelEntity);
+ }
+ }
+ }
}
/**
--
Gitblit v1.9.3