Skip to content

E
entrance_api
Commit 74c24277 authored by 王琮's avatar 王琮
Browse files
Options

修改员工导入

parent ff43a267
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 245 deletions
src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java
View file @ 74c24277
......@@ -219,11 +219,11 @@ public class SysUserController extends CyPaginationController<SysUser> {
@ApiOperation(value = "导入用户信息", notes = "导入用户信息")
@PostMapping("/importExcel")
@CyEptSm4EnableAnno
public CyResult importSysUser(MultipartFile file) {
public CyResult importSysUser(MultipartFile file,HttpServletResponse response) {
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserServiceImpl.importUserExcel(file));
sysUserServiceImpl.importUserExcel(file,response));
}
/**
......
src/main/java/org/rcisoft/sys/sysuser/dto/UserErrorDTO.java 0 → 100644
View file @ 74c24277
package org.rcisoft.sys.sysuser.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
@Data
public class UserErrorDTO extends ExportUserDTO{
@Excel(name = "错误提示", orderNum = "2", width = 40)
private String error;
}
src/main/java/org/rcisoft/sys/sysuser/service/SysUserService.java
View file @ 74c24277
......@@ -92,7 +92,7 @@ public interface SysUserService {
int exportEmptyTemplate(HttpServletResponse response);
ImportUserDTO importUserExcel(MultipartFile file);
ImportUserDTO importUserExcel(MultipartFile file,HttpServletResponse response);
/**
......
src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java
View file @ 74c24277
package org.rcisoft.sys.sysuser.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.rcisoft.core.component.CyDownErrorTxtComp;
......@@ -23,6 +24,7 @@ import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
import org.rcisoft.sys.sysuser.dao.SysUserRoleRepository;
import org.rcisoft.sys.sysuser.dto.ExcelDTO;
import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
import org.rcisoft.sys.sysuser.dto.UserErrorDTO;
import org.rcisoft.sys.sysuser.entity.SysDept;
import org.rcisoft.sys.sysuser.entity.SysDictData;
import org.rcisoft.sys.sysuser.entity.SysUser;
......@@ -30,6 +32,7 @@ import org.rcisoft.sys.sysuser.entity.SysUserRole;
import org.rcisoft.sys.sysuser.service.SysUserService;
import org.rcisoft.sys.sysuser.util.CheckUtil;
import org.rcisoft.sys.sysuser.util.CyEpExcelUtil;
import org.rcisoft.sys.visit.dto.VisitPersonDTO;
import org.rcisoft.sys.wbac.user.dto.ErrorDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -377,7 +380,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
String deptName = sysDepts.get(0).getDeptName();
sysUserList.get(i).setDeptId(deptName);
}
//查询职位id
String position = sysUserList.get(i).getPosition();
List<SysDictData> sysDictData = sysDictDataRepositorys.queryDataByPosition(position);
......@@ -386,7 +388,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
String dictLabel = sysDictData.get(0).getDictLabel();
sysUserList.get(i).setPosition(dictLabel);
}
//查询班次id
String nltBz = sysUserList.get(i).getNltBz();
List<SysDictData> sysDictData1 = sysDictDataRepositorys.queryDataByNltBz(nltBz);
......@@ -395,7 +396,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
String dictLabel = sysDictData1.get(0).getDictLabel();
sysUserList.get(i).setNltBz(dictLabel);
}
//性别
if (sysUserList.get(i).getSex() != null) {
if (sysUserList.get(i).getSex().equals("1")) {
......@@ -410,7 +410,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
sysUserList.get(i).setIdentity("正式员工");
}
}
list.add(sysUserList.get(i));
}
......@@ -480,31 +479,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
@Override
@Transactional
public ImportUserDTO importUserExcel(MultipartFile file) {
ImportUserDTO importUserDTO = new ImportUserDTO();
Calendar calendar = Calendar.getInstance();
String nowTime = new SimpleDateFormat("yyyyMMddHHmmss").format(calendar.getTime());
String fileName = "用户错误信息" + nowTime + ".txt";
List<Map<Integer, List<String>>> maps = new ArrayList<>();
public ImportUserDTO importUserExcel(MultipartFile file,HttpServletResponse response) {
ExportUserDTO exportUserDTO = new ExportUserDTO();
List<UserErrorDTO> errorDTOArrayList = new ArrayList<>();
UserErrorDTO errorDTO = new UserErrorDTO();
boolean flag = false;
try {
flag = CyEpExcelUtil.isFileInUser(file, exportUserDTO, 2);
} catch (Exception e) {
throw new CyServiceException(1111, "非模板文件");
throw new CyServiceException(500, "非模板文件");
}
if (!flag) {
throw new CyServiceException(org.rcisoft.sys.visit.entity.CyResSvcExcEnum.EXCEL_IMPORT_HEADER_ERROR);
}
if (!flag || !CyCompareToolUtils.compareFileName(file, "用户信息", 0, 0)) {
String errorBefore = "上传模板错误请重新下载！";
errorText(errorBefore, importUserDTO, maps, fileName);
try {
errorTxt.exportTxtPaper(maps, fileName);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
return importUserDTO;
throw new CyServiceException(500, "非模板文件");
}
/** 从excel表中读到数据，有一部分为空值 */
List<ExportUserDTO> sysUserList = CyEpExcelUtil.importExcel(file, 2, 1, ExportUserDTO.class);
......@@ -512,23 +498,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
//判断整个Excel是不是为空 计算非空数据有多少条
int information = CyCompareToolUtils.cmpareInformation(sysUserList);
if (information == 0) {
String errorBefore = "Excel文件不可为空，请检查Excel文件是否填写！";
errorText(errorBefore, importUserDTO, maps, fileName);
try {
errorTxt.exportTxtPaper(maps, fileName);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
return importUserDTO;
throw new CyServiceException(500, "Excel文件不可为空，请检查Excel文件是否填写！");
} else if (information > 500) {
String errorMore = "单次导入数据不可超过500，请检查！";
errorText(errorMore, importUserDTO, maps, fileName);
try {
errorTxt.exportTxtPaper(maps, fileName);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
return importUserDTO;
throw new CyServiceException(500, "单次导入数据不可超过500，请检查！");
} else {
//去除空数据
try {
......@@ -536,55 +508,48 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
//校验 将错误信息放入maps
int index = 3; //从第3行开始
SysUser sysUserDTO = new SysUser();
sysUserDTO.setDeleted();
List<SysUser> sysUsers = sysUserRepositorys.querySysUsers(sysUserDTO);
for (ExportUserDTO sysUser : sysUserList) {
//判断 是否为空
ErrorDTO userNull = CheckUtil.userNotNull(sysUser, index);
if (userNull.getSuccess() == 1) {
maps.add(userNull.getMap());
}
//判断 信息是否重复
ErrorDTO userRepeat = CheckUtil.userRepeat(sysUser, index, sysUsers);
if (userRepeat.getSuccess() == 1) {
maps.add(userRepeat.getMap());
}
index++;
UserErrorDTO userNull = CheckUtil.userNotNull(sysUser);
if (userNull != null)
errorDTOArrayList.add(userNull);
else
sysUserList.add(sysUser);
}
}
/** 将 信息插入sys_user */
if (sysUserList.size() > 0) {
for (ExportUserDTO sysUser : sysUserList) {
errorDTO = new UserErrorDTO();
sysUser.setIdentity("0");
//数据库需要插入的用户信息
//所属园区
if (sysUser.getAddress() == null) {
throw new CyServiceException(500, "所属园区不能为空");
}
//性别
if (sysUser.getSex() != null) {
if (sysUser.getSex().equals("男")) {
sysUser.setSex("1");
} else if (sysUser.getSex().equals("女")) {
sysUser.setSex("0");
} else {
throw new CyServiceException(500, "用户性别数据错误");
}
if (sysUser.getSex().equals("男")) {
sysUser.setSex("1");
} else if (sysUser.getSex().equals("女")) {
sysUser.setSex("0");
} else {
BeanUtil.copyProperties(sysUser, errorDTO);
errorDTO.setError("用户性别数据错误");
errorDTOArrayList.add(errorDTO);
continue;
}
//所属部门
SysDept sysDept = sysDeptRepositorys.querySysDeptByName(sysUser.getDeptId());
if (sysDept == null || sysDept.equals(' ')) {
throw new CyServiceException(500, "部门信息数据错误");
BeanUtil.copyProperties(sysUser, errorDTO);
errorDTO.setError("部门信息数据错误");
errorDTOArrayList.add(errorDTO);
continue;
} else {
sysUser.setDeptId(sysDept.getBusinessId().toString());
}
//字典职位
SysDictData sysDictData1 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getPosition());
if (sysDictData1 == null || sysDictData1.equals(' ')) {
throw new CyServiceException(500, "职位信息数据错误");
BeanUtil.copyProperties(sysUser, errorDTO);
errorDTO.setError("职位信息数据错误");
errorDTOArrayList.add(errorDTO);
continue;
} else {
sysUser.setPositionLabel(sysUser.getPosition());
sysUser.setPosition(sysDictData1.getDictValue());
......@@ -592,7 +557,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
//字典班次
SysDictData sysDictData2 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getNltBz());
if (sysDictData2 == null || sysDictData2.equals(' ')) {
throw new CyServiceException(500, "班次信息数据错误");
BeanUtil.copyProperties(sysUser, errorDTO);
errorDTO.setError("班次信息数据错误");
errorDTOArrayList.add(errorDTO);
continue;
} else {
sysUser.setNltBzLabel(sysUser.getNltBz());
sysUser.setNltBz(sysDictData2.getDictValue());
......@@ -600,7 +568,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
//字典园区
SysDictData sysDictData3 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getAddress());
if (sysDictData3 == null || sysDictData3.equals(' ')) {
throw new CyServiceException(500, "园区信息数据错误");
BeanUtil.copyProperties(sysUser, errorDTO);
errorDTO.setError("园区信息数据错误");
errorDTOArrayList.add(errorDTO);
continue;
} else {
sysUser.setAddressLabel(sysUser.getAddress());
sysUser.setAddress(sysDictData3.getDictValue());
......@@ -616,7 +587,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
sysUserRepositorys.addSysUser(sysUser);
}
}
return importUserDTO;
if (null != errorDTOArrayList && errorDTOArrayList.size() > 0) {
CyEpExcelUtil.exportExcel(errorDTOArrayList, "员工错误数据", "员工错误数据",
UserErrorDTO.class, "员工错误数据.xlsx", response);
}
return null;
}
/**
......
src/main/java/org/rcisoft/sys/sysuser/util/CheckUtil.java
View file @ 74c24277
......@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
import org.rcisoft.core.constant.CySysCons;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
import org.rcisoft.sys.sysuser.dto.UserErrorDTO;
import org.rcisoft.sys.sysuser.entity.SysUser;
import org.rcisoft.sys.visit.dto.ExportVisitInfoDto;
import org.rcisoft.sys.visit.dto.ExportVisitUserDTO;
......@@ -35,27 +36,31 @@ public class CheckUtil {
* 对导入的用户信息进行非空校验
*
* @param sysUser 用户信息
* @param row 行数
* @return
*/
public static ErrorDTO userNotNull(ExportUserDTO sysUser, int row) {
ErrorDTO errorDTO = new ErrorDTO();
Map<Integer, List<String>> notTrues = new HashMap<>();
public static UserErrorDTO userNotNull(ExportUserDTO sysUser) {
UserErrorDTO errorDTO = new UserErrorDTO();
List<String> notTrue = new ArrayList<>();
errorDTO.setSuccess(0);
if (StringUtils.isEmpty(sysUser.getName())) {
if (StringUtils.isEmpty(sysUser.getName()))
notTrue.add("姓名不能为空");
}
if (StringUtils.isEmpty(sysUser.getPhone())) {
if (StringUtils.isEmpty(sysUser.getPhone()))
notTrue.add("手机号不能为空");
}
if (StringUtils.isEmpty(sysUser.getSex())) {
if (!sysUser.getPhone().matches("^1[3-9]\\d{9}$"))
notTrue.add("手机号格式不正确");
if (StringUtils.isEmpty(sysUser.getSex()))
notTrue.add("性别不能为空");
}
if (StringUtils.isEmpty(sysUser.getAddress()))
notTrue.add("所属园区不能为空");
if (StringUtils.isEmpty(sysUser.getDeptId()))
notTrue.add("所属部门不能为空");
if (StringUtils.isEmpty(sysUser.getPosition()))
notTrue.add("职位不能为空");
if (StringUtils.isEmpty(sysUser.getNltBz()))
notTrue.add("班次不能为空");
if (notTrue.size() > 0) {
errorDTO.setSuccess(1);
notTrues.put(row, notTrue);
errorDTO.setMap(notTrues);
BeanUtil.copyProperties(sysUser, errorDTO);
errorDTO.setError(notTrue.stream().collect(Collectors.joining(",")));
return errorDTO;
}
return errorDTO;
}
......
src/main/java/org/rcisoft/sys/visit/service/VisitPersonService.java
View file @ 74c24277
......@@ -90,7 +90,6 @@ public interface VisitPersonService {
int exportEmptyTemplate(HttpServletResponse response);
ImportUserDTO importUserExcel(MultipartFile file);
/**
......
src/main/java/org/rcisoft/sys/visit/service/impl/VisitPersonServiceImpl.java
View file @ 74c24277
......@@ -369,162 +369,6 @@ public class VisitPersonServiceImpl extends ServiceImpl<VisitPersonRepositorys,
importUserDTO.setFilename(fileName);
}
@Override
@Transactional
public ImportUserDTO importUserExcel(MultipartFile file) {
ImportUserDTO importUserDTO = new ImportUserDTO();
Calendar calendar = Calendar.getInstance();
String nowTime = new SimpleDateFormat("yyyyMMddHHmmss").format(calendar.getTime());
String fileName = "用户错误信息" + nowTime + ".txt";
List<Map<Integer, List<String>>> maps = new ArrayList<>();
ExportUserDTO exportUserDTO = new ExportUserDTO();
boolean flag = false;
try {
flag = CyEpExcelUtil.isFileInUser(file, exportUserDTO, 2);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
if (!flag || !CyCompareToolUtils.compareFileName(file, "用户信息", 0, 0)) {
String errorBefore = "上传模板错误请重新下载！";
errorText(errorBefore, importUserDTO, maps, fileName);
try {
errorTxt.exportTxtPaper(maps, fileName);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
return importUserDTO;
}
/** 从excel表中读到数据，有一部分为空值 */
List<ExportUserDTO> sysUserList = CyEpExcelUtil.importExcel(file, 2, 1, ExportUserDTO.class);
/** 遍历 从Excel表中读到的数据 抛出不合适的数据 */
//判断整个Excel是不是为空 计算非空数据有多少条
int information = CyCompareToolUtils.cmpareInformation(sysUserList);
if (information == 0) {
String errorBefore = "Excel文件不可为空，请检查Excel文件是否填写！";
errorText(errorBefore, importUserDTO, maps, fileName);
try {
errorTxt.exportTxtPaper(maps, fileName);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
return importUserDTO;
} else if (information > 500) {
String errorMore = "单次导入数据不可超过500，请检查！";
errorText(errorMore, importUserDTO, maps, fileName);
try {
errorTxt.exportTxtPaper(maps, fileName);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
return importUserDTO;
} else {
//去除空数据
try {
sysUserList = ThrowNull(sysUserList);
} catch (Exception e) {
throw new CyServiceException(CyResSvcExcEnum.ERROR_NETWORK);
}
//校验 将错误信息放入maps
int index = 3; //从第3行开始
SysUser sysUserDTO = new SysUser();
sysUserDTO.setDeleted();
List<SysUser> sysUsers = sysUserRepositorys.querySysUsers(sysUserDTO);
for (ExportUserDTO sysUser : sysUserList) {
//判断 是否为空
ErrorDTO userNull = CheckUtil.userNotNull(sysUser, index);
if (userNull.getSuccess() == 1) {
maps.add(userNull.getMap());
}
//判断 信息是否重复
ErrorDTO userRepeat = CheckUtil.userRepeat(sysUser, index, sysUsers);
if (userRepeat.getSuccess() == 1) {
maps.add(userRepeat.getMap());
}
index++;
}
}
/** 将 信息插入sys_user */
if (sysUserList.size() > 0) {
//用户性别数据字典
List<DictData> userSex = dictionaryService.selectByTypes(CyDictCons.USER_SEX);
for (ExportUserDTO sysUser : sysUserList) {
sysUser.setIdentity("0");
//数据库需要插入的用户信息
//登录名
if (sysUser.getUsername() == null) {
throw new CyServiceException(500, "数据错误");
}
//手机号
if (sysUser.getPhone() == null) {
throw new CyServiceException(500, "数据错误");
}
//人脸信息
if (sysUser.getFaceAddress() == null) {
throw new CyServiceException(500, "数据错误");
}
//所属园区
if (sysUser.getAddress() == null) {
throw new CyServiceException(500, "数据错误");
}
//性别
if (sysUser.getSex() != null) {
if (sysUser.getSex().equals("男")) {
sysUser.setSex("0");
} else if (sysUser.getSex().equals("女")) {
sysUser.setSex("1");
} else {
throw new CyServiceException(500, "数据错误");
}
} else {
throw new CyServiceException(500, "数据错误");
}
//所属部门
SysDept sysDept = sysDeptRepositorys.querySysDeptByName(sysUser.getDeptId());
if (sysDept == null || sysDept.equals(' ')) {
throw new CyServiceException(500, "数据错误");
} else {
sysUser.setDeptId(sysDept.getBusinessId().toString());
}
//字典职位
SysDictData sysDictData1 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getPosition());
if (sysDictData1 == null || sysDictData1.equals(' ')) {
throw new CyServiceException(500, "数据错误");
} else {
sysUser.setPosition(sysDictData1.getBusinessId().toString());
}
//字典班次
SysDictData sysDictData2 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getNltBz());
if (sysDictData2 == null || sysDictData2.equals(' ')) {
throw new CyServiceException(500, "数据错误");
} else {
sysUser.setNltBz(sysDictData2.getBusinessId().toString());
}
//工作状态
if (sysUser.getFlag() != null) {
if (sysUser.getFlag().equals("停用")) {
sysUser.setFlag("0");
} else if (sysUser.getFlag().equals("正常") || sysUser.getFlag().equals("在职")) {
sysUser.setFlag("1");
} else if (sysUser.getFlag().equals("离职")) {
sysUser.setFlag("2");
} else {
throw new CyServiceException(500, "数据错误");
}
} else {
throw new CyServiceException(500, "数据错误");
}
//用户类型
sysUser.setUserType("0");
//身份
sysUser.setIdentity("1");
sysUserRepositorys.addSysUser(sysUser);
}
}
return importUserDTO;
}
/**
* @param persionId
* @param userId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment