Commit 14ee6dde by zhangkb

标签元数据导入去掉校验条件

parent 0e78cba6
...@@ -12,8 +12,6 @@ import java.util.stream.Collectors; ...@@ -12,8 +12,6 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction; import org.springframework.data.domain.Sort.Direction;
...@@ -44,8 +42,6 @@ import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler; ...@@ -44,8 +42,6 @@ import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler;
@Service @Service
public class TagFileService { public class TagFileService {
private Logger logger = LoggerFactory.getLogger(TagFileService.class);
@Autowired @Autowired
private MongoOperations mongoOperations; private MongoOperations mongoOperations;
...@@ -248,13 +244,12 @@ public class TagFileService { ...@@ -248,13 +244,12 @@ public class TagFileService {
ImportParams params = new ImportParams(); ImportParams params = new ImportParams();
params.setTitleRows(0); params.setTitleRows(0);
params.setHeadRows(1); params.setHeadRows(1);
params.setNeedVerify(true); params.setNeedVerify(false);
params.setVerifyHandler(new TagMetadataVerifyHandler()); //params.setVerifyHandler(new TagMetadataVerifyHandler());
ExcelImportResult<TagMetadata> excelImportResult = ExcelImportUtil. ExcelImportResult<TagMetadata> excelImportResult = ExcelImportUtil.
importExcelMore(file.getInputStream(), TagMetadata.class, params); importExcelMore(file.getInputStream(), TagMetadata.class, params);
List<String> successIds = new ArrayList<>(); List<String> successIds = new ArrayList<>();
List<TagMetadata> tagMetadatas = excelImportResult.getList(); List<TagMetadata> tagMetadatas = excelImportResult.getList();
logger.info("tagMetadataListSize:"+tagMetadatas.size());
for(TagMetadata tagMetadata : tagMetadatas) { for(TagMetadata tagMetadata : tagMetadatas) {
//判断元数据名称是否在repo存在 //判断元数据名称是否在repo存在
String claz = null; String claz = null;
...@@ -278,6 +273,9 @@ public class TagFileService { ...@@ -278,6 +273,9 @@ public class TagFileService {
//调用repo接口批量打元数据标签 //调用repo接口批量打元数据标签
repoService.addTag(dimensionType, idPath, successIds, tagType); repoService.addTag(dimensionType, idPath, successIds, tagType);
} }
excelImportResult.getFailList().forEach(tag -> {
importLog.appendErrorMsg(String.format("第%s行, %s", tag.getRowNum() + params.getTitleRows() + params.getReadRows(), tag.getErrorMsg()));
});
importLog.setHasFailNum(!excelImportResult.getFailList().isEmpty() || hasOtherFail); importLog.setHasFailNum(!excelImportResult.getFailList().isEmpty() || hasOtherFail);
importLog.setTotalNum(excelImportResult.getList().size() + excelImportResult.getFailList().size()); importLog.setTotalNum(excelImportResult.getList().size() + excelImportResult.getFailList().size());
importLog.setSuccessIds(successIds); importLog.setSuccessIds(successIds);
......
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