Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
9aba9756 1 parent 0280ce31

All | 修改 | 异常监听配置调整 

mt
2024年12月19日15:50:51
Inline Side-by-side
Showing 7 changed files with 35 additions and 12 deletions
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.service.biz.impl; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.service.biz.impl;
2 2
3 import com.fedex.connect.common.dependencies.contants.DigitConstants; 3 import com.fedex.connect.common.dependencies.contants.DigitConstants;
4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
5 +import com.fedex.connect.common.dependencies.exception.OpErrorException;
5 import com.fedex.connect.common.model.biz.*; 6 import com.fedex.connect.common.model.biz.*;
6 import com.fedex.connect.common.model.sys.User; 7 import com.fedex.connect.common.model.sys.User;
7 import com.fedex.connect.customer.data.bo.AddBo; 8 import com.fedex.connect.customer.data.bo.AddBo;
...@@ -134,6 +135,12 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -134,6 +135,12 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
134 * 保存运单相关信息 135 * 保存运单相关信息
135 */ 136 */
136 this.submitInfo(consignment,attachmentList,uploadRecord,user); 137 this.submitInfo(consignment,attachmentList,uploadRecord,user);
138 + }catch(OpErrorException ex){
139 + /**
140 + * 提交异常，需要删除对应已上传附件
141 + */
142 + attachmentService.deleteAttachments(attachmentList);
143 + throw ex;
137 }catch(Exception ex){ 144 }catch(Exception ex){
138 /** 145 /**
139 * 提交异常，需要删除对应已上传附件 146 * 提交异常，需要删除对应已上传附件
......
...@@ -43,4 +43,8 @@ mybatis: ...@@ -43,4 +43,8 @@ mybatis:
43 configuration: 43 configuration:
44 #开启驼峰与下划线转换 44 #开启驼峰与下划线转换
45 map-underscore-to-camel-case: true 45 map-underscore-to-camel-case: true
46 - call-setters-on-nulls: true
...\ No newline at end of file ...\ No newline at end of file
46 + call-setters-on-nulls: true
47 +#全局异常拦截是否生效
48 +common:
49 + exception-advice-webconfig:
50 + enable: true
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -30,19 +30,19 @@ business_field_31007=目的国全称 ...@@ -30,19 +30,19 @@ business_field_31007=目的国全称
30 business_field_31008=文件业务类型 30 business_field_31008=文件业务类型
31 31
32 #*********具体响应到前端********** 32 #*********具体响应到前端**********
33 -business_exception_30001=#{0}必填字段未填写 33 +business_exception_30001={0}必填字段未填写
34 business_exception_30002=单次最多可查询1000个运单号码 34 business_exception_30002=单次最多可查询1000个运单号码
35 -business_exception_30003=#{0}不正确，请重新输入 35 +business_exception_30003={0}不正确，请重新输入
36 business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 36 business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
37 business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 37 business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
38 business_exception_30006=附件上传不符合标准 38 business_exception_30006=附件上传不符合标准
39 -business_exception_30007=所有上传文件数量不超过#{0}个文件 39 +business_exception_30007=所有上传文件数量不超过{0}个文件
40 -business_exception_30008=所有上传文件总大小不超过#{0}M 40 +business_exception_30008=所有上传文件总大小不超过{0}M
41 business_exception_30009=运单或发票未上传 41 business_exception_30009=运单或发票未上传
42 business_exception_30010=文件类型不在：运单、发票、箱单、其他 42 business_exception_30010=文件类型不在：运单、发票、箱单、其他
43 business_exception_30011=该运单已被其他人创建，不可以重复创建 43 business_exception_30011=该运单已被其他人创建，不可以重复创建
44 business_exception_30012=UUID不一致 44 business_exception_30012=UUID不一致
45 -business_exception_30013=文件名为：#{0}，上传失败，请检查后重试 45 +business_exception_30013=文件名为：{0}，上传失败，请检查后重试
46 business_exception_30014=运单信息加载失败，请稍后重试 46 business_exception_30014=运单信息加载失败，请稍后重试
47 business_success_30015=上传成功 47 business_success_30015=上传成功
48 business_exception_30016=运单提交失败 48 business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -30,9 +30,9 @@ business_field_31007=目的国全称 ...@@ -30,9 +30,9 @@ business_field_31007=目的国全称
30 business_field_31008=文件业务类型 30 business_field_31008=文件业务类型
31 31
32 #*********具体响应到前端********** 32 #*********具体响应到前端**********
33 -business_exception_30001=${0}必填字段未填写 33 +business_exception_30001={0}必填字段未填写
34 business_exception_30002=单次最多可查询1000个运单号码 34 business_exception_30002=单次最多可查询1000个运单号码
35 -business_exception_30003=${0}不正确，请重新输入 35 +business_exception_30003={0}不正确，请重新输入
36 business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 36 business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
37 business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 37 business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
38 business_exception_30006=附件上传不符合标准 38 business_exception_30006=附件上传不符合标准
...@@ -42,7 +42,7 @@ business_exception_30009=运单或发票未上传 ...@@ -42,7 +42,7 @@ business_exception_30009=运单或发票未上传
42 business_exception_30010=文件类型不在：运单、发票、箱单、其他 42 business_exception_30010=文件类型不在：运单、发票、箱单、其他
43 business_exception_30011=该运单已被其他人创建，不可以重复创建 43 business_exception_30011=该运单已被其他人创建，不可以重复创建
44 business_exception_30012=UUID不一致 44 business_exception_30012=UUID不一致
45 -business_exception_30013=文件名为：#{0}，上传失败，请检查后重试 45 +business_exception_30013=文件名为：{0}，上传失败，请检查后重试
46 business_exception_30014=运单信息加载失败，请稍后重试 46 business_exception_30014=运单信息加载失败，请稍后重试
47 business_success_30015=上传成功 47 business_success_30015=上传成功
48 business_exception_30016=运单提交失败 48 business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -36,4 +36,8 @@ mybatis: ...@@ -36,4 +36,8 @@ mybatis:
36 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 36 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
37 #开启驼峰与下划线转换 37 #开启驼峰与下划线转换
38 map-underscore-to-camel-case: true 38 map-underscore-to-camel-case: true
39 - call-setters-on-nulls: true
...\ No newline at end of file ...\ No newline at end of file
39 + call-setters-on-nulls: true
40 +#全局异常拦截是否生效
41 +common:
42 + exception-advice-webconfig:
43 + enable: true
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -43,4 +43,8 @@ mybatis: ...@@ -43,4 +43,8 @@ mybatis:
43 configuration: 43 configuration:
44 #开启驼峰与下划线转换 44 #开启驼峰与下划线转换
45 map-underscore-to-camel-case: true 45 map-underscore-to-camel-case: true
46 - call-setters-on-nulls: true
...\ No newline at end of file ...\ No newline at end of file
46 + call-setters-on-nulls: true
47 +#全局异常拦截是否生效
48 +common:
49 + exception-advice-webconfig:
50 + enable: true
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -18,4 +18,8 @@ mybatis: ...@@ -18,4 +18,8 @@ mybatis:
18 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 18 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
19 #开启驼峰与下划线转换 19 #开启驼峰与下划线转换
20 map-underscore-to-camel-case: true 20 map-underscore-to-camel-case: true
21 - call-setters-on-nulls: true
...\ No newline at end of file ...\ No newline at end of file
21 + call-setters-on-nulls: true
22 +#全局异常拦截是否生效
23 +common:
24 + exception-advice-webconfig:
25 + enable: true
...\ No newline at end of file ...\ No newline at end of file
......