Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
77c91e4c 1 parent 01275652

biz-customer | 修改 | 增加注解日志 

mt
2024年11月12日10:59:24
Inline Side-by-side
Showing 8 changed files with 37 additions and 4 deletions
1 package com.fedex.connect.customer.controller.biz.impl; 1 package com.fedex.connect.customer.controller.biz.impl;
2 2
3 +import com.fedex.connect.common.dependencies.annotation.OperationMethodLog;
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
5 import com.fedex.connect.customer.controller.base.BaseController; 6 import com.fedex.connect.customer.controller.base.BaseController;
...@@ -26,6 +27,7 @@ public class AttachmentQueryController extends BaseController implements IAttach ...@@ -26,6 +27,7 @@ public class AttachmentQueryController extends BaseController implements IAttach
26 @Override 27 @Override
27 @PostMapping("/queryInfo/{consignmentId}") 28 @PostMapping("/queryInfo/{consignmentId}")
28 @ApiOperation(value = "ResponseVo", notes = "根据运单ID查询用户上传记录") 29 @ApiOperation(value = "ResponseVo", notes = "根据运单ID查询用户上传记录")
30 + @OperationMethodLog(describe = "business_log_20005")
29 public ResponseVo queryInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) { 31 public ResponseVo queryInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
30 /** 32 /**
31 * 运单id非空校验 33 * 运单id非空校验
......
...@@ -41,6 +41,9 @@ public class ConsignmentController extends BaseController implements IConsignmen ...@@ -41,6 +41,9 @@ public class ConsignmentController extends BaseController implements IConsignmen
41 @OperationMethodLog(describe = "business_log_20002") 41 @OperationMethodLog(describe = "business_log_20002")
42 public ResponseVo submitConsignment(@RequestParam("fileUpload") MultipartFile[] files, 42 public ResponseVo submitConsignment(@RequestParam("fileUpload") MultipartFile[] files,
43 @RequestParam("consignmentJson") String consignmentJson) { 43 @RequestParam("consignmentJson") String consignmentJson) {
44 + /**
45 + * 参数转为json
46 + */
44 ConsignmentBo consignmentBo = JSONObject.parseObject(consignmentJson,ConsignmentBo.class); 47 ConsignmentBo consignmentBo = JSONObject.parseObject(consignmentJson,ConsignmentBo.class);
45 /** 48 /**
46 * 运单id非空校验 49 * 运单id非空校验
...@@ -50,7 +53,9 @@ public class ConsignmentController extends BaseController implements IConsignmen ...@@ -50,7 +53,9 @@ public class ConsignmentController extends BaseController implements IConsignmen
50 * 获取当前用户信息 53 * 获取当前用户信息
51 */ 54 */
52 User user = this.getCurrentUserInfo(); 55 User user = this.getCurrentUserInfo();
53 - 56 + /**
54 - return null; 57 + * 运单提交
58 + */
59 + return consignmentService.submitConsignment(files,consignmentBo,user);
55 } 60 }
56 } 61 }
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.fedex.connect.customer.controller.biz.impl; 1 package com.fedex.connect.customer.controller.biz.impl;
2 2
3 +import com.fedex.connect.common.dependencies.annotation.OperationMethodLog;
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
5 import com.fedex.connect.customer.controller.base.BaseController; 6 import com.fedex.connect.customer.controller.base.BaseController;
...@@ -26,6 +27,7 @@ public class ConsignmentQueryController extends BaseController implements IConsi ...@@ -26,6 +27,7 @@ public class ConsignmentQueryController extends BaseController implements IConsi
26 @Override 27 @Override
27 @PostMapping("/list") 28 @PostMapping("/list")
28 @ApiOperation(value = "ResponseVo", notes = "运单查询") 29 @ApiOperation(value = "ResponseVo", notes = "运单查询")
30 + @OperationMethodLog(describe = "business_log_20003")
29 public ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) { 31 public ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
30 /** 32 /**
31 * 获取当前用户信息 33 * 获取当前用户信息
...@@ -40,6 +42,7 @@ public class ConsignmentQueryController extends BaseController implements IConsi ...@@ -40,6 +42,7 @@ public class ConsignmentQueryController extends BaseController implements IConsi
40 @Override 42 @Override
41 @PostMapping("/info/{consignmentId}") 43 @PostMapping("/info/{consignmentId}")
42 @ApiOperation(value = "ResponseVo", notes = "运单详细信息查询") 44 @ApiOperation(value = "ResponseVo", notes = "运单详细信息查询")
45 + @OperationMethodLog(describe = "business_log_20004")
43 public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) { 46 public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
44 /** 47 /**
45 * 运单id非空校验 48 * 运单id非空校验
......
1 package com.fedex.connect.customer.controller.biz.impl; 1 package com.fedex.connect.customer.controller.biz.impl;
2 2
3 +import com.fedex.connect.common.dependencies.annotation.OperationMethodLog;
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
5 import com.fedex.connect.customer.controller.base.BaseController; 6 import com.fedex.connect.customer.controller.base.BaseController;
...@@ -28,6 +29,7 @@ public class UploadRecordController extends BaseController implements IUploadRec ...@@ -28,6 +29,7 @@ public class UploadRecordController extends BaseController implements IUploadRec
28 @Override 29 @Override
29 @PostMapping("/queryHistoryList/{consignmentId}") 30 @PostMapping("/queryHistoryList/{consignmentId}")
30 @ApiOperation(value = "ResponseVo", notes = "运单历史上传记录查询") 31 @ApiOperation(value = "ResponseVo", notes = "运单历史上传记录查询")
32 + @OperationMethodLog(describe = "business_log_20006")
31 public ResponseVo queryHistoryList(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) { 33 public ResponseVo queryHistoryList(@ApiParam(value="运单ID",required = true) @PathVariable(value = "consignmentId") Long consignmentId) {
32 /** 34 /**
33 * 运单id非空校验 35 * 运单id非空校验
......
...@@ -3,6 +3,7 @@ package com.fedex.connect.customer.service.biz; ...@@ -3,6 +3,7 @@ package com.fedex.connect.customer.service.biz;
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 import com.fedex.connect.common.model.sys.User; 4 import com.fedex.connect.common.model.sys.User;
5 import com.fedex.connect.customer.data.bo.ConsignmentBo; 5 import com.fedex.connect.customer.data.bo.ConsignmentBo;
6 +import org.springframework.web.multipart.MultipartFile;
6 7
7 public interface IConsignmentService { 8 public interface IConsignmentService {
8 9
...@@ -15,4 +16,15 @@ public interface IConsignmentService { ...@@ -15,4 +16,15 @@ public interface IConsignmentService {
15 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo 16 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
16 */ 17 */
17 ResponseVo add(ConsignmentBo bo, User user); 18 ResponseVo add(ConsignmentBo bo, User user);
19 +
20 + /**
21 + * @Author mt
22 + * @Description 运单提交
23 + * @Date 2024/11/12
24 + * @param files
25 + * @param consignmentBo
26 + * @param user
27 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
28 + */
29 + ResponseVo submitConsignment(MultipartFile[] files, ConsignmentBo consignmentBo, User user);
18 } 30 }
......
...@@ -58,6 +58,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -58,6 +58,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
58 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo 58 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
59 */ 59 */
60 public ResponseVo submitConsignment(MultipartFile[] files,ConsignmentBo consignmentBo,User user){ 60 public ResponseVo submitConsignment(MultipartFile[] files,ConsignmentBo consignmentBo,User user){
61 +
61 return null; 62 return null;
62 } 63 }
63 } 64 }
......
1 #******************系统操作日志记录，中文展示****************** 1 #******************系统操作日志记录，中文展示******************
2 business_log_20001=添加运单 2 business_log_20001=添加运单
3 business_log_20002=提交运单 3 business_log_20002=提交运单
4 +business_log_20003=运单查询
5 +business_log_20004=运单详细信息查询
6 +business_log_20005=根据运单ID查询用户上传记录
7 +business_log_20006=运单历史上传记录查询
4 system_exception_20003=提示信息过长，未保存成功 8 system_exception_20003=提示信息过长，未保存成功
5 9
6 #******************鉴权相关提示，需要做国际化****************** 10 #******************鉴权相关提示，需要做国际化******************
......
1 #******************系统操作日志记录，中文展示****************** 1 #******************系统操作日志记录，中文展示******************
2 -business_exception_20001=添加运单 2 +business_log_20001=添加运单
3 -business_exception_20002=提交运单 3 +business_log_20002=提交运单
4 +business_log_20003=运单查询
5 +business_log_20004=运单详细信息查询
6 +business_log_20005=根据运单ID查询用户上传记录
7 +business_log_20006=运单历史上传记录查询
4 system_exception_20003=提示信息过长，未保存成功 8 system_exception_20003=提示信息过长，未保存成功
5 9
6 #******************鉴权相关提示，需要做国际化****************** 10 #******************鉴权相关提示，需要做国际化******************
......