|
@ -129,10 +129,10 @@ public class TestReportController { |
|
|
return R.fail("报告名称不能为空!"); |
|
|
return R.fail("报告名称不能为空!"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
testReportService.check(reportName); |
|
|
|
|
|
|
|
|
// testReportService.check(reportName); |
|
|
TestReport testReport = new TestReport(); |
|
|
TestReport testReport = new TestReport(); |
|
|
testReport.setReportName(reportName); |
|
|
testReport.setReportName(reportName); |
|
|
if(file != null && FileUploadUtils.checkTxtFileValid(file)){ |
|
|
|
|
|
|
|
|
if(file != null ){ |
|
|
SysOssVo toolVo = iSysOssService.upload(file,true); |
|
|
SysOssVo toolVo = iSysOssService.upload(file,true); |
|
|
testReport.setReportPath(toolVo.getOriginalName()); |
|
|
testReport.setReportPath(toolVo.getOriginalName()); |
|
|
testReport.setReportOssId(toolVo.getOssId()); |
|
|
testReport.setReportOssId(toolVo.getOssId()); |
|
@ -157,10 +157,10 @@ public class TestReportController { |
|
|
return R.fail("数据名称不能为空!"); |
|
|
return R.fail("数据名称不能为空!"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
testReportService.check(reportName); |
|
|
|
|
|
|
|
|
// testReportService.check(reportName); |
|
|
TestReport testReport = new TestReport(); |
|
|
TestReport testReport = new TestReport(); |
|
|
testReport.setReportName(reportName); |
|
|
testReport.setReportName(reportName); |
|
|
if(file != null && FileUploadUtils.checkTxtFileValid(file)){ |
|
|
|
|
|
|
|
|
if(file != null ){ |
|
|
SysOssVo toolVo = iSysOssService.upload(file,true); |
|
|
SysOssVo toolVo = iSysOssService.upload(file,true); |
|
|
testReport.setReportPath(toolVo.getOriginalName()); |
|
|
testReport.setReportPath(toolVo.getOriginalName()); |
|
|
testReport.setReportOssId(toolVo.getOssId()); |
|
|
testReport.setReportOssId(toolVo.getOssId()); |
|
@ -177,7 +177,7 @@ public class TestReportController { |
|
|
@Log(title = "文件加密", businessType = BusinessType.INSERT) |
|
|
@Log(title = "文件加密", businessType = BusinessType.INSERT) |
|
|
@PostMapping(value = "/uploadEncrypt", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) |
|
|
@PostMapping(value = "/uploadEncrypt", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) |
|
|
public R uploadEncrypt( @RequestParam("file") MultipartFile file) { |
|
|
public R uploadEncrypt( @RequestParam("file") MultipartFile file) { |
|
|
if(file != null && FileUploadUtils.checkTxtFileValid(file)){ |
|
|
|
|
|
|
|
|
if(file != null ){ |
|
|
SysOssVo toolVo = iSysOssService.upload(file,true); |
|
|
SysOssVo toolVo = iSysOssService.upload(file,true); |
|
|
SysOss update = new SysOss(); |
|
|
SysOss update = new SysOss(); |
|
|
update.setOssId(toolVo.getOssId()); |
|
|
update.setOssId(toolVo.getOssId()); |
|
|