|
|
@@ -687,6 +687,9 @@ public class OwnBillController extends BaseController {
|
|
|
if(size > 2097152L){
|
|
|
return R.fail(500,"上传文件大小不能超过2mb");
|
|
|
}
|
|
|
+ if(file.getResource().getFilename().length() > 60){
|
|
|
+ return R.fail(500,"文件名称过长,请不要超过60个字符");
|
|
|
+ }
|
|
|
//获取登录用户
|
|
|
LoginUser user = tokenService.getLoginUser();
|
|
|
String companyId = user.getSysUser().getCompanyId();
|
|
|
@@ -717,7 +720,7 @@ public class OwnBillController extends BaseController {
|
|
|
//文件传输
|
|
|
R<PubFileInf> fileResult = remoteFileService.uploadFile(file,"01","04","00", companyId, token);
|
|
|
if(fileResult.getData() == null){
|
|
|
- return R.fail(500,"文件识别错误,上传失败!");
|
|
|
+ return R.fail(500,"文件上传失败,请稍后或更换文件后重试");
|
|
|
}
|
|
|
zcInvoiceInf.setZiiFile(fileResult.getData().getPfiFileId());
|
|
|
Map map = new HashMap();
|
|
|
@@ -871,12 +874,15 @@ public class OwnBillController extends BaseController {
|
|
|
//获取登录用户
|
|
|
LoginUser user = tokenService.getLoginUser();
|
|
|
String companyId = user.getSysUser().getCompanyId();
|
|
|
+ if(file.getResource().getFilename().length() > 60){
|
|
|
+ return R.fail(500,"文件名称过长,请不要超过60个字符");
|
|
|
+ }
|
|
|
//获取上传文件token
|
|
|
String token = SecurityUtils.getToken(ServletUtils.getRequest());
|
|
|
//文件传输
|
|
|
R<PubFileInf> fileResult = remoteFileService.uploadFile(file,"01","04","00", companyId, token);
|
|
|
if(fileResult.getData() == null){
|
|
|
- return R.fail(500,"文件识别错误,上传失败!");
|
|
|
+ return R.fail(500,"文件上传失败,请稍后或更换文件后重试");
|
|
|
}
|
|
|
Map map = new HashMap();
|
|
|
map.put("id",fileResult.getData().getPfiFileId());
|