Commit 330329fe authored by huyuchen's avatar huyuchen

huych-电子档案批量导入第五次提交

parent a2163ce4
...@@ -229,10 +229,13 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -229,10 +229,13 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
} }
try { try {
//重复数据检测
Map<String,String> map = new HashMap<>();
// 1. 校验请求并查询档案信息 // 1. 校验请求并查询档案信息
for (ArchiveBatchDownloadRequestVO request : requestList) { for (ArchiveBatchDownloadRequestVO request : requestList) {
try { try {
validateAndPrepareDownload(request, downloadMap, feedbackList, isCheck, deptNoList); validateAndPrepareDownload(request, downloadMap, feedbackList, isCheck, deptNoList, map);
} catch (Exception e) { } catch (Exception e) {
log.error("处理下载请求失败,姓名:{},身份证:{},项目编码:{}", log.error("处理下载请求失败,姓名:{},身份证:{},项目编码:{}",
request.getEmpName(), request.getEmpIdcard(), request.getDeptNo(), e); request.getEmpName(), request.getEmpIdcard(), request.getDeptNo(), e);
...@@ -345,7 +348,8 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -345,7 +348,8 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
Map<String, ArchiveDownloadInfo> downloadMap, Map<String, ArchiveDownloadInfo> downloadMap,
List<ArchiveDownloadFeedbackVO> feedbackList, List<ArchiveDownloadFeedbackVO> feedbackList,
boolean isCheck, boolean isCheck,
List<String> deptNoList) { List<String> deptNoList,
Map<String,String> map) {
// 1. 根据姓名、身份证、项目编码、项目名称查询电子档案明细 // 1. 根据姓名、身份证、项目编码、项目名称查询电子档案明细
LambdaQueryWrapper<TElectronicArchiveDetail> wrapper = Wrappers.<TElectronicArchiveDetail>lambdaQuery() LambdaQueryWrapper<TElectronicArchiveDetail> wrapper = Wrappers.<TElectronicArchiveDetail>lambdaQuery()
...@@ -362,6 +366,24 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -362,6 +366,24 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
// 查询档案明细 // 查询档案明细
TElectronicArchiveDetail detail = baseMapper.selectOne(wrapper); TElectronicArchiveDetail detail = baseMapper.selectOne(wrapper);
StringBuilder s = new StringBuilder();
s.append(request.getEmpIdcard());
s.append("_");
s.append(request.getDeptNo());
s.append("_");
s.append(request.getDeptName());
s.append("_");
s.append(request.getEmpName());
s.append("_");
s.append(request.getMaterialType());
if (null != map.get(s.toString())) {
feedbackList.add(createFeedbackVO(request, "存在重复的导出人员信息",detail));
return;
}else {
map.put(s.toString(), "1");
}
//项目权限校验 //项目权限校验
if (isCheck && !deptNoList.contains(request.getDeptNo())) { if (isCheck && !deptNoList.contains(request.getDeptNo())) {
feedbackList.add(createFeedbackVO(request, "没有该项目的权限",detail)); feedbackList.add(createFeedbackVO(request, "没有该项目的权限",detail));
......
...@@ -241,10 +241,6 @@ public class OSSUtil { ...@@ -241,10 +241,6 @@ public class OSSUtil {
log.error("oss客户端获取错误,无此客户端",clientIndex); log.error("oss客户端获取错误,无此客户端",clientIndex);
}else{ }else{
OSSObject ossObject = null; OSSObject ossObject = null;
// #region agent log
int fileIndex = 0;
long totalBytesRead = 0;
// #endregion
for(OSSObjectBean key:srcList){ for(OSSObjectBean key:srcList){
// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。 // ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
ossObject = client.getObject(bucketName, key.getKey()); ossObject = client.getObject(bucketName, key.getKey());
......
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