From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 809 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 428 insertions(+), 381 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index eb17904..e808b88 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -17,17 +17,22 @@
package org.springblade.modules.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
+import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.IdCardNoUtil;
import org.springblade.common.utils.ImageUtils;
import org.springblade.common.utils.QRCodeUtil;
@@ -55,13 +60,11 @@
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.*;
-import org.springblade.modules.system.excel.QrCodeExcel;
-import org.springblade.modules.system.excel.SecurityExcel;
-import org.springblade.modules.system.excel.SecurityYyExcel;
-import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.*;
import org.springblade.modules.system.mapper.UserMapper;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
+import org.springblade.modules.system.vo.UserInfoDetail;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
@@ -72,6 +75,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.DecimalFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -98,6 +102,9 @@
private final IExperienceService experienceService;
private final MyAsyncService myAsyncService;
private final SecurityPaperService securityPaperService;
+ private final IUserDetailService userDetailService;
+
+ private final IUserWxService userWxService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -129,45 +136,12 @@
}
boolean b = save(user) && submitUserDept(user);
user.setIsDeleted(0);
- String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
- "politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch,jurisdiction,is_deleted) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," + "'" + user.getRealName() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'"
- + "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" + "," +
- "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getDispatch() + "'"+
- "," + "'" + user.getJurisdiction() + "'"+
- "," + "'" + user.getIsDeleted() + "'"
- + ")";
- //FtpUtil.sqlFileUpload(s);
- myAsyncService.dataSync(s);
return b;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateUser(User user) {
-// String tenantId = user.getTenantId();
-// Integer userCount = baseMapper.selectCount(
-// Wrappers.<User>query().lambda()
-// .eq(User::getTenantId, tenantId)
-// .eq(User::getAccount, user.getAccount())
-// .notIn(User::getId, user.getId())
-// );
-// if (userCount > 0) {
-// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
-// }
return updateUserInfo(user) && submitUserDept(user);
}
@@ -196,11 +170,6 @@
List<UserVO> userVOS = baseMapper.selectUserPagesByAge(page, user);
//机构名称拼接
userVOS.forEach(userVO -> {
-// if (null != userVO.getCardid() && userVO.getCardid() != "") {
-// userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
-// } else {
-// userVO.setAge(null);
-// }
if (null!=userVO.getDeptId()) {
List<String> list = baseMapper.getDeptName(userVO.getDeptId());
if (list.size() > 1) {
@@ -226,12 +195,18 @@
List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
//机构名称拼接
userVOS.forEach(userVO -> {
-// if (null != userVO.getCardid() && userVO.getCardid() != "") {
-// userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
-// } else {
-// userVO.setAge(null);
-// }
if (null!=userVO.getDeptId()) {
+ String deptIds = "";
+ if (userVO.getAncestors() != null){
+ deptIds = userVO.getAncestors()+","+userVO.getDeptId();
+ }else{
+ deptIds = userVO.getDeptId();
+ }
+
+ List<String> deptNameList = SysCache.getDeptNames(deptIds);
+
+ userVO.setFullDeptName(getFullDeptName(deptNameList));
+
List<String> list = baseMapper.getDeptName(userVO.getDeptId());
if (list.size() > 1) {
if (null != list.get(1) && list.get(1) != "") {
@@ -249,10 +224,32 @@
if (list.size() == 1) {
userVO.setDeptName(list.get(0));
}
+
+
+
+
}
});
return page.setRecords(userVOS);
}
+ }
+
+ private String getFullDeptName(List<String> deptNameList) {
+ String fullDeptName = "";
+ if (deptNameList != null){
+ if (deptNameList.size()>1){
+ //多级
+ if (StringUtil.isNotBlank(deptNameList.get(0))){
+ //本市保安公司 xxx xxx xxx
+ String first = deptNameList.get(0);
+ if (first.equals("本市保安公司") || first.equals("保安培训学校") || first.equals("自招保安单位") || first.equals("武装押运公司") || first.equals("分公司") || first.equals("其他")){
+ deptNameList.remove(0);
+ fullDeptName = StringUtil.join(deptNameList,",");
+ }
+ }
+ }
+ }
+ return fullDeptName;
}
@Override
@@ -360,6 +357,89 @@
User user = baseMapper.getUser(tenantId, account, password);
return buildUserInfo(user, userEnum);
}
+
+
+ @Override
+ public UserInfo wxUserInfo(String tenantId, String account, String password, UserEnum userEnum) {
+ //先去blade_user_wx表里查
+ UserWx userWx = userWxService.getUserWx(tenantId, account, password);
+
+ if (userWx != null){
+ //根据身份证号去user表里查
+ User userParam = new User();
+ userParam.setCardid(userWx.getCardid());
+ userParam.setIsDeleted(0);
+
+ List<User> list = list(Condition.getQueryWrapper(userParam));
+ //user表里有数据，就直接返回user表的数据
+ if (list.size()>0){
+ User user = list.get(0);
+ return buildUserInfo(user, userEnum);
+ }else{
+ //
+ User user = BuildUser(userWx);
+ return buildUserInfo(user, userEnum);
+ }
+ }else{
+ return null;
+ }
+ }
+
+ private User BuildUser(UserWx userWx) {
+ User user = new User();
+
+ user.setId(userWx.getId());
+ user.setCode(userWx.getCode());
+ user.setUserType(userWx.getUserType());
+ user.setAccount(userWx.getAccount());
+ user.setPassword(userWx.getPassword());
+ user.setName(userWx.getName());
+ user.setRealName(userWx.getRealName());
+ user.setAvatar(userWx.getAvatar());
+ user.setEmail(userWx.getEmail());
+ user.setPhone(userWx.getPhone());
+ user.setBirthday(userWx.getBirthday());
+ user.setSex(userWx.getSex());
+ user.setRoleId(userWx.getRoleId());
+ user.setDeptId(userWx.getDeptId());
+ user.setPostId(userWx.getPostId());
+ user.setCardid(userWx.getCardid());
+ user.setNativeplace(userWx.getNativeplace());
+ user.setNation(userWx.getNation());
+ user.setEducation(userWx.getEducation());
+ user.setPoliticaloutlook(userWx.getPoliticaloutlook());
+ user.setHeight(userWx.getHeight());
+ user.setCell(userWx.getCell());
+ user.setEmail(userWx.getEmail());
+ user.setHold(userWx.getHold());
+ user.setStatus(userWx.getStatus());
+ user.setJurisdiction(userWx.getJurisdiction());
+ user.setSecuritynumber(userWx.getSecuritynumber());
+ user.setExaminationType(userWx.getExaminationType());
+ user.setFingerprint(userWx.getFingerprint());
+ user.setPhoto(userWx.getPhoto());
+ user.setDispatch(userWx.getDispatch());
+ user.setMyPicture(userWx.getMyPicture());
+ user.setIsApply(userWx.getIsApply());
+ user.setBirthtime(userWx.getBirthtime());
+ user.setIsTrain(userWx.getIsTrain());
+ user.setHealstats(userWx.getHealstats());
+ user.setSoil(userWx.getSoil());
+ user.setPaperTime(userWx.getPaperTime());
+ user.setReasonForLeav(userWx.getReasonForLeav());
+ user.setImgForLeav(userWx.getImgForLeav());
+ user.setHoldv(userWx.getHoldv());
+ user.setHoldvtime(userWx.getHoldvtime());
+ user.setInsurance(userWx.getInsurance());
+ user.setAuditTime(userWx.getAuditTime());
+ user.setGuncode(userWx.getGuncode());
+ user.setEquipmentCode(userWx.getEquipmentCode());
+ user.setIsFreeze(userWx.getIsFreeze());
+ user.setAuditStatus(userWx.getAuditStatus());
+
+ return user;
+ }
+
private UserInfo buildUserInfo(User user) {
return buildUserInfo(user, UserEnum.WEB);
@@ -614,17 +694,25 @@
}
}
-// @Override
-// public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
-// List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
-// userList.forEach(user -> {
+ @Override
+ public List<UserExcel> exportUser(Map<String, Object> param) {
+ List<UserExcel> userList = baseMapper.exportUser(param);
+ userList.forEach(user -> {
// user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
// user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
// user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
// user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
-// });
-// return userList;
-// }
+
+ if (user.getSex() != null && StringUtil.isNotBlank(user.getSex())){
+ if (user.getSex().equals("1")){
+ user.setSex("男");
+ }else if (user.getSex().equals("2")){
+ user.setSex("女");
+ }
+ }
+ });
+ return userList;
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -877,8 +965,8 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
- long time = System.currentTimeMillis();
//将不能导入的保安员账号存起来
List<String> errorList = new ArrayList<>();
//年龄不符的保安员信息存入集合
@@ -917,8 +1005,8 @@
throw new ServiceException("导入失败!身份证号码不能为空!");
}
//身份证住址校验
- if (null==user.getRegistered() || user.getRegistered().equals("")){
- throw new ServiceException("导入失败!身份证住址不能为空!");
+ if (null==userExcel.getPermanentResidenceAddress() || userExcel.getPermanentResidenceAddress().equals("")){
+ throw new ServiceException("导入失败!户籍地址不能为空!");
}
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
@@ -938,42 +1026,9 @@
}
//性别
- if (null != userExcel.getSex()) {
- if (userExcel.getSex().equals("男")) {
- user.setSex(1);
- }
- if (userExcel.getSex().equals("女")) {
- user.setSex(2);
- }
- }
-
+ user.setSex(Integer.parseInt(userExcel.getSex()));
// 学历
- if (null != userExcel.getEducation()) {
- if (userExcel.getEducation().equals("初中及以下")
- || userExcel.getEducation().equals("初中")
- ) {
- user.setEducation("1");
- }
- if (userExcel.getEducation().equals("高中/中技/中专")
- || userExcel.getEducation().equals("高中")
- || userExcel.getEducation().equals("中技")
- || userExcel.getEducation().equals("中专")
- ) {
- user.setEducation("2");
- }
- if (userExcel.getEducation().equals("大专")) {
- user.setEducation("3");
- }
- if (userExcel.getEducation().equals("本科")) {
- user.setEducation("4");
- }
- if (userExcel.getEducation().equals("博士")) {
- user.setEducation("5");
- }
- if (userExcel.getEducation().equals("硕士")) {
- user.setEducation("6");
- }
- }
+ user.setEducation(userExcel.getEducation());
//判断当前用户是否已在本单位，如果是的更新数据
User user1 = new User();
@@ -988,39 +1043,7 @@
//默认在职
user.setStatus(1);
user.setIsDeleted(0);
- user.setHold("2");
- //判断是否持证
-// if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-// user.setHold("1");
-// //校验保安员证编号是否合规
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(userExcel.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean state = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// state = true;
-// }
-// }
-// if (!state){
-// user.setHold("2");
-// user.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// user.setHold("2");
-// user.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// user.setHold("2");
-// }
- //判断年龄，超过60岁的不入
-// if (AgeUtil.idCardToAge(user.getCardid())<60) {
+ securityNumberCheck(securityInvalidList, securityInvalidStatus, user, userExcel.getSecuritynumber(), userExcel.getCardid());
//分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
@@ -1043,20 +1066,49 @@
user.setDispatch("1");
user.setExaminationType("0");
//新增
-// this.save(user);
+ boolean save = this.save(user);
+ //并更新详情数据
+ if(save){
+ UserDetailEntity detailEntity = new UserDetailEntity();
+ detailEntity.setUserId(user.getId());
+ detailEntity.setDwellAddress(userExcel.getDwellAddress());
+ detailEntity.setEducationExperience(userExcel.getEducationExperience());
+ detailEntity.setMemberOfFamily(userExcel.getMemberOfFamily());
+ detailEntity.setWorkExperience(userExcel.getWorkExperience());
+ detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+ if (!Strings.isBlank(userExcel.getMarriageStatus())) {
+ detailEntity.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
+ }
+ if (!Strings.isBlank(userExcel.getSignLevel())) {
+ detailEntity.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+ }
+ detailEntity.setUnitName(userExcel.getUnitName());
+ detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+ detailEntity.setDwellAddress(userExcel.getDwellAddress());
+ detailEntity.setAcceptancePoliceUnit(userExcel.getAcceptancePoliceUnit());
+ detailEntity.setAcceptancePerson(userExcel.getAcceptancePerson());
+ if (!Strings.isBlank(userExcel.getAcceptanceTime())){
+ try {
+ detailEntity.setAcceptanceTime(new SimpleDateFormat("yyyy/MM/dd").parse(userExcel.getAcceptanceTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ userDetailService.save(detailEntity);
+ }
//加入集合
- userList.add(user);
+// userList.add(user);
//从业记录新增
Experience experience = new Experience();
experience.setCardid(user.getCardid());
-// experience.setSecurityid(user.getId().toString());
experience.setCompanyname(userExcel.getDeptId());
experience.setName(user.getRealName());
experience.setPost("保安员");
experience.setEntrytime(new Date());
-// experienceService.save(experience);
+ // 新增
+ experienceService.save(experience);
//加入集合
- experienceList.add(experience);
+// experienceList.add(experience);
}else {
//匹配组织机构是否一致,如果不一致
@@ -1068,64 +1120,11 @@
// return;
continue;
}else {
- //如果是一致，则更新用户数据
- //判断是否持证
-// if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-// user2.setHold("1");
-// user2.setSecuritynumber(user.getSecuritynumber());
-// //校验保安员证编号是否合规
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(userExcel.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean state = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// state = true;
-// }
-// }
-// if (!state){
-// user2.setHold("2");
-// user2.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// user2.setHold("2");
-// user2.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// user2.setHold("2");
-// }
-// user2.setHold("2");
- if (null!=userExcel.getRegistered()){
- user2.setRegistered(userExcel.getRegistered());
- }else {
- user2.setRegistered("");
- }
-
- // 住址
- if (null!=userExcel.getAddress()){
- user2.setAddress(userExcel.getAddress());
- }else {
- user2.setAddress("");
- }
-
// 学历
if (null!=userExcel.getEducation()){
user2.setEducation(user.getEducation());
}else {
user2.setEducation("");
- }
-
- // 从业单位
- if (null!=userExcel.getUnitName()){
- user2.setUnitName(userExcel.getUnitName());
- }else {
- user2.setUnitName("");
}
// 政治面貌
@@ -1137,27 +1136,86 @@
user2.setUpdateTime(new Date());
//更新用户数据
- this.updateById(user2);
+ boolean update = this.updateById(user2);
+ //并更新详情数据
+ if(update){
+ // 通过用户id 查询，如果存在则更新，不存在则更新
+ QueryWrapper<UserDetailEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("user_id",user2.getId());
+ UserDetailEntity one = userDetailService.getOne(wrapper);
+ if (null!=one){
+ one.setDwellAddress(userExcel.getDwellAddress());
+ one.setEducationExperience(userExcel.getEducationExperience());
+ one.setMemberOfFamily(userExcel.getMemberOfFamily());
+ one.setWorkExperience(userExcel.getWorkExperience());
+ one.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+ if (!Strings.isBlank(userExcel.getMarriageStatus())) {
+ one.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
+ }
+ if (!Strings.isBlank(userExcel.getSignLevel())) {
+ one.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+ }
+ one.setUnitName(userExcel.getUnitName());
+ one.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+ one.setDwellAddress(userExcel.getDwellAddress());
+ one.setAcceptancePoliceUnit(userExcel.getAcceptancePoliceUnit());
+ one.setAcceptancePerson(userExcel.getAcceptancePerson());
+ if (!Strings.isBlank(userExcel.getAcceptanceTime())){
+ try {
+ one.setAcceptanceTime(new SimpleDateFormat("yyyy/MM/dd").parse(userExcel.getAcceptanceTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ userDetailService.updateById(one);
+ }else {
+ UserDetailEntity detailEntity = new UserDetailEntity();
+ detailEntity.setUserId(user2.getId());
+ detailEntity.setDwellAddress(userExcel.getDwellAddress());
+ detailEntity.setEducationExperience(userExcel.getEducationExperience());
+ detailEntity.setMemberOfFamily(userExcel.getMemberOfFamily());
+ detailEntity.setWorkExperience(userExcel.getWorkExperience());
+ detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+ if (!Strings.isBlank(userExcel.getMarriageStatus())) {
+ detailEntity.setMarriageStatus(Integer.parseInt(userExcel.getMarriageStatus()));
+ }
+ if (!Strings.isBlank(userExcel.getSignLevel())) {
+ detailEntity.setSignLevel(Integer.parseInt(userExcel.getSignLevel()));
+ }
+ detailEntity.setUnitName(userExcel.getUnitName());
+ detailEntity.setPermanentResidenceAddress(userExcel.getPermanentResidenceAddress());
+ detailEntity.setDwellAddress(userExcel.getDwellAddress());
+ detailEntity.setAcceptancePoliceUnit(userExcel.getAcceptancePoliceUnit());
+ detailEntity.setAcceptancePerson(userExcel.getAcceptancePerson());
+ if (!Strings.isBlank(userExcel.getAcceptanceTime())){
+ try {
+ detailEntity.setAcceptanceTime(new SimpleDateFormat("yyyy/MM/dd").parse(userExcel.getAcceptanceTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ userDetailService.save(detailEntity);
+ }
+ }
}
}
}
//批量插入
//用户批量插入
- if (userList.size()>0) {
- baseMapper.batchUserList(userList);
- //装换成map
- Map<String, User> userMap = userList.stream().collect(Collectors.toMap(user -> user.getCardid(), user -> user));
- //匹配
- experienceList = experienceList.stream().map(experience -> {
- if (experience.getCardid().equals(userMap.get(experience.getCardid()).getCardid())) {
- experience.setSecurityid(userMap.get(experience.getCardid()).getId().toString());
- }
- return experience;
- }).collect(Collectors.toList());
- //批量插入从业记录
- baseMapper.batchExperienceList(experienceList);
- }
-// System.out.println("导入时间： = " + (System.currentTimeMillis()-time));
+// if (userList.size()>0) {
+// baseMapper.batchUserList(userList);
+// //装换成map
+// Map<String, User> userMap = userList.stream().collect(Collectors.toMap(user -> user.getCardid(), user -> user));
+// //匹配
+// experienceList = experienceList.stream().map(experience -> {
+// if (experience.getCardid().equals(userMap.get(experience.getCardid()).getCardid())) {
+// experience.setSecurityid(userMap.get(experience.getCardid()).getId().toString());
+// }
+// return experience;
+// }).collect(Collectors.toList());
+// //批量插入从业记录
+// baseMapper.batchExperienceList(experienceList);
+// }
//如果所有数据导入有一个异常
StringBuilder errorBuilder = new StringBuilder();
@@ -1176,6 +1234,47 @@
//抛出异常
if (errorBuilder.length()>0){
throw new ServiceException(errorBuilder.toString());
+ }
+ }
+
+ /**
+ * 判断是否持证
+ * @param securityInvalidList
+ * @param securityInvalidStatus
+ * @param user
+ * @param securitynumber
+ * @param cardid2
+ */
+ public void securityNumberCheck(List<String> securityInvalidList, AtomicBoolean securityInvalidStatus, User user, String securitynumber, String cardid2) {
+ //判断是否持证
+ if (null != securitynumber && securitynumber != "") {
+ user.setHold("1");
+ //校验保安员证编号是否合规
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(cardid2);
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size() > 0) {
+ boolean state = false;
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())) {
+ state = true;
+ }
+ }
+ if (!state) {
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ securityInvalidList.add(cardid2);
+ securityInvalidStatus.set(false);
+ }
+ } else {
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ securityInvalidList.add(cardid2);
+ securityInvalidStatus.set(false);
+ }
+ } else {
+ user.setHold("2");
}
}
@@ -1213,10 +1312,6 @@
if (null==user.getCardid() || user.getCardid().equals("")){
throw new ServiceException("导入失败!身份证号码不能为空!");
}
- //身份证住址校验
- if (null==user.getRegistered() || user.getRegistered().equals("")){
- throw new ServiceException("导入失败!身份证住址不能为空!");
- }
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
String cardid = user.getCardid().replaceAll(" ", "");
@@ -1247,35 +1342,7 @@
user.setStatus(1);
user.setIsDeleted(0);
//判断是否持证
- if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
- user.setHold("1");
- //校验保安员证编号是否合规
- SecurityPaper securityPaper = new SecurityPaper();
- securityPaper.setIdCardNo(userExcel.getCardid());
- List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
- if (securityPaperList.size()>0){
- boolean state = false;
- //遍历
- for (SecurityPaper paper : securityPaperList) {
- if (paper.getNumber().equals(user.getSecuritynumber())){
- state = true;
- }
- }
- if (!state){
- user.setHold("2");
- user.setSecuritynumber(null);
- securityInvalidList.add(userExcel.getCardid());
- securityInvalidStatus.set(false);
- }
- }else {
- user.setHold("2");
- user.setSecuritynumber(null);
- securityInvalidList.add(userExcel.getCardid());
- securityInvalidStatus.set(false);
- }
- }else {
- user.setHold("2");
- }
+ securityNumberCheck(securityInvalidList, securityInvalidStatus, user, userExcel.getSecuritynumber(), userExcel.getCardid());
//分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
@@ -1358,11 +1425,6 @@
}else {
user2.setHold("2");
}
- if (null!=userExcel.getRegistered()){
- user2.setRegistered(userExcel.getRegistered());
- }else {
- user2.setRegistered("");
- }
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
@@ -1416,23 +1478,9 @@
}else {
user2.setHold("2");
}
- if (null!=userExcel.getRegistered()){
- user2.setRegistered(userExcel.getRegistered());
- }else {
- user2.setRegistered("");
- }
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
-
- String s1 =
- "update blade_user set hold = " + "'" + user2.getHold() + "'"
- + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
- + ",registered = " + "'" + user2.getRegistered() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
- + " " + "where id = " + "'" + user2.getId() + "'";
- //FtpUtil.sqlFileUpload(s1);
- myAsyncService.dataSync(s1);
}
}
});
@@ -1487,6 +1535,9 @@
*/
@Override
public UserVO getUserDetails(User user) {
+
+
+
return baseMapper.getUserDetails(user);
}
@@ -1704,10 +1755,6 @@
if (null==user.getCardid() || user.getCardid().equals("")){
throw new ServiceException("导入失败!身份证号码不能为空!");
}
- //身份证住址校验
- if (null==user.getRegistered() || user.getRegistered().equals("")){
- throw new ServiceException("导入失败!身份证住址不能为空!");
- }
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
String cardid = user.getCardid().replaceAll(" ", "");
@@ -1738,61 +1785,6 @@
user.setStatus(1);
user.setIsDeleted(0);
user.setHold("2");
- //判断是否持证
-// if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-// user.setHold("1");
-// //校验保安员证编号是否合规
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(userExcel.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean state = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// state = true;
-// }
-// }
-// if (!state){
-// user.setHold("2");
-// user.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// user.setHold("2");
-// user.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// //创建保安证编号
-// user.setHold("1");
-// //去生成保安证编号
-// String pre = SecurityPaperUtil.getSecurityPaper();
-// //查询当前年份已有的保安证编号
-// int max = this.getSecurityPaperCount(pre);
-// String result = null;
-// if (max == 0) {
-// result = pre + "00001";
-// } else {
-// //格式化
-// DecimalFormat decimalFormat = new DecimalFormat("00000");
-// max++;
-// result = pre + (decimalFormat.format(max));
-// }
-// user.setSecuritynumber(result);
-//
-// //生成保安证的同时向保安证管理表中插入一条数据
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setNumber(result);
-// securityPaper.setCreateTime(new Date());
-// securityPaper.setIdCardNo(user.getCardid());
-// securityPaper.setPeopleName(user.getRealName());
-// securityPaper.setSource(3);
-// //新增保安员证信息
-// securityPaperService.save(securityPaper);
-// }
//分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
@@ -1846,80 +1838,9 @@
continue;
}else {
//如果是一致，则更新用户数据
- //判断是否持证
-// if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
-// user2.setHold("1");
-// user2.setSecuritynumber(user.getSecuritynumber());
-// //校验保安员证编号是否合规
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(userExcel.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean state = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// state = true;
-// }
-// }
-// if (!state){
-// user2.setHold("2");
-// user2.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// user2.setHold("2");
-// user2.setSecuritynumber(null);
-// securityInvalidList.add(userExcel.getCardid());
-// securityInvalidStatus.set(false);
-// }
-// }else {
-// //创建保安证编号
-// user2.setHold("1");
-// //去生成保安证编号
-// String pre = SecurityPaperUtil.getSecurityPaper();
-// //查询当前年份已有的保安证编号
-// int max = this.getSecurityPaperCount(pre);
-// String result = null;
-// if (max == 0) {
-// result = pre + "00001";
-// } else {
-// //格式化
-// DecimalFormat decimalFormat = new DecimalFormat("00000");
-// max++;
-// result = pre + (decimalFormat.format(max));
-// }
-// user2.setSecuritynumber(result);
-//
-// //生成保安证的同时向保安证管理表中插入一条数据
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setNumber(result);
-// securityPaper.setCreateTime(new Date());
-// securityPaper.setIdCardNo(user2.getCardid());
-// securityPaper.setPeopleName(user2.getRealName());
-// securityPaper.setSource(3);
-// //新增保安员证信息
-// securityPaperService.save(securityPaper);
-// }
- if (null!=userExcel.getRegistered()){
- user2.setRegistered(userExcel.getRegistered());
- }else {
- user2.setRegistered("");
- }
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
- //qfqk异步推送
-// myAsyncService.updateUserByQfqk(user2);
- //内网数据sql
- String s1 =
- "update blade_user set hold = " + "'" + user2.getHold() + "'"
- + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
- + ",registered = " + "'" + user2.getRegistered() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
- + " " + "where id = " + "'" + user2.getId() + "'";
- myAsyncService.dataSync(s1);
}
}
}
@@ -2071,4 +1992,130 @@
public UserVO getUserDetailById(Long id) {
return baseMapper.getUserDetailById(id);
}
+
+ /**
+ * 数据处理
+ * @return
+ */
+ @Override
+ public Object dataHandler() {
+ // 查询未关联的保安员
+ List<User> list = baseMapper.getNotGlList();
+ // 批量插入
+ for (User user : list) {
+ UserDetailEntity detailEntity = new UserDetailEntity();
+ detailEntity.setUserId(user.getId());
+ userDetailService.save(detailEntity);
+ }
+ return null;
+ }
+
+ /**
+ * 微信注册用户，需要密码和手机号
+ * @param user
+ * @return
+ */
+ @Override
+ public Boolean wxRegister(User user) {
+ User params = new User();
+ params.setCardid(user.getCardid());
+ //查看数据库是否有相同身份证号
+ List<User> list = list(Condition.getQueryWrapper(params));
+ if (list.size()>0){
+ throw new ServiceException("该身份证号已注册");
+ }
+
+ //注册新用户
+ user.setAccount(user.getPhone());
+
+ //微信注册角色
+ user.setRoleId("1734015564173127681");
+ //微信注册机构
+ user.setDeptId("1734016112398020609");
+
+ user.setTenantId("000000");
+
+ if (StringUtil.isNotBlank(user.getRealName())){
+ user.setName(user.getRealName());
+ }else{
+ user.setName("微信用户"+user.getPhone());
+ user.setRealName("微信用户"+user.getPhone());
+ }
+ boolean save = save(user);
+ return save;
+ }
+
+ @Override
+ public UserInfoDetail getUserInfoDetail(String id) {
+ return baseMapper.getUserInfoDetail(id);
+ }
+
+ @Override
+ public boolean batchAudit(String ids, String auditStatus) {
+ return baseMapper.batchAudit(ids,auditStatus);
+ }
+
+ @Override
+ public void importSecurityPaperTime(List<UserCertificateExcel> data, Boolean isCovered, String deptId) {
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
+ AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
+ //遍历
+ for (UserCertificateExcel userExcel : data) {
+
+ //身份证校验
+ if (null == userExcel.getCardid() || userExcel.getCardid().equals("")) {
+ throw new ServiceException("导入失败!身份证号码不能为空!");
+ }
+ if (null != userExcel.getCardid() && !userExcel.getCardid().equals("")) {
+ //去除所有空格
+ String cardid = userExcel.getCardid().replaceAll(" ", "");
+ //校验
+ boolean b = IdCardNoUtil.checkIdCardNo(cardid);
+ if (b) {
+ userExcel.setCardid(cardid);
+ } else {
+ //forEach 只能使用 return 跳出本次循环
+// return;
+ continue;
+ }
+ }
+
+ //根据身份证、保安证编号获取用户
+ User userInfoByIdCardNo = baseMapper.getUserInfoByIdCardNoAndSecurityNumber(userExcel.getCardid(),userExcel.getSecuritynumber());
+
+ if (userInfoByIdCardNo == null){
+ throw new ServiceException("导入失败!身份证号和保安证编号与系统不匹配!");
+ }
+
+ User user = new User();
+ user.setId(userInfoByIdCardNo.getId());
+
+ if (!Strings.isBlank(userExcel.getPaperTime())) {
+ try {
+ user.setPaperTime(new SimpleDateFormat("yyyy-MM-dd").parse(userExcel.getPaperTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ updateById(user);
+
+ //如果所有数据导入有一个异常
+ StringBuilder errorBuilder = new StringBuilder();
+ if (!status.get()) {
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+
+ //抛出异常
+ if (errorBuilder.length() > 0) {
+ throw new ServiceException(errorBuilder.toString());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3