rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改: 

完成居民导入错误信息和跳过信息的收集
完成附加信息导入后对主表信息的修改
dev
wangxianzhang 4 years ago
parent
6e8138ecd0
commit
0cfcd83787
4 changed files with 299 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
  2. 82
      epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnums.java
  3. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/DynamicEasyExcelListener.java
  4. 288
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

2
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
View File

@ -49,7 +49,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
* @Author sun * @Author sun
* @Description 更新或新增居民信息各表数据 * @Description 更新或新增居民信息各表数据
**/ **/
void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, String> map); void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
List<Map<String,Object>> selectListResiMap(@Param("customerId") String customerId, List<Map<String,Object>> selectListResiMap(@Param("customerId") String customerId,
@Param("formCode") String formCode, @Param("formCode") String formCode,

82
epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnums.java
View File

@ -0,0 +1,82 @@
package com.epmet.enums;
import lombok.AllArgsConstructor;
import lombok.Data;
/**
* @Description 描述
* @Author wangxianzhang
* @Date 2021/11/5 10:37 上午
* @Version 1.0
*/
@AllArgsConstructor
public enum IcResiUserTableEnums {
IC_RESI_USER("ic_resi_user","社区居民基本信息录入表", 0, 3, null),
IC_PARTY_MEMBER("ic_party_member","党员信息录入表", 1, 2, "IS_PARTY"),
IC_ENSURE_HOUSE("ic_ensure_house","保障房人员信息录入表", 2, 2, "IS_ENSURE_HOUSE"),
IC_UNEMPLOYED("ic_unemployed","失业人员信息录入表", 3, 2, "IS_UNEMPLOYED"),
IC_VETERANS("ic_veterans","退役军人信息录入表", 4, 2, "IS_VETERANS"),
IC_UNITED_FRONT("ic_united_front","统战人员信息录入表", 5, 2, "IS_UNITED_FRONT"),
IC_VOLUNTEER("ic_volunteer","志愿者信息录入表", 6, 3, "IS_VOLUNTEER"),
IC_OLD_PEOPLE("ic_old_people","老年人信息录入表", 7, 2, "IS_OLD_PEOPLE"),
IC_SPECIAL("ic_special","特殊人群信息录入表", 8, 3, "IS_SPECIAL");
private String tableName;
private String tableComment;
private int sheetNo;
private int headRowNo;
private String mainTableFlagColumnName;
public static IcResiUserTableEnums getObjectByTableName(String tableName) {
for (IcResiUserTableEnums i : IcResiUserTableEnums.values()) {
if (i.tableName.equals(tableName)) {
return i;
}
}
return null;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public String getTableComment() {
return tableComment;
}
public void setTableComment(String tableComment) {
this.tableComment = tableComment;
}
public int getSheetNo() {
return sheetNo;
}
public void setSheetNo(int sheetNo) {
this.sheetNo = sheetNo;
}
public int getHeadRowNo() {
return headRowNo;
}
public void setHeadRowNo(int headRowNo) {
this.headRowNo = headRowNo;
}
public String getMainTableFlagColumnName() {
return mainTableFlagColumnName;
}
public void setMainTableFlagColumnName(String mainTableFlagColumnName) {
this.mainTableFlagColumnName = mainTableFlagColumnName;
}
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/DynamicEasyExcelListener.java
View File

@ -34,7 +34,7 @@ public class DynamicEasyExcelListener extends AnalysisEventListener<Map<Integer,
*/ */
@Override @Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) { public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
log.info("解析到一条头数据:{}", JSON.toJSONString(headMap)); //log.info("解析到一条头数据:{}", JSON.toJSONString(headMap));
//存储全部表头数据 //存储全部表头数据
headList.add(headMap); headList.add(headMap);
} }
@ -48,7 +48,7 @@ public class DynamicEasyExcelListener extends AnalysisEventListener<Map<Integer,
*/ */
@Override @Override
public void invoke(Map<Integer, String> data, AnalysisContext context) { public void invoke(Map<Integer, String> data, AnalysisContext context) {
log.info("解析到一条数据:{}", JSON.toJSONString(data)); //log.info("解析到一条数据:{}", JSON.toJSONString(data));
dataList.add(data); dataList.add(data);
} }
@ -60,7 +60,7 @@ public class DynamicEasyExcelListener extends AnalysisEventListener<Map<Integer,
@Override @Override
public void doAfterAllAnalysed(AnalysisContext context) { public void doAfterAllAnalysed(AnalysisContext context) {
// 这里也要保存数据，确保最后遗留的数据也存储到数据库 // 这里也要保存数据，确保最后遗留的数据也存储到数据库
log.info("所有数据解析完成！"); //log.info("所有数据解析完成！");
} }
public List<Map<Integer, String>> getHeadList() { public List<Map<Integer, String>> getHeadList() {

288
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
View File

@ -1,10 +1,12 @@
package com.epmet.service.impl; package com.epmet.service.impl;
import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.feign.ResultDataResolver;
import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.security.user.LoginUserUtil;
@ -19,6 +21,7 @@ import com.epmet.dto.result.FormItem;
import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.dto.result.OptionDTO; import com.epmet.dto.result.OptionDTO;
import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcResiUserEntity;
import com.epmet.enums.IcResiUserTableEnums;
import com.epmet.excel.handler.DynamicEasyExcelListener; import com.epmet.excel.handler.DynamicEasyExcelListener;
import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient;
@ -47,7 +50,9 @@ import java.util.stream.Collectors;
@Service @Service
public class IcResiUserImportServiceImpl implements IcResiUserImportService, ResultDataResolver { public class IcResiUserImportServiceImpl implements IcResiUserImportService, ResultDataResolver {
public static final ThreadLocal errorRow = new ThreadLocal<ErrorRow>(); // 错误和跳过excel行暂存
public static final ThreadLocal<Map<String, List<ErrorRow>>> errorRows = new ThreadLocal<>();
public static final ThreadLocal<Map<String, List<SkipedRow>>> skipedRows = new ThreadLocal<>();
@Autowired @Autowired
private LoginUserUtil loginUserUtil; private LoginUserUtil loginUserUtil;
@ -80,6 +85,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
private String columnName; private String columnName;
private String itemType; private String itemType;
private String itemId; private String itemId;
// 是否必填
private Integer required;
private List<Integer> colIndexs; private List<Integer> colIndexs;
//private List<String> colContents; //private List<String> colContents;
// 单元格内容 // 单元格内容
@ -104,13 +112,20 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
/** /**
* 错误行信息 * 错误行信息
*/ */
@Data
public static class ErrorRow { public static class ErrorRow {
private String sheetName;
private String idCard; private String idCard;
private String name; private String name;
private String errorInfo; private String errorInfo;
} }
@Data
public static class SkipedRow {
private String idCard;
private String name;
private String info;
}
/** /**
* 导入居民信息 * 导入居民信息
* 导入主表和所有子表信息 * 导入主表和所有子表信息
@ -134,19 +149,62 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(currUserAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null); CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(currUserAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
String customerId = agencyInfo.getCustomerId(); String customerId = agencyInfo.getCustomerId();
importIcResiBaseInfoFromExcel(excelPathName, 0, 3, currUserAgencyId, agencyInfo.getPids(), loginUserId); try {
importIcResiExtraInfoFromExcel(excelPathName, 1, 2, currUserAgencyId, loginUserId, "ic_party_member", customerId); initThreadLocalRowsStorage();
importIcResiExtraInfoFromExcel(excelPathName, 2, 2, currUserAgencyId, loginUserId, "ic_ensure_house", customerId);
importIcResiExtraInfoFromExcel(excelPathName, 3, 2, currUserAgencyId, loginUserId, "ic_unemployed", customerId); // 上传主表信息
importIcResiExtraInfoFromExcel(excelPathName, 4, 2, currUserAgencyId, loginUserId, "ic_veterans", customerId); importIcResiBaseInfoFromExcel(excelPathName, IcResiUserTableEnums.IC_RESI_USER.getSheetNo(), IcResiUserTableEnums.IC_RESI_USER.getHeadRowNo(),
importIcResiExtraInfoFromExcel(excelPathName, 5, 2, currUserAgencyId, loginUserId, "ic_united_front", customerId); currUserAgencyId, agencyInfo.getPids(), loginUserId, IcResiUserTableEnums.IC_RESI_USER.getTableName());
importIcResiExtraInfoFromExcel(excelPathName, 6, 3, currUserAgencyId, loginUserId, "ic_volunteer", customerId);
importIcResiExtraInfoFromExcel(excelPathName, 7, 2, currUserAgencyId, loginUserId, "ic_old_people", customerId); // 上传附表信息
importIcResiExtraInfoFromExcel(excelPathName, 8, 3, currUserAgencyId, loginUserId, "ic_special", customerId); for (IcResiUserTableEnums sheet : IcResiUserTableEnums.values()) {
if (sheet == IcResiUserTableEnums.IC_RESI_USER) {
continue;
}
try {
importIcResiExtraInfoFromExcel(excelPathName, sheet.getSheetNo(), sheet.getHeadRowNo(), currUserAgencyId, loginUserId, sheet.getTableName(), customerId);
} catch (Exception e) {
String errorMsg = ExceptionUtils.getErrorStackTrace(e);
log.error("导入IC居民附加信息【{}】错误:{}", sheet.getTableComment(), errorMsg);
ErrorRow errorRow = new ErrorRow();
errorRow.setName("*");
errorRow.setIdCard("*");
errorRows.get().get(sheet.getTableName()).add(errorRow);
}
}
String errors = JSON.toJSONString(errorRows.get());
String skipeds = JSON.toJSONString(skipedRows.get());
log.error(errors);
log.error(skipeds);
} finally {
skipedRows.remove();
errorRows.remove();
}
return null; return null;
} }
/**
* 暂存rows信息初始化
*/
private void initThreadLocalRowsStorage() {
Map<String, List<SkipedRow>> skipedRowsMap = new LinkedHashMap<>();
for (IcResiUserTableEnums e : IcResiUserTableEnums.values()) {
skipedRowsMap.put(e.getTableName(), new LinkedList<>());
}
skipedRows.set(skipedRowsMap);
Map<String, List<ErrorRow>> errorRowsMap = new LinkedHashMap<>();
for (IcResiUserTableEnums e : IcResiUserTableEnums.values()) {
errorRowsMap.put(e.getTableName(), new LinkedList<>());
}
errorRows.set(errorRowsMap);
}
/** /**
* excel导入居民基本信息 * excel导入居民基本信息
* @param sheetNo * @param sheetNo
@ -156,7 +214,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
* @param currentUserId * @param currentUserId
* @return * @return
*/ */
private Object importIcResiBaseInfoFromExcel(String excelPathName, int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId) { private Object importIcResiBaseInfoFromExcel(String excelPathName, int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId,
String tableName) {
DynamicEasyExcelListener readListener = new DynamicEasyExcelListener(); DynamicEasyExcelListener readListener = new DynamicEasyExcelListener();
EasyExcelFactory.read(new File(excelPathName)).registerReadListener(readListener).headRowNumber(headRowNumber).sheet(sheetNo).doRead(); EasyExcelFactory.read(new File(excelPathName)).registerReadListener(readListener).headRowNumber(headRowNumber).sheet(sheetNo).doRead();
@ -189,7 +248,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
Map<String, ColumnWrapper> headerColumnWrapper = convertExcelHeaders2DBColumnWrappers(formItemMap, combinedHeaders, dataList, abandonedHeaders); Map<String, ColumnWrapper> headerColumnWrapper = convertExcelHeaders2DBColumnWrappers(formItemMap, combinedHeaders, dataList, abandonedHeaders);
// 持久化 // 持久化
persistIcResiBaseInfo(headerColumnWrapper, dataList, currUserAgencyId, abandonedHeaders, currUserAgencyPids, currentUserId); persistIcResiBaseInfo(headerColumnWrapper, dataList, currUserAgencyId, abandonedHeaders, currUserAgencyPids, currentUserId, tableName);
return headers; return headers;
} }
@ -249,39 +308,64 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
*/ */
private void persistIcResiBaseInfo(Map<String, ColumnWrapper> headerColumnWrapper, List<Map<Integer, String>> dataRows, private void persistIcResiBaseInfo(Map<String, ColumnWrapper> headerColumnWrapper, List<Map<Integer, String>> dataRows,
String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel, String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
String currUserAgencyPids, String currentUserId) { String currUserAgencyPids, String currentUserId, String tableName) {
// 遍历每一行，将行内容转化为 // 遍历每一行，将行内容转化为
for (Map<Integer, String> row : dataRows) { for (Map<Integer, String> row : dataRows) {
LinkedHashMap<String, String> columnAndValues = convertColumnWrappers2Map4Persist(headerColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel); LinkedHashMap<String, String> columnAndValues = new LinkedHashMap<>();
try {
columnAndValues.put("IS_ENSURE_HOUSE", "0"); convertColumnWrappers2Map4Persist(headerColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel, columnAndValues);
columnAndValues.put("IS_OLD_PEOPLE", "0");
columnAndValues.put("IS_PARTY", "0"); columnAndValues.put("IS_ENSURE_HOUSE", "0");
columnAndValues.put("IS_SPECIAL", "0"); columnAndValues.put("IS_OLD_PEOPLE", "0");
columnAndValues.put("IS_UNEMPLOYED", "0"); columnAndValues.put("IS_PARTY", "0");
columnAndValues.put("IS_UNITED_FRONT", "0"); columnAndValues.put("IS_SPECIAL", "0");
columnAndValues.put("IS_VETERANS", "0"); columnAndValues.put("IS_UNEMPLOYED", "0");
columnAndValues.put("IS_VOLUNTEER", "0"); columnAndValues.put("IS_UNITED_FRONT", "0");
columnAndValues.put("IS_VETERANS", "0");
columnAndValues.put("AGENCY_ID", currUserAgencyId); columnAndValues.put("IS_VOLUNTEER", "0");
columnAndValues.put("PIDS", currUserAgencyPids);
columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId()); columnAndValues.put("AGENCY_ID", currUserAgencyId);
columnAndValues.put("CREATED_BY", currentUserId); columnAndValues.put("PIDS", currUserAgencyPids);
columnAndValues.put("UPDATED_BY", currentUserId); columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId());
columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", "")); columnAndValues.put("CREATED_BY", currentUserId);
columnAndValues.put("UPDATED_BY", currentUserId);
// 验证居民信息是否存在 columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
String idCard = columnAndValues.get("ID_CARD");
LambdaQueryWrapper<IcResiUserEntity> idCardQuery = new LambdaQueryWrapper<>(); // 验证居民信息是否存在
idCardQuery.eq(IcResiUserEntity::getIdCard, idCard); String idCard = columnAndValues.get("ID_CARD");
LambdaQueryWrapper<IcResiUserEntity> idCardQuery = new LambdaQueryWrapper<>();
if (icResiUserDao.selectCount(idCardQuery) > 0) { idCardQuery.eq(IcResiUserEntity::getIdCard, idCard);
log.info("身份证号为【{}】的居民信息已存在，跳过导入", idCard);
} if (icResiUserDao.selectCount(idCardQuery) > 0) {
//log.info("身份证号为【{}】的居民信息已存在，跳过导入", idCard);
SkipedRow skipedRow = new SkipedRow();
skipedRow.setName(columnAndValues.get("NAME"));
skipedRow.setIdCard(idCard);
skipedRow.setInfo("身份证号已存在，跳过导入");
skipedRows.get().get(IcResiUserTableEnums.IC_RESI_USER.getTableName()).add(skipedRow);
continue;
}
icResiUserDao.add("ic_resi_user", columnAndValues); icResiUserDao.add(tableName, columnAndValues);
} catch (Exception e) {
String errorMsg;
if (e instanceof RenException) {
errorMsg = e.getMessage();
} else {
errorMsg = "未知系统错误";
log.error(ExceptionUtils.getErrorStackTrace(e));
}
ErrorRow errorRow = new ErrorRow();
errorRow.setIdCard(columnAndValues.get("ID_CARD"));
errorRow.setName(columnAndValues.get("NAME"));
errorRow.setErrorInfo(errorMsg);
errorRows.get().get(IcResiUserTableEnums.IC_RESI_USER.getTableName()).add(errorRow);
} finally {
columnAndValues.clear();
}
} }
} }
@ -297,44 +381,73 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel, String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
String currentUserId, String targetTableName, String customerId) { String currentUserId, String targetTableName, String customerId) {
LinkedHashMap<String, String> columnAndValues = new LinkedHashMap<>();
// 遍历每一行，将行内容转化为 // 遍历每一行，将行内容转化为
for (Map<Integer, String> row : dataRows) { for (Map<Integer, String> row : dataRows) {
LinkedHashMap<String, String> columnAndValues = convertColumnWrappers2Map4Persist(headerColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel); try {
convertColumnWrappers2Map4Persist(headerColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel, columnAndValues);
// 检验身份证号 // 检验身份证号
String idCard = columnAndValues.get("ID_CARD"); String idCard = columnAndValues.get("ID_CARD");
if (StringUtils.isBlank(idCard)) { if (StringUtils.isBlank(idCard)) {
throw new RenException(EpmetErrorCode.IDCARDNO_ERROR.getCode(), String.format("用户【%s】身份证号未填写或格式错误", columnAndValues.get("NAME"))); throw new RenException(EpmetErrorCode.IDCARDNO_ERROR.getCode(), String.format("用户【%s】身份证号未填写或格式错误", columnAndValues.get("NAME")));
} }
// 检查用户是否存在 // 检查用户是否存在
LambdaQueryWrapper<IcResiUserEntity> idCardQuery = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IcResiUserEntity> idCardQuery = new LambdaQueryWrapper<>();
idCardQuery.eq(IcResiUserEntity::getIdCard, idCard); idCardQuery.eq(IcResiUserEntity::getIdCard, idCard);
IcResiUserEntity icResiUserBaseInfo = icResiUserDao.selectOne(idCardQuery); IcResiUserEntity icResiUserBaseInfo = icResiUserDao.selectOne(idCardQuery);
if (icResiUserBaseInfo == null) { if (icResiUserBaseInfo == null) {
throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard)); throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard));
} }
String icResiId = icResiUserBaseInfo.getId(); String icResiId = icResiUserBaseInfo.getId();
// 验证党员信息是否存在 // 验证党员信息是否存在
if (CollectionUtils.isNotEmpty(icResiUserDao.selectSubTableRecords(customerId, icResiId, targetTableName))) { if (CollectionUtils.isNotEmpty(icResiUserDao.selectSubTableRecords(customerId, icResiId, targetTableName))) {
log.info("身份证号为【{}】的居民【{}】信息已存在，跳过导入", idCard, targetTableName); log.info("身份证号为【{}】的居民【{}】信息已存在，跳过导入", idCard, targetTableName);
continue;
} SkipedRow skipedRow = new SkipedRow();
skipedRow.setName(columnAndValues.get("NAME"));
skipedRow.setIdCard(columnAndValues.get("ID_CARD"));
skipedRow.setInfo("信息已存在，跳过导入");
skipedRows.get().get(targetTableName).add(skipedRow);
continue;
}
columnAndValues.put("IC_RESI_USER", icResiId);
columnAndValues.put("IC_RESI_USER", icResiId); columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId());
columnAndValues.put("CREATED_BY", currentUserId);
columnAndValues.put("UPDATED_BY", currentUserId);
columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId()); columnAndValues = removeNeedlessColumns(columnAndValues);
columnAndValues.put("CREATED_BY", currentUserId);
columnAndValues.put("UPDATED_BY", currentUserId);
columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
columnAndValues = removeNeedlessColumns(columnAndValues); icResiUserDao.add(targetTableName, columnAndValues);
icResiUserDao.add(targetTableName, columnAndValues); updateMainTableResiTypeFlag(Objects.requireNonNull(IcResiUserTableEnums.getObjectByTableName(targetTableName)), icResiId);
} catch (Exception e) {
String errorMsg;
if (e instanceof RenException) {
errorMsg = e.getMessage();
} else {
errorMsg = "未知系统错误";
log.error(ExceptionUtils.getErrorStackTrace(e));
}
ErrorRow errorRow = new ErrorRow();
errorRow.setName(columnAndValues.get("NAME"));
errorRow.setIdCard(columnAndValues.get("ID_CARD"));
errorRow.setErrorInfo(errorMsg);
errorRows.get().get(targetTableName).add(errorRow);
} finally {
columnAndValues.clear();
}
} }
} }
@ -365,12 +478,16 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
* @param row 当前行数据 * @param row 当前行数据
* @param currUserAgencyId 当前用户所属机构ID * @param currUserAgencyId 当前用户所属机构ID
* @param checkBoxOptionColumnIdxAndLabel 复选框options列表。key:列号，value：复选框中文 * @param checkBoxOptionColumnIdxAndLabel 复选框options列表。key:列号，value：复选框中文
* @return * @param target 要将数据放到哪个对象中
*/ */
private LinkedHashMap<String, String> convertColumnWrappers2Map4Persist(Map<String, ColumnWrapper> headerColumnWrapper, Map<Integer, String> row, private void convertColumnWrappers2Map4Persist(Map<String, ColumnWrapper> headerColumnWrapper, Map<Integer, String> row,
String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel) { String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
LinkedHashMap<String, String> columnAndValues = new LinkedHashMap<>(); LinkedHashMap<String, String> target) {
boolean interupt = false;
List<String> errorColumnNames = new LinkedList<>();
for (Map.Entry<String, ColumnWrapper> columnWrapperEntry : headerColumnWrapper.entrySet()) { for (Map.Entry<String, ColumnWrapper> columnWrapperEntry : headerColumnWrapper.entrySet()) {
ColumnWrapper columnWrapper = columnWrapperEntry.getValue(); ColumnWrapper columnWrapper = columnWrapperEntry.getValue();
@ -408,10 +525,19 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
String checkBoxColValue = getCheckBoxColValue(columnWrapper, row, checkBoxOptionColumnIdxAndLabel); String checkBoxColValue = getCheckBoxColValue(columnWrapper, row, checkBoxOptionColumnIdxAndLabel);
columnWrapper.setColValue(checkBoxColValue); columnWrapper.setColValue(checkBoxColValue);
} }
columnAndValues.put(columnWrapper.columnName, columnWrapper.colValue);
// requiredColumns中的值为必填项
if (columnWrapper.getRequired() == 1 && StringUtils.isBlank(columnWrapper.colValue)) {
interupt = true;
errorColumnNames.add(columnWrapper.combinedLabel);
}
target.put(columnWrapper.columnName, columnWrapper.colValue);
}
if (interupt) {
throw new RenException(String.join(",", errorColumnNames) + "的值未填写");
} }
return columnAndValues;
} }
/** /**
@ -517,6 +643,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
columnWrapper.setCombinedLabel(combinedLabel); columnWrapper.setCombinedLabel(combinedLabel);
columnWrapper.setColumnName(item.getColumnName()); columnWrapper.setColumnName(item.getColumnName());
columnWrapper.setColIndexs(entry.getValue()); columnWrapper.setColIndexs(entry.getValue());
columnWrapper.setRequired(item.getRequired());
columnWrapper.setOptionSourceType(item.getOptionSourceType()); columnWrapper.setOptionSourceType(item.getOptionSourceType());
columnWrapper.setOptionSourceValue(item.getOptionSourceValue()); columnWrapper.setOptionSourceValue(item.getOptionSourceValue());
@ -714,5 +841,16 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
}*/ }*/
} }
/**
* 更新主表中人员类别标记
* @param icResiUserTableEnum
* @param resiUserId
*/
private void updateMainTableResiTypeFlag(IcResiUserTableEnums icResiUserTableEnum, String resiUserId) {
HashMap<String, Boolean> map = new HashMap<>();
map.put(icResiUserTableEnum.getMainTableFlagColumnName(), true);
icResiUserDao.upTable("ic_resi_user", resiUserId, map);
}
} }

Write Preview
Loading…
Cancel
Save