From f41f7a7efb363425a88e1a060f81f785ba2b57a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Oct 2021 21:00:04 +0800
Subject: [PATCH] 新增保安员证相关信息导出接口（包含图片，二维码）
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 15 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 3a5192f..553ae83 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,20 +17,16 @@
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
-import org.springblade.common.cache.DictCache;
-import org.springblade.common.cache.ParamCache;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
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.QRCodeUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -44,13 +40,11 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
-import org.springblade.modules.dispatcher.service.IDispatcherService;
-import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
-import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.system.entity.*;
+import org.springblade.modules.system.excel.ExportSecurityPaperExcel;
import org.springblade.modules.system.excel.QrCodeExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
@@ -58,6 +52,10 @@
import org.springblade.modules.system.service.*;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -65,11 +63,12 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
-
-import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* 服务实现类
@@ -388,8 +387,16 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
+// @Transactional(rollbackFor = Exception.class) 去除事务回滚
public void importUser(List<UserExcel> data, Boolean isCovered,String deptId) {
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ //将需要新增的保安员信息存入集合
+ List<User> insertList = new ArrayList<>();
+ //将需要更新的保安员信息存入集合
+ List<User> updateList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
//设置部门id
@@ -397,18 +404,17 @@
if (null!=deptIds && !deptIds.equals("")) {
if (null != deptId && !deptId.equals("")) {
if (!deptId.equals(deptIds)) {
- throw new ServiceException("不能导入不是本公司的保安员数据!");
+ throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
}
}
user.setDeptId(deptIds);
}else {
//如果deptIds 为空，则说明还没有改公司
- throw new ServiceException("公司名:"+user.getDeptId()+"不存在!");
+ throw new ServiceException("导入失败!公司名:["+user.getDeptId()+"]不存在!");
}
//判断当前用户是否已在本单位，如果是的更新数据
User user1 = new User();
user1.setAccount(user.getCardid());
- System.out.println("user.getCardid() = " + user.getCardid());
user1.setIsDeleted(0);
user1.setStatus(1);
User user2 = this.getOne(Condition.getQueryWrapper(user1));
@@ -453,7 +459,12 @@
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
Dept dept = deptService.getById(user2.getDeptId());
- throw new ServiceException("用户:"+"["+user.getCardid()+"]"+"已在["+dept.getDeptName()+"]存在!");
+// throw new ServiceException("用户:"+"["+user.getCardid()+"]"+"已在其他单位存在!");
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+ return;
}else {
//如果是一致，则更新用户数据
//判断是否持证
@@ -477,6 +488,11 @@
}
}
});
+ //如果所有数据导入有一个异常
+ if (!status.get()){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
+ }
}
// @Override
@@ -799,6 +815,10 @@
if (Integer.parseInt(type) == 4) {
list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
}
+ //现场检查获取保安员
+ if (Integer.parseInt(type) == 5) {
+ list = baseMapper.getSecurityInfo(jurisdiction);
+ }
return list;
}
@@ -870,4 +890,57 @@
}
});
}
+
+
+ /**
+ * 导出保安员证信息
+ * @param user
+ * @return
+ */
+ @Override
+ public List<ExportSecurityPaperExcel> exportSecurityPaperList(UserVO user) {
+ //查询数据
+ List<UserVO> userVOList = baseMapper.exportSecurityPaperList(user);
+ if (userVOList.size()>0) {
+ //返回的集合数据
+ List<ExportSecurityPaperExcel> list = new ArrayList<>();
+ //遍历
+ userVOList.forEach(userVO -> {
+ ExportSecurityPaperExcel excel = new ExportSecurityPaperExcel();
+ //数据转换封装
+ excel.setRealName(userVO.getRealName());
+ excel.setIdCardNo(userVO.getCardid());
+ excel.setDeptName(userVO.getDeptName());
+ //如果头像有
+ if (null != userVO.getAvatar() && userVO.getAvatar() != "") {
+ try {
+ if (userVO.getAvatar().contains("http:")) {
+ excel.setAvatar(new URL(userVO.getAvatar()));
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+ //如果保安证编号不为空
+ if (null != userVO.getSecuritynumber() && userVO.getSecuritynumber() != "") {
+ //去生成二维码
+ String url = "http://223.82.109.183:2080/securityInfo.html";
+ String encoded = null;
+ try {
+ encoded = URLEncoder.encode(userVO.getSecuritynumber(), "UTF-8");
+ String content = url + "?securityNumber=" + encoded;
+ URLEncoder.encode(content, "utf-8");
+ byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
+ //设置二维码
+ excel.setQrCode(qrCodeImage);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ list.add(excel);
+ });
+ return list;
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3