Commit 70d1ca13 authored by zhuxiang's avatar zhuxiang
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 4e805606 e88f7128
...@@ -27,7 +27,7 @@ public class AnalysisController { ...@@ -27,7 +27,7 @@ public class AnalysisController {
@ApiOperation("解析画布边文件上传excel内容") @ApiOperation("解析画布边文件上传excel内容")
@PostMapping("/canvas") @PostMapping("/canvas")
public Result<?> canvas(@RequestParam(value = "files") MultipartFile[] files, public Result<?> canvas(@RequestParam(value = "files") List<MultipartFile> files,
@RequestParam(value = "caseId") String caseId, @RequestParam(value = "caseId") String caseId,
@RequestParam(value = "folderName", required = false) String folderName) { @RequestParam(value = "folderName", required = false) String folderName) {
return analysisService.canvas(files,caseId,folderName); return analysisService.canvas(files,caseId,folderName);
......
...@@ -19,7 +19,7 @@ public interface AnalysisService { ...@@ -19,7 +19,7 @@ public interface AnalysisService {
* @param files * @param files
* @return * @return
*/ */
Result<?> canvas(MultipartFile[] files,String caseId,String folderName); Result<?> canvas(List<MultipartFile> files,String caseId,String folderName);
/** /**
* 读取模板文件 * 读取模板文件
......
...@@ -57,7 +57,7 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -57,7 +57,7 @@ public class AnalysisServiceImpl implements AnalysisService {
@Override @Override
@Transactional @Transactional
public Result<?> canvas(MultipartFile[] files, String caseId, String folderName) { public Result<?> canvas(List<MultipartFile> files, String caseId, String folderName) {
//查询模板 //查询模板
// CasesEntity caseEntity = caseService.getById(caseId); // CasesEntity caseEntity = caseService.getById(caseId);
// String templateId = caseEntity.getTemplateId(); // String templateId = caseEntity.getTemplateId();
...@@ -73,26 +73,26 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -73,26 +73,26 @@ public class AnalysisServiceImpl implements AnalysisService {
//默认模板 //默认模板
List<TableHeaderVO> tableHeaderList = Lists.newArrayList(); List<TableHeaderVO> tableHeaderList = Lists.newArrayList();
tableHeaderList.add(TableHeaderVO.builder().name("交易类型").index(0).build()); tableHeaderList.add(TableHeaderVO.builder().name("交易类型").index(2).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易主体的出入账标识").index(1).build()); tableHeaderList.add(TableHeaderVO.builder().name("交易主体的出入账标识").index(4).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易时间").index(2).build()); tableHeaderList.add(TableHeaderVO.builder().name("交易时间").index(5).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易金额").index(3).build()); tableHeaderList.add(TableHeaderVO.builder().name("交易金额").index(7).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易流水号").index(4).build()); tableHeaderList.add(TableHeaderVO.builder().name("交易流水号").index(8).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方银行卡所属银行卡号").index(5).build()); tableHeaderList.add(TableHeaderVO.builder().name("收款方银行卡所属银行卡号").index(12).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方的支付帐号").index(6).build()); tableHeaderList.add(TableHeaderVO.builder().name("收款方的支付帐号").index(13).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方的商户号").index(7).build()); tableHeaderList.add(TableHeaderVO.builder().name("收款方的商户号").index(15).build());
tableHeaderList.add(TableHeaderVO.builder().name("收款方的商户名称").index(8).build()); tableHeaderList.add(TableHeaderVO.builder().name("收款方的商户名称").index(16).build());
tableHeaderList.add(TableHeaderVO.builder().name("付款方银行卡所属银行名称").index(9).build()); tableHeaderList.add(TableHeaderVO.builder().name("付款方银行卡所属银行名称").index(18).build());
tableHeaderList.add(TableHeaderVO.builder().name("付款方银行卡所属银行卡号").index(10).build()); tableHeaderList.add(TableHeaderVO.builder().name("付款方银行卡所属银行卡号").index(19).build());
tableHeaderList.add(TableHeaderVO.builder().name("付款方的支付帐号").index(11).build()); tableHeaderList.add(TableHeaderVO.builder().name("付款方的支付帐号").index(20).build());
tableHeaderList.add(TableHeaderVO.builder().name("交易支付设备ip").index(12).build()); tableHeaderList.add(TableHeaderVO.builder().name("交易支付设备ip").index(22).build());
tableHeaderList.add(TableHeaderVO.builder().name("mac地址").index(13).build()); tableHeaderList.add(TableHeaderVO.builder().name("mac地址").index(23).build());
tableHeaderList.add(TableHeaderVO.builder().name("银行外部渠道交易流水号").index(14).build()); tableHeaderList.add(TableHeaderVO.builder().name("银行外部渠道交易流水号").index(27).build());
tableHeaderList.add(TableHeaderVO.builder().name("支付帐号").index(15).build()); tableHeaderList.add(TableHeaderVO.builder().name("支付帐号").index(29).build());
tableHeaderList.add(TableHeaderVO.builder().name("备注").index(16).build()); tableHeaderList.add(TableHeaderVO.builder().name("备注").index(30).build());
try { try {
if (files.length == 0) { if (files.size() == 0) {
return Result.fail("上传的文件为空"); return Result.fail("上传的文件为空");
} }
List<FileUploadVO> fileUploadList = Lists.newArrayList(); List<FileUploadVO> fileUploadList = Lists.newArrayList();
...@@ -120,6 +120,19 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -120,6 +120,19 @@ public class AnalysisServiceImpl implements AnalysisService {
.build()); .build());
} }
} }
if (StringUtils.isNotEmpty(folderName)) {
String userName = trimChineseNameFromFilename(folderName);
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
if (!ObjectUtils.isEmpty(idCardInfo)) {
userService.save(UserEntity.builder().userName(userName)
.age(Integer.parseInt(idCardInfo.get("age")))
.idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex"))
.idType("身份证")
.caseId(caseId)
.build());
}
}
if (errorCount == 0){ if (errorCount == 0){
return Result.data(fileUploadList); return Result.data(fileUploadList);
}else { }else {
...@@ -254,16 +267,6 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -254,16 +267,6 @@ public class AnalysisServiceImpl implements AnalysisService {
if (StringUtils.isNotEmpty(folderName)) { if (StringUtils.isNotEmpty(folderName)) {
String userName = trimChineseNameFromFilename(folderName); String userName = trimChineseNameFromFilename(folderName);
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
if (!ObjectUtils.isEmpty(idCardInfo)) {
userService.save(UserEntity.builder().userName(userName)
.age(Integer.parseInt(idCardInfo.get("age")))
.idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex"))
.idType("身份证")
.caseId(caseId)
.build());
}
if (!excelData.isEmpty()) { if (!excelData.isEmpty()) {
List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList()); List<String> paymentBankNames = excelData.stream().map(ExcelDataEntity::getPaymentBankName).distinct().collect(Collectors.toList());
List<UserAccountEntity> userAccountList = Lists.newArrayList(); List<UserAccountEntity> userAccountList = Lists.newArrayList();
......
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