Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
efe3cf43 1 parent 3808484e

biz-customer | 修改 | 运单提交 

mt
2024年11月19日14:54:33
Inline Side-by-side
Showing 19 changed files with 280 additions and 120 deletions
...@@ -14,6 +14,9 @@ mkdir $base_dir/${pName} ...@@ -14,6 +14,9 @@ mkdir $base_dir/${pName}
14 rm -f $base_dir/${pName}/*.war 14 rm -f $base_dir/${pName}/*.war
15 echo '######## 清除历史war包' 15 echo '######## 清除历史war包'
16 16
17 +cd $base_dir/${server}/base-starter
18 +mvn clean install -Dmaven.test.skip=true
19 +
17 cd $base_dir/${server}/common-dao 20 cd $base_dir/${server}/common-dao
18 mvn clean install -Dmaven.test.skip=true 21 mvn clean install -Dmaven.test.skip=true
19 22
...@@ -53,7 +56,7 @@ tarName=${moduleName}-${version}_${profile}.war ...@@ -53,7 +56,7 @@ tarName=${moduleName}-${version}_${profile}.war
53 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName} 56 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName}
54 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName} 57 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName}
55 58
56 -moduleName='manager-server' 59 +moduleName='task-schedule'
57 sVersion='1.0.0' 60 sVersion='1.0.0'
58 version='1.0.0' 61 version='1.0.0'
59 echo '######## 打包模块: '${moduleName} 62 echo '######## 打包模块: '${moduleName}
......
...@@ -47,7 +47,7 @@ public class ConsignmentController extends BaseController implements IConsignmen ...@@ -47,7 +47,7 @@ public class ConsignmentController extends BaseController implements IConsignmen
47 */ 47 */
48 ConsignmentBo consignmentBo = JSONObject.parseObject(consignmentJson,ConsignmentBo.class); 48 ConsignmentBo consignmentBo = JSONObject.parseObject(consignmentJson,ConsignmentBo.class);
49 /** 49 /**
50 - * 运单字段非空校验 50 + * 运单字段校验
51 */ 51 */
52 consignmentValidate.validateConsignmentSubmit(consignmentBo); 52 consignmentValidate.validateConsignmentSubmit(consignmentBo);
53 /** 53 /**
......
...@@ -31,6 +31,9 @@ public enum ResponseCode { ...@@ -31,6 +31,9 @@ public enum ResponseCode {
31 MESSAGE_CODE_30011(30011,"business_exception_30011"), 31 MESSAGE_CODE_30011(30011,"business_exception_30011"),
32 MESSAGE_CODE_30012(30012,"business_exception_30012"), 32 MESSAGE_CODE_30012(30012,"business_exception_30012"),
33 MESSAGE_CODE_30013(30013,"business_exception_30013"), 33 MESSAGE_CODE_30013(30013,"business_exception_30013"),
34 + MESSAGE_CODE_30014(30014,"business_exception_30014"),
35 + MESSAGE_CODE_30015(30015,"business_success_30015"),
36 +
34 37
35 /******打个样，编写样例*****/ 38 /******打个样，编写样例*****/
36 // MESSAGE_CODE_30001(30001,"business_exception_30001"), 39 // MESSAGE_CODE_30001(30001,"business_exception_30001"),
......
...@@ -19,4 +19,8 @@ public interface IConsignmentRepository { ...@@ -19,4 +19,8 @@ public interface IConsignmentRepository {
19 Consignment findByConsignmentCode(String consignmentCode,LocalDate dateParam); 19 Consignment findByConsignmentCode(String consignmentCode,LocalDate dateParam);
20 20
21 Consignment findConsignmentInfo(UserConsignmentInfoQuery consignmentInfoQuery); 21 Consignment findConsignmentInfo(UserConsignmentInfoQuery consignmentInfoQuery);
22 +
23 + Consignment save(Consignment entity);
24 +
25 + void saveAll(List<Consignment> list);
22 } 26 }
......
...@@ -62,4 +62,27 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe ...@@ -62,4 +62,27 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe
62 public Consignment findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){ 62 public Consignment findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
63 return consignmentExtMapper.findConsignmentInfo(userConsignmentInfoQuery); 63 return consignmentExtMapper.findConsignmentInfo(userConsignmentInfoQuery);
64 } 64 }
65 +
66 + @Override
67 + public Consignment save(Consignment entity) {
68 + if(entity != null) {
69 + if (entity.getId() == null || entity.getId().longValue() <= 0) {
70 + consignmentMapper.insertSelective(entity);
71 + } else if (entity.getId() != null && entity.getId().longValue() > 0){
72 + consignmentMapper.updateByPrimaryKeySelective(entity);
73 + }
74 + }
75 + return entity;
76 + }
77 +
78 + @Override
79 + public void saveAll(List<Consignment> list) {
80 + list.stream().forEach(p->{
81 + if(p.getId() == null || p.getId().longValue() <=0){
82 + consignmentMapper.insertSelective(p);
83 + }else if(p.getId() != null && p.getId().longValue() >0){
84 + consignmentMapper.updateByPrimaryKeySelective(p);
85 + }
86 + });
87 + }
65 } 88 }
......
1 package com.fedex.connect.customer.service.biz.impl; 1 package com.fedex.connect.customer.service.biz.impl;
2 2
3 +import com.fedex.connect.common.dependencies.contants.BaseSeparatorConstants;
4 +import com.fedex.connect.common.dependencies.util.DateUtil;
3 import com.fedex.connect.common.model.biz.Attachment; 5 import com.fedex.connect.common.model.biz.Attachment;
4 import com.fedex.connect.common.model.sys.User; 6 import com.fedex.connect.common.model.sys.User;
5 import com.fedex.connect.customer.service.base.BaseService; 7 import com.fedex.connect.customer.service.base.BaseService;
...@@ -10,6 +12,7 @@ import org.springframework.stereotype.Service; ...@@ -10,6 +12,7 @@ import org.springframework.stereotype.Service;
10 import org.springframework.web.multipart.MultipartFile; 12 import org.springframework.web.multipart.MultipartFile;
11 13
12 import java.util.ArrayList; 14 import java.util.ArrayList;
15 +import java.util.Date;
13 import java.util.List; 16 import java.util.List;
14 17
15 /** 18 /**
...@@ -49,11 +52,14 @@ public class AttachmentServiceImpl extends BaseService implements IAttachmentSer ...@@ -49,11 +52,14 @@ public class AttachmentServiceImpl extends BaseService implements IAttachmentSer
49 User user, 52 User user,
50 String consignmentCode){ 53 String consignmentCode){
51 List<Attachment> attachmentList = new ArrayList<>(); 54 List<Attachment> attachmentList = new ArrayList<>();
55 + String yyyyMMddHHmmss = DateUtil.yyyyMMddHHmmss(new Date());
52 try { 56 try {
53 for (int i = 0; i < files.length; i++) { 57 for (int i = 0; i < files.length; i++) {
54 MultipartFile file = files[i]; 58 MultipartFile file = files[i];
55 String bizType = attachmentBizTypeList.get(i); 59 String bizType = attachmentBizTypeList.get(i);
56 - Attachment attachment = attachmentUtil.uploadFile(file, bizType, user, consignmentCode, (i + 1)); 60 + //构造文件后缀
61 + String fileSuffix = yyyyMMddHHmmss + BaseSeparatorConstants.SEPARATOR_UNDERLINE + String.format("%03d",(i + 1));
62 + Attachment attachment = attachmentUtil.uploadFile(file, bizType, user, consignmentCode, fileSuffix);
57 attachmentList.add(attachment); 63 attachmentList.add(attachment);
58 } 64 }
59 }catch(Exception ex){ 65 }catch(Exception ex){
......
...@@ -4,13 +4,16 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo; ...@@ -4,13 +4,16 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 import com.fedex.connect.common.dependencies.util.ResponseUtils; 4 import com.fedex.connect.common.dependencies.util.ResponseUtils;
5 import com.fedex.connect.common.model.biz.Attachment; 5 import com.fedex.connect.common.model.biz.Attachment;
6 import com.fedex.connect.common.model.biz.Consignment; 6 import com.fedex.connect.common.model.biz.Consignment;
7 +import com.fedex.connect.common.model.biz.UploadRecord;
7 import com.fedex.connect.common.model.sys.User; 8 import com.fedex.connect.common.model.sys.User;
8 import com.fedex.connect.customer.data.bo.AddBo; 9 import com.fedex.connect.customer.data.bo.AddBo;
9 import com.fedex.connect.customer.data.bo.ConsignmentBo; 10 import com.fedex.connect.customer.data.bo.ConsignmentBo;
11 +import com.fedex.connect.customer.enums.ResponseCode;
10 import com.fedex.connect.customer.service.base.BaseService; 12 import com.fedex.connect.customer.service.base.BaseService;
11 import com.fedex.connect.customer.service.biz.IAttachmentService; 13 import com.fedex.connect.customer.service.biz.IAttachmentService;
12 import com.fedex.connect.customer.service.biz.IConsignmentService; 14 import com.fedex.connect.customer.service.biz.IConsignmentService;
13 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil; 15 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
16 +import com.fedex.connect.customer.util.service.biz.UploadRecordUtil;
14 import org.apache.commons.lang3.StringUtils; 17 import org.apache.commons.lang3.StringUtils;
15 import org.springframework.beans.factory.annotation.Autowired; 18 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.stereotype.Service; 19 import org.springframework.stereotype.Service;
...@@ -27,10 +30,11 @@ import java.util.Objects; ...@@ -27,10 +30,11 @@ import java.util.Objects;
27 */ 30 */
28 @Service 31 @Service
29 public class ConsignmentServiceImpl extends BaseService implements IConsignmentService { 32 public class ConsignmentServiceImpl extends BaseService implements IConsignmentService {
30 -
31 @Autowired 33 @Autowired
32 private ConsignmentUtil consignmentUtil; 34 private ConsignmentUtil consignmentUtil;
33 @Autowired 35 @Autowired
36 + private UploadRecordUtil uploadRecordUtil;
37 + @Autowired
34 private IAttachmentService attachmentService; 38 private IAttachmentService attachmentService;
35 39
36 /** 40 /**
...@@ -98,8 +102,19 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -98,8 +102,19 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
98 consignmentBo.getAttachmentBizTypeList(), 102 consignmentBo.getAttachmentBizTypeList(),
99 user, 103 user,
100 consignmentBo.getConsignmentCode()); 104 consignmentBo.getConsignmentCode());
105 + /**
106 + * 初始化运单信息
107 + */
108 + Consignment consignment = consignmentUtil.initConsignment(consignmentBo,user);
109 + /**
110 + * 初始化上传记录信息
111 + */
112 +// UploadRecord uploadRecord = uploadRecordUtil.initUploadRecord(consignment.getConsignmentCode());
113 +
114 + return responseUtils.success(ResponseCode.MESSAGE_CODE_30015);
115 + }
101 116
117 + private void saveSubmitInfo(List<Attachment> attachmentList,Consignment consignment,UploadRecord uploadRecord){
102 118
103 - return null;
104 } 119 }
105 } 120 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,7 +21,6 @@ import org.springframework.stereotype.Component; ...@@ -21,7 +21,6 @@ import org.springframework.stereotype.Component;
21 import org.springframework.web.multipart.MultipartFile; 21 import org.springframework.web.multipart.MultipartFile;
22 22
23 import java.io.File; 23 import java.io.File;
24 -import java.io.IOException;
25 import java.util.Date; 24 import java.util.Date;
26 import java.util.List; 25 import java.util.List;
27 import java.util.Objects; 26 import java.util.Objects;
...@@ -98,19 +97,19 @@ public class AttachmentUtil { ...@@ -98,19 +97,19 @@ public class AttachmentUtil {
98 * @param user 97 * @param user
99 * @return com.fedex.connect.common.model.biz.Attachment 98 * @return com.fedex.connect.common.model.biz.Attachment
100 */ 99 */
101 - public Attachment uploadFile(MultipartFile file,String bizType, User user,String consignmentCode,int index){ 100 + public Attachment uploadFile(MultipartFile file,String bizType, User user,String consignmentCode,String fileSuffix){
102 Attachment attachment = new Attachment(); 101 Attachment attachment = new Attachment();
103 //用户上传文件名称，文件名去除前后空格 102 //用户上传文件名称，文件名去除前后空格
104 String sourceFileName = file.getOriginalFilename().trim(); 103 String sourceFileName = file.getOriginalFilename().trim();
104 + //文件后缀
105 + String suffix = sourceFileName.substring(sourceFileName.lastIndexOf(BaseSeparatorConstants.SEPARATOR_POINT));
105 String filePathName = null; 106 String filePathName = null;
106 try{ 107 try{
107 //用户上传原文件名称 108 //用户上传原文件名称
108 attachment.setSourceFileName(sourceFileName); 109 attachment.setSourceFileName(sourceFileName);
109 //生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf 110 //生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf
110 String fileName = AttachmentBizTypeEnum.valueOf(bizType).getExt1() + BaseSeparatorConstants.SEPARATOR_UNDERLINE + 111 String fileName = AttachmentBizTypeEnum.valueOf(bizType).getExt1() + BaseSeparatorConstants.SEPARATOR_UNDERLINE +
111 - consignmentCode + BaseSeparatorConstants.SEPARATOR_UNDERLINE + 112 + consignmentCode + BaseSeparatorConstants.SEPARATOR_UNDERLINE + fileSuffix + suffix;
112 - DateUtil.yyyyMMddHHmmss(new Date()) + BaseSeparatorConstants.SEPARATOR_UNDERLINE +
113 - String.format("%03d",(index + 1));
114 //系统生成文件名称 113 //系统生成文件名称
115 attachment.setFileName(fileName); 114 attachment.setFileName(fileName);
116 //文件存放目录格式：xxxxx/2024-11-15/123456789012 115 //文件存放目录格式：xxxxx/2024-11-15/123456789012
......
1 package com.fedex.connect.customer.util.service.biz; 1 package com.fedex.connect.customer.util.service.biz;
2 2
3 +import com.fedex.connect.common.dependencies.cache.CacheSystem;
3 import com.fedex.connect.common.dependencies.contants.DigitConstants; 4 import com.fedex.connect.common.dependencies.contants.DigitConstants;
4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 5 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
6 +import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
5 import com.fedex.connect.common.dependencies.util.ResponseUtils; 7 import com.fedex.connect.common.dependencies.util.ResponseUtils;
8 +import com.fedex.connect.common.model.bi.DictionaryEntries;
6 import com.fedex.connect.common.model.biz.Consignment; 9 import com.fedex.connect.common.model.biz.Consignment;
7 import com.fedex.connect.common.model.sys.User; 10 import com.fedex.connect.common.model.sys.User;
8 import com.fedex.connect.customer.data.bo.AddBo; 11 import com.fedex.connect.customer.data.bo.AddBo;
...@@ -10,10 +13,12 @@ import com.fedex.connect.customer.data.bo.ConsignmentBo; ...@@ -10,10 +13,12 @@ import com.fedex.connect.customer.data.bo.ConsignmentBo;
10 import com.fedex.connect.customer.data.dto.ConsignmentAddDto; 13 import com.fedex.connect.customer.data.dto.ConsignmentAddDto;
11 import com.fedex.connect.customer.enums.ResponseCode; 14 import com.fedex.connect.customer.enums.ResponseCode;
12 import com.fedex.connect.customer.repository.repo.IConsignmentRepository; 15 import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
16 +import org.springframework.beans.BeanUtils;
13 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Component; 18 import org.springframework.stereotype.Component;
15 import org.springframework.util.StringUtils; 19 import org.springframework.util.StringUtils;
16 20
21 +import java.util.Date;
17 import java.util.Objects; 22 import java.util.Objects;
18 23
19 /** 24 /**
...@@ -24,6 +29,8 @@ import java.util.Objects; ...@@ -24,6 +29,8 @@ import java.util.Objects;
24 @Component 29 @Component
25 public class ConsignmentUtil { 30 public class ConsignmentUtil {
26 @Autowired 31 @Autowired
32 + CacheSystem cacheSystem;
33 + @Autowired
27 ResponseUtils responseUtils; 34 ResponseUtils responseUtils;
28 @Autowired 35 @Autowired
29 IConsignmentRepository consignmentRepository; 36 IConsignmentRepository consignmentRepository;
...@@ -129,7 +136,42 @@ public class ConsignmentUtil { ...@@ -129,7 +136,42 @@ public class ConsignmentUtil {
129 */ 136 */
130 public Consignment initConsignment(ConsignmentBo consignmentBo, User user){ 137 public Consignment initConsignment(ConsignmentBo consignmentBo, User user){
131 Consignment consignment = consignmentRepository.findById(consignmentBo.getConsignmentId()); 138 Consignment consignment = consignmentRepository.findById(consignmentBo.getConsignmentId());
132 - 139 + DictionaryEntries consignmentStatusDic = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
140 + try {
141 + Date nowDate = new Date();
142 + //如果没有运单id，则是通过add添加进来的运单
143 + if (Objects.isNull(consignment)) {
144 + consignment = new Consignment();
145 + //用户录入数据拷贝
146 + BeanUtils.copyProperties(consignmentBo, consignment);
147 + //用户录入shipperaccount
148 + consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
149 + //始发国名称
150 + consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
151 + //始发国编码
152 + consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
153 + /******提交信息记录******/
154 + consignment.setFirstSubmitTime(nowDate);
155 + consignment.setFirstSubmitter(user.getUserName());
156 + consignment.setFirstSubmitterId(user.getId());
157 + consignment.setCreateTime(nowDate);
158 + consignment.setCreateUserName(user.getUserName());
159 + consignment.setCreateUserId(user.getId());
160 + } else {
161 + consignment.setModifyTime(nowDate);
162 + consignment.setModifyUserName(user.getUserName());
163 + consignment.setModifyUserId(user.getId());
164 + }
165 + //记录当前提交人信息
166 + consignment.setSubmitTime(nowDate);
167 + consignment.setSubmitter(user.getUserName());
168 + consignment.setSubmitterId(user.getId());
169 + //记录当前提交运单状态
170 + consignment.setStatusCode(consignmentStatusDic.getCode());
171 + consignment.setStatusName(consignmentStatusDic.getDescription());
172 + }catch(Exception ex){
173 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30014,ex);
174 + }
133 return consignment; 175 return consignment;
134 } 176 }
135 } 177 }
......
1 +package com.fedex.connect.customer.util.service.biz;
2 +
3 +
4 +import com.fedex.connect.common.dependencies.cache.CacheSystem;
5 +import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
6 +import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
7 +import com.fedex.connect.common.model.bi.DictionaryEntries;
8 +import com.fedex.connect.common.model.biz.UploadRecord;
9 +import lombok.extern.slf4j.Slf4j;
10 +import org.springframework.beans.factory.annotation.Autowired;
11 +import org.springframework.stereotype.Component;
12 +
13 +/**
14 + * @Author mt
15 + * @Description 上传记录相关util
16 + * @Date 2024/11/19
17 + */
18 +@Slf4j
19 +@Component
20 +public class UploadRecordUtil {
21 + @Autowired
22 + CacheSystem cacheSystem;
23 +
24 + /**
25 + * @Author mt
26 + * @Description 初始化上传记录实体 ，除ID与运单ID以外参数
27 + * @Date 2024/11/19
28 + * @param consignmentCode
29 + * @return com.fedex.connect.common.model.biz.UploadRecord
30 + */
31 + public UploadRecord initUploadRecord(String consignmentCode) throws Exception{
32 + DictionaryEntries consignmentStatusDic = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
33 + UploadRecord uploadRecord = new UploadRecord();
34 + //记录当前运单号
35 + uploadRecord.setConsignmentCode(consignmentCode);
36 + //记录当前运单状态
37 + uploadRecord.setStatusCode(consignmentStatusDic.getCode());
38 + uploadRecord.setStatusName(consignmentStatusDic.getDescription());
39 + /**
40 + * 初始化基础字段
41 + */
42 + AssignmentFieldUtils.assignmentTableBaseField(uploadRecord);
43 + return uploadRecord;
44 + }
45 +}
...@@ -8,6 +8,8 @@ import com.fedex.connect.customer.enums.ResponseCode; ...@@ -8,6 +8,8 @@ import com.fedex.connect.customer.enums.ResponseCode;
8 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.stereotype.Component; 9 import org.springframework.stereotype.Component;
10 10
11 +import java.util.Objects;
12 +
11 /** 13 /**
12 * @Author Szl 14 * @Author Szl
13 * @Description 类说明 运单校验类 15 * @Description 类说明 运单校验类
...@@ -42,9 +44,12 @@ public class ConsignmentValidate { ...@@ -42,9 +44,12 @@ public class ConsignmentValidate {
42 * @return void 44 * @return void
43 */ 45 */
44 public void validateConsignmentSubmit(ConsignmentBo consignmentBo){ 46 public void validateConsignmentSubmit(ConsignmentBo consignmentBo){
45 - /** 47 + //运单ID为空，则需要判断其他字段不能为空
46 - * 非空字段校验 48 + if(Objects.isNull(consignmentBo.getConsignmentId())){
47 - */ 49 + /**
48 - baseValidateUtils.notBlankValidate(consignmentBo,ResponseCode.MESSAGE_CODE_30001); 50 + * 非空字段校验
51 + */
52 + baseValidateUtils.notBlankValidate(consignmentBo,ResponseCode.MESSAGE_CODE_30001);
53 + }
49 } 54 }
50 } 55 }
......
...@@ -40,4 +40,6 @@ business_exception_30009=运单或发票未上传 ...@@ -40,4 +40,6 @@ business_exception_30009=运单或发票未上传
40 business_exception_30010=文件类型不在：运单、发票、箱单、其他 40 business_exception_30010=文件类型不在：运单、发票、箱单、其他
41 business_exception_30011=该运单已被其他人创建，不可以重复创建 41 business_exception_30011=该运单已被其他人创建，不可以重复创建
42 business_exception_30012=UUID不一致 42 business_exception_30012=UUID不一致
43 -business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
...\ No newline at end of file ...\ No newline at end of file
43 +business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
44 +business_exception_30014=运单信息加载失败，请稍后重试
45 +business_success_30015=提交成功
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -40,4 +40,6 @@ business_exception_30009=运单或发票未上传 ...@@ -40,4 +40,6 @@ business_exception_30009=运单或发票未上传
40 business_exception_30010=文件类型不在：运单、发票、箱单、其他 40 business_exception_30010=文件类型不在：运单、发票、箱单、其他
41 business_exception_30011=该运单已被其他人创建，不可以重复创建 41 business_exception_30011=该运单已被其他人创建，不可以重复创建
42 business_exception_30012=UUID不一致 42 business_exception_30012=UUID不一致
43 -business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
...\ No newline at end of file ...\ No newline at end of file
43 +business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
44 +business_exception_30014=运单信息加载失败，请稍后重试
45 +business_success_30015=提交成功
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
28 <result column="RECIPIENT_ADDR_LINE2" jdbcType="VARCHAR" property="recipientAddrLine2" /> 28 <result column="RECIPIENT_ADDR_LINE2" jdbcType="VARCHAR" property="recipientAddrLine2" />
29 <result column="RECIPIENT_ADDR_LINE3" jdbcType="VARCHAR" property="recipientAddrLine3" /> 29 <result column="RECIPIENT_ADDR_LINE3" jdbcType="VARCHAR" property="recipientAddrLine3" />
30 <result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" /> 30 <result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
31 - <result column="FIRST_COMMIT_TIME" jdbcType="TIMESTAMP" property="firstCommitTime" /> 31 + <result column="FIRST_SUBMIT_TIME" jdbcType="TIMESTAMP" property="firstSubmitTime" />
32 <result column="FIRST_SUBMITTER_ID" jdbcType="NUMERIC" property="firstSubmitterId" /> 32 <result column="FIRST_SUBMITTER_ID" jdbcType="NUMERIC" property="firstSubmitterId" />
33 <result column="FIRST_SUBMITTER" jdbcType="VARCHAR" property="firstSubmitter" /> 33 <result column="FIRST_SUBMITTER" jdbcType="VARCHAR" property="firstSubmitter" />
34 - <result column="COMMIT_TIME" jdbcType="TIMESTAMP" property="commitTime" /> 34 + <result column="SUBMIT_TIME" jdbcType="TIMESTAMP" property="submitTime" />
35 <result column="SUBMITTER_ID" jdbcType="NUMERIC" property="submitterId" /> 35 <result column="SUBMITTER_ID" jdbcType="NUMERIC" property="submitterId" />
36 <result column="SUBMITTER" jdbcType="VARCHAR" property="submitter" /> 36 <result column="SUBMITTER" jdbcType="VARCHAR" property="submitter" />
37 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" /> 37 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, 119 SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2,
120 SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 120 SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY,
121 RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, 121 RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY,
122 - FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID, 122 + FIRST_SUBMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, SUBMIT_TIME, SUBMITTER_ID,
123 SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 123 SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
124 MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG, 124 MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG,
125 USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, USER_INPUT_ORIGIN_COUNTRY, 125 USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, USER_INPUT_ORIGIN_COUNTRY,
...@@ -172,8 +172,8 @@ ...@@ -172,8 +172,8 @@
172 SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 172 SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME,
173 RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, 173 RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1,
174 RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 174 RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3,
175 - RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, 175 + RECIPIENT_CITY, FIRST_SUBMIT_TIME, FIRST_SUBMITTER_ID,
176 - FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID, 176 + FIRST_SUBMITTER, SUBMIT_TIME, SUBMITTER_ID,
177 SUBMITTER, CREATE_TIME, CREATE_USER_ID, 177 SUBMITTER, CREATE_TIME, CREATE_USER_ID,
178 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 178 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
179 MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, 179 MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE,
...@@ -191,8 +191,8 @@ ...@@ -191,8 +191,8 @@
191 #{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, 191 #{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR},
192 #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR}, 192 #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR},
193 #{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR}, 193 #{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR},
194 - #{recipientCity,jdbcType=VARCHAR}, #{firstCommitTime,jdbcType=TIMESTAMP}, #{firstSubmitterId,jdbcType=NUMERIC}, 194 + #{recipientCity,jdbcType=VARCHAR}, #{firstSubmitTime,jdbcType=TIMESTAMP}, #{firstSubmitterId,jdbcType=NUMERIC},
195 - #{firstSubmitter,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{submitterId,jdbcType=NUMERIC}, 195 + #{firstSubmitter,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{submitterId,jdbcType=NUMERIC},
196 #{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 196 #{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
197 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 197 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
198 #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, #{recipientPostalCode,jdbcType=VARCHAR}, 198 #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, #{recipientPostalCode,jdbcType=VARCHAR},
...@@ -284,8 +284,8 @@ ...@@ -284,8 +284,8 @@
284 <if test="recipientCity != null"> 284 <if test="recipientCity != null">
285 RECIPIENT_CITY, 285 RECIPIENT_CITY,
286 </if> 286 </if>
287 - <if test="firstCommitTime != null"> 287 + <if test="firstSubmitTime != null">
288 - FIRST_COMMIT_TIME, 288 + FIRST_SUBMIT_TIME,
289 </if> 289 </if>
290 <if test="firstSubmitterId != null"> 290 <if test="firstSubmitterId != null">
291 FIRST_SUBMITTER_ID, 291 FIRST_SUBMITTER_ID,
...@@ -293,8 +293,8 @@ ...@@ -293,8 +293,8 @@
293 <if test="firstSubmitter != null"> 293 <if test="firstSubmitter != null">
294 FIRST_SUBMITTER, 294 FIRST_SUBMITTER,
295 </if> 295 </if>
296 - <if test="commitTime != null"> 296 + <if test="submitTime != null">
297 - COMMIT_TIME, 297 + SUBMIT_TIME,
298 </if> 298 </if>
299 <if test="submitterId != null"> 299 <if test="submitterId != null">
300 SUBMITTER_ID, 300 SUBMITTER_ID,
...@@ -440,8 +440,8 @@ ...@@ -440,8 +440,8 @@
440 <if test="recipientCity != null"> 440 <if test="recipientCity != null">
441 #{recipientCity,jdbcType=VARCHAR}, 441 #{recipientCity,jdbcType=VARCHAR},
442 </if> 442 </if>
443 - <if test="firstCommitTime != null"> 443 + <if test="firstSubmitTime != null">
444 - #{firstCommitTime,jdbcType=TIMESTAMP}, 444 + #{firstSubmitTime,jdbcType=TIMESTAMP},
445 </if> 445 </if>
446 <if test="firstSubmitterId != null"> 446 <if test="firstSubmitterId != null">
447 #{firstSubmitterId,jdbcType=NUMERIC}, 447 #{firstSubmitterId,jdbcType=NUMERIC},
...@@ -449,8 +449,8 @@ ...@@ -449,8 +449,8 @@
449 <if test="firstSubmitter != null"> 449 <if test="firstSubmitter != null">
450 #{firstSubmitter,jdbcType=VARCHAR}, 450 #{firstSubmitter,jdbcType=VARCHAR},
451 </if> 451 </if>
452 - <if test="commitTime != null"> 452 + <if test="submitTime != null">
453 - #{commitTime,jdbcType=TIMESTAMP}, 453 + #{submitTime,jdbcType=TIMESTAMP},
454 </if> 454 </if>
455 <if test="submitterId != null"> 455 <if test="submitterId != null">
456 #{submitterId,jdbcType=NUMERIC}, 456 #{submitterId,jdbcType=NUMERIC},
...@@ -607,8 +607,8 @@ ...@@ -607,8 +607,8 @@
607 <if test="record.recipientCity != null"> 607 <if test="record.recipientCity != null">
608 RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR}, 608 RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
609 </if> 609 </if>
610 - <if test="record.firstCommitTime != null"> 610 + <if test="record.firstSubmitTime != null">
611 - FIRST_COMMIT_TIME = #{record.firstCommitTime,jdbcType=TIMESTAMP}, 611 + FIRST_SUBMIT_TIME = #{record.firstSubmitTime,jdbcType=TIMESTAMP},
612 </if> 612 </if>
613 <if test="record.firstSubmitterId != null"> 613 <if test="record.firstSubmitterId != null">
614 FIRST_SUBMITTER_ID = #{record.firstSubmitterId,jdbcType=NUMERIC}, 614 FIRST_SUBMITTER_ID = #{record.firstSubmitterId,jdbcType=NUMERIC},
...@@ -616,8 +616,8 @@ ...@@ -616,8 +616,8 @@
616 <if test="record.firstSubmitter != null"> 616 <if test="record.firstSubmitter != null">
617 FIRST_SUBMITTER = #{record.firstSubmitter,jdbcType=VARCHAR}, 617 FIRST_SUBMITTER = #{record.firstSubmitter,jdbcType=VARCHAR},
618 </if> 618 </if>
619 - <if test="record.commitTime != null"> 619 + <if test="record.submitTime != null">
620 - COMMIT_TIME = #{record.commitTime,jdbcType=TIMESTAMP}, 620 + SUBMIT_TIME = #{record.submitTime,jdbcType=TIMESTAMP},
621 </if> 621 </if>
622 <if test="record.submitterId != null"> 622 <if test="record.submitterId != null">
623 SUBMITTER_ID = #{record.submitterId,jdbcType=NUMERIC}, 623 SUBMITTER_ID = #{record.submitterId,jdbcType=NUMERIC},
...@@ -718,10 +718,10 @@ ...@@ -718,10 +718,10 @@
718 RECIPIENT_ADDR_LINE2 = #{record.recipientAddrLine2,jdbcType=VARCHAR}, 718 RECIPIENT_ADDR_LINE2 = #{record.recipientAddrLine2,jdbcType=VARCHAR},
719 RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR}, 719 RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR},
720 RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR}, 720 RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
721 - FIRST_COMMIT_TIME = #{record.firstCommitTime,jdbcType=TIMESTAMP}, 721 + FIRST_SUBMIT_TIME = #{record.firstSubmitTime,jdbcType=TIMESTAMP},
722 FIRST_SUBMITTER_ID = #{record.firstSubmitterId,jdbcType=NUMERIC}, 722 FIRST_SUBMITTER_ID = #{record.firstSubmitterId,jdbcType=NUMERIC},
723 FIRST_SUBMITTER = #{record.firstSubmitter,jdbcType=VARCHAR}, 723 FIRST_SUBMITTER = #{record.firstSubmitter,jdbcType=VARCHAR},
724 - COMMIT_TIME = #{record.commitTime,jdbcType=TIMESTAMP}, 724 + SUBMIT_TIME = #{record.submitTime,jdbcType=TIMESTAMP},
725 SUBMITTER_ID = #{record.submitterId,jdbcType=NUMERIC}, 725 SUBMITTER_ID = #{record.submitterId,jdbcType=NUMERIC},
726 SUBMITTER = #{record.submitter,jdbcType=VARCHAR}, 726 SUBMITTER = #{record.submitter,jdbcType=VARCHAR},
727 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP}, 727 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
...@@ -826,8 +826,8 @@ ...@@ -826,8 +826,8 @@
826 <if test="recipientCity != null"> 826 <if test="recipientCity != null">
827 RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR}, 827 RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
828 </if> 828 </if>
829 - <if test="firstCommitTime != null"> 829 + <if test="firstSubmitTime != null">
830 - FIRST_COMMIT_TIME = #{firstCommitTime,jdbcType=TIMESTAMP}, 830 + FIRST_SUBMIT_TIME = #{firstSubmitTime,jdbcType=TIMESTAMP},
831 </if> 831 </if>
832 <if test="firstSubmitterId != null"> 832 <if test="firstSubmitterId != null">
833 FIRST_SUBMITTER_ID = #{firstSubmitterId,jdbcType=NUMERIC}, 833 FIRST_SUBMITTER_ID = #{firstSubmitterId,jdbcType=NUMERIC},
...@@ -835,8 +835,8 @@ ...@@ -835,8 +835,8 @@
835 <if test="firstSubmitter != null"> 835 <if test="firstSubmitter != null">
836 FIRST_SUBMITTER = #{firstSubmitter,jdbcType=VARCHAR}, 836 FIRST_SUBMITTER = #{firstSubmitter,jdbcType=VARCHAR},
837 </if> 837 </if>
838 - <if test="commitTime != null"> 838 + <if test="submitTime != null">
839 - COMMIT_TIME = #{commitTime,jdbcType=TIMESTAMP}, 839 + SUBMIT_TIME = #{submitTime,jdbcType=TIMESTAMP},
840 </if> 840 </if>
841 <if test="submitterId != null"> 841 <if test="submitterId != null">
842 SUBMITTER_ID = #{submitterId,jdbcType=NUMERIC}, 842 SUBMITTER_ID = #{submitterId,jdbcType=NUMERIC},
...@@ -934,10 +934,10 @@ ...@@ -934,10 +934,10 @@
934 RECIPIENT_ADDR_LINE2 = #{recipientAddrLine2,jdbcType=VARCHAR}, 934 RECIPIENT_ADDR_LINE2 = #{recipientAddrLine2,jdbcType=VARCHAR},
935 RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR}, 935 RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR},
936 RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR}, 936 RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
937 - FIRST_COMMIT_TIME = #{firstCommitTime,jdbcType=TIMESTAMP}, 937 + FIRST_SUBMIT_TIME = #{firstSubmitTime,jdbcType=TIMESTAMP},
938 FIRST_SUBMITTER_ID = #{firstSubmitterId,jdbcType=NUMERIC}, 938 FIRST_SUBMITTER_ID = #{firstSubmitterId,jdbcType=NUMERIC},
939 FIRST_SUBMITTER = #{firstSubmitter,jdbcType=VARCHAR}, 939 FIRST_SUBMITTER = #{firstSubmitter,jdbcType=VARCHAR},
940 - COMMIT_TIME = #{commitTime,jdbcType=TIMESTAMP}, 940 + SUBMIT_TIME = #{submitTime,jdbcType=TIMESTAMP},
941 SUBMITTER_ID = #{submitterId,jdbcType=NUMERIC}, 941 SUBMITTER_ID = #{submitterId,jdbcType=NUMERIC},
942 SUBMITTER = #{submitter,jdbcType=VARCHAR}, 942 SUBMITTER = #{submitter,jdbcType=VARCHAR},
943 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}, 943 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
......
...@@ -142,7 +142,7 @@ public class Consignment implements Serializable { ...@@ -142,7 +142,7 @@ public class Consignment implements Serializable {
142 /** 142 /**
143 * 首次提交时间 143 * 首次提交时间
144 */ 144 */
145 - private Date firstCommitTime; 145 + private Date firstSubmitTime;
146 146
147 /** 147 /**
148 * 首次提交人ID，关联用户表ID 148 * 首次提交人ID，关联用户表ID
...@@ -157,7 +157,7 @@ public class Consignment implements Serializable { ...@@ -157,7 +157,7 @@ public class Consignment implements Serializable {
157 /** 157 /**
158 * 提交时间 158 * 提交时间
159 */ 159 */
160 - private Date commitTime; 160 + private Date submitTime;
161 161
162 /** 162 /**
163 * 提交人ID，关联用户表ID 163 * 提交人ID，关联用户表ID
...@@ -482,12 +482,12 @@ public class Consignment implements Serializable { ...@@ -482,12 +482,12 @@ public class Consignment implements Serializable {
482 this.recipientCity = recipientCity == null ? null : recipientCity.trim(); 482 this.recipientCity = recipientCity == null ? null : recipientCity.trim();
483 } 483 }
484 484
485 - public Date getFirstCommitTime() { 485 + public Date getFirstSubmitTime() {
486 - return firstCommitTime; 486 + return firstSubmitTime;
487 } 487 }
488 488
489 - public void setFirstCommitTime(Date firstCommitTime) { 489 + public void setFirstSubmitTime(Date firstSubmitTime) {
490 - this.firstCommitTime = firstCommitTime; 490 + this.firstSubmitTime = firstSubmitTime;
491 } 491 }
492 492
493 public Long getFirstSubmitterId() { 493 public Long getFirstSubmitterId() {
...@@ -506,12 +506,12 @@ public class Consignment implements Serializable { ...@@ -506,12 +506,12 @@ public class Consignment implements Serializable {
506 this.firstSubmitter = firstSubmitter == null ? null : firstSubmitter.trim(); 506 this.firstSubmitter = firstSubmitter == null ? null : firstSubmitter.trim();
507 } 507 }
508 508
509 - public Date getCommitTime() { 509 + public Date getSubmitTime() {
510 - return commitTime; 510 + return submitTime;
511 } 511 }
512 512
513 - public void setCommitTime(Date commitTime) { 513 + public void setSubmitTime(Date submitTime) {
514 - this.commitTime = commitTime; 514 + this.submitTime = submitTime;
515 } 515 }
516 516
517 public Long getSubmitterId() { 517 public Long getSubmitterId() {
...@@ -722,10 +722,10 @@ public class Consignment implements Serializable { ...@@ -722,10 +722,10 @@ public class Consignment implements Serializable {
722 sb.append(", recipientAddrLine2=").append(recipientAddrLine2); 722 sb.append(", recipientAddrLine2=").append(recipientAddrLine2);
723 sb.append(", recipientAddrLine3=").append(recipientAddrLine3); 723 sb.append(", recipientAddrLine3=").append(recipientAddrLine3);
724 sb.append(", recipientCity=").append(recipientCity); 724 sb.append(", recipientCity=").append(recipientCity);
725 - sb.append(", firstCommitTime=").append(firstCommitTime); 725 + sb.append(", firstSubmitTime=").append(firstSubmitTime);
726 sb.append(", firstSubmitterId=").append(firstSubmitterId); 726 sb.append(", firstSubmitterId=").append(firstSubmitterId);
727 sb.append(", firstSubmitter=").append(firstSubmitter); 727 sb.append(", firstSubmitter=").append(firstSubmitter);
728 - sb.append(", commitTime=").append(commitTime); 728 + sb.append(", submitTime=").append(submitTime);
729 sb.append(", submitterId=").append(submitterId); 729 sb.append(", submitterId=").append(submitterId);
730 sb.append(", submitter=").append(submitter); 730 sb.append(", submitter=").append(submitter);
731 sb.append(", createTime=").append(createTime); 731 sb.append(", createTime=").append(createTime);
......
...@@ -1896,63 +1896,63 @@ public class ConsignmentExample { ...@@ -1896,63 +1896,63 @@ public class ConsignmentExample {
1896 return (Criteria) this; 1896 return (Criteria) this;
1897 } 1897 }
1898 1898
1899 - public Criteria andFirstCommitTimeIsNull() { 1899 + public Criteria andFirstSubmitTimeIsNull() {
1900 - addCriterion("FIRST_COMMIT_TIME is null"); 1900 + addCriterion("FIRST_SUBMIT_TIME is null");
1901 return (Criteria) this; 1901 return (Criteria) this;
1902 } 1902 }
1903 1903
1904 - public Criteria andFirstCommitTimeIsNotNull() { 1904 + public Criteria andFirstSubmitTimeIsNotNull() {
1905 - addCriterion("FIRST_COMMIT_TIME is not null"); 1905 + addCriterion("FIRST_SUBMIT_TIME is not null");
1906 return (Criteria) this; 1906 return (Criteria) this;
1907 } 1907 }
1908 1908
1909 - public Criteria andFirstCommitTimeEqualTo(Date value) { 1909 + public Criteria andFirstSubmitTimeEqualTo(Date value) {
1910 - addCriterion("FIRST_COMMIT_TIME =", value, "firstCommitTime"); 1910 + addCriterion("FIRST_SUBMIT_TIME =", value, "firstSubmitTime");
1911 return (Criteria) this; 1911 return (Criteria) this;
1912 } 1912 }
1913 1913
1914 - public Criteria andFirstCommitTimeNotEqualTo(Date value) { 1914 + public Criteria andFirstSubmitTimeNotEqualTo(Date value) {
1915 - addCriterion("FIRST_COMMIT_TIME <>", value, "firstCommitTime"); 1915 + addCriterion("FIRST_SUBMIT_TIME <>", value, "firstSubmitTime");
1916 return (Criteria) this; 1916 return (Criteria) this;
1917 } 1917 }
1918 1918
1919 - public Criteria andFirstCommitTimeGreaterThan(Date value) { 1919 + public Criteria andFirstSubmitTimeGreaterThan(Date value) {
1920 - addCriterion("FIRST_COMMIT_TIME >", value, "firstCommitTime"); 1920 + addCriterion("FIRST_SUBMIT_TIME >", value, "firstSubmitTime");
1921 return (Criteria) this; 1921 return (Criteria) this;
1922 } 1922 }
1923 1923
1924 - public Criteria andFirstCommitTimeGreaterThanOrEqualTo(Date value) { 1924 + public Criteria andFirstSubmitTimeGreaterThanOrEqualTo(Date value) {
1925 - addCriterion("FIRST_COMMIT_TIME >=", value, "firstCommitTime"); 1925 + addCriterion("FIRST_SUBMIT_TIME >=", value, "firstSubmitTime");
1926 return (Criteria) this; 1926 return (Criteria) this;
1927 } 1927 }
1928 1928
1929 - public Criteria andFirstCommitTimeLessThan(Date value) { 1929 + public Criteria andFirstSubmitTimeLessThan(Date value) {
1930 - addCriterion("FIRST_COMMIT_TIME <", value, "firstCommitTime"); 1930 + addCriterion("FIRST_SUBMIT_TIME <", value, "firstSubmitTime");
1931 return (Criteria) this; 1931 return (Criteria) this;
1932 } 1932 }
1933 1933
1934 - public Criteria andFirstCommitTimeLessThanOrEqualTo(Date value) { 1934 + public Criteria andFirstSubmitTimeLessThanOrEqualTo(Date value) {
1935 - addCriterion("FIRST_COMMIT_TIME <=", value, "firstCommitTime"); 1935 + addCriterion("FIRST_SUBMIT_TIME <=", value, "firstSubmitTime");
1936 return (Criteria) this; 1936 return (Criteria) this;
1937 } 1937 }
1938 1938
1939 - public Criteria andFirstCommitTimeIn(List<Date> values) { 1939 + public Criteria andFirstSubmitTimeIn(List<Date> values) {
1940 - addCriterion("FIRST_COMMIT_TIME in", values, "firstCommitTime"); 1940 + addCriterion("FIRST_SUBMIT_TIME in", values, "firstSubmitTime");
1941 return (Criteria) this; 1941 return (Criteria) this;
1942 } 1942 }
1943 1943
1944 - public Criteria andFirstCommitTimeNotIn(List<Date> values) { 1944 + public Criteria andFirstSubmitTimeNotIn(List<Date> values) {
1945 - addCriterion("FIRST_COMMIT_TIME not in", values, "firstCommitTime"); 1945 + addCriterion("FIRST_SUBMIT_TIME not in", values, "firstSubmitTime");
1946 return (Criteria) this; 1946 return (Criteria) this;
1947 } 1947 }
1948 1948
1949 - public Criteria andFirstCommitTimeBetween(Date value1, Date value2) { 1949 + public Criteria andFirstSubmitTimeBetween(Date value1, Date value2) {
1950 - addCriterion("FIRST_COMMIT_TIME between", value1, value2, "firstCommitTime"); 1950 + addCriterion("FIRST_SUBMIT_TIME between", value1, value2, "firstSubmitTime");
1951 return (Criteria) this; 1951 return (Criteria) this;
1952 } 1952 }
1953 1953
1954 - public Criteria andFirstCommitTimeNotBetween(Date value1, Date value2) { 1954 + public Criteria andFirstSubmitTimeNotBetween(Date value1, Date value2) {
1955 - addCriterion("FIRST_COMMIT_TIME not between", value1, value2, "firstCommitTime"); 1955 + addCriterion("FIRST_SUBMIT_TIME not between", value1, value2, "firstSubmitTime");
1956 return (Criteria) this; 1956 return (Criteria) this;
1957 } 1957 }
1958 1958
...@@ -2086,63 +2086,63 @@ public class ConsignmentExample { ...@@ -2086,63 +2086,63 @@ public class ConsignmentExample {
2086 return (Criteria) this; 2086 return (Criteria) this;
2087 } 2087 }
2088 2088
2089 - public Criteria andCommitTimeIsNull() { 2089 + public Criteria andSubmitTimeIsNull() {
2090 - addCriterion("COMMIT_TIME is null"); 2090 + addCriterion("SUBMIT_TIME is null");
2091 return (Criteria) this; 2091 return (Criteria) this;
2092 } 2092 }
2093 2093
2094 - public Criteria andCommitTimeIsNotNull() { 2094 + public Criteria andSubmitTimeIsNotNull() {
2095 - addCriterion("COMMIT_TIME is not null"); 2095 + addCriterion("SUBMIT_TIME is not null");
2096 return (Criteria) this; 2096 return (Criteria) this;
2097 } 2097 }
2098 2098
2099 - public Criteria andCommitTimeEqualTo(Date value) { 2099 + public Criteria andSubmitTimeEqualTo(Date value) {
2100 - addCriterion("COMMIT_TIME =", value, "commitTime"); 2100 + addCriterion("SUBMIT_TIME =", value, "submitTime");
2101 return (Criteria) this; 2101 return (Criteria) this;
2102 } 2102 }
2103 2103
2104 - public Criteria andCommitTimeNotEqualTo(Date value) { 2104 + public Criteria andSubmitTimeNotEqualTo(Date value) {
2105 - addCriterion("COMMIT_TIME <>", value, "commitTime"); 2105 + addCriterion("SUBMIT_TIME <>", value, "submitTime");
2106 return (Criteria) this; 2106 return (Criteria) this;
2107 } 2107 }
2108 2108
2109 - public Criteria andCommitTimeGreaterThan(Date value) { 2109 + public Criteria andSubmitTimeGreaterThan(Date value) {
2110 - addCriterion("COMMIT_TIME >", value, "commitTime"); 2110 + addCriterion("SUBMIT_TIME >", value, "submitTime");
2111 return (Criteria) this; 2111 return (Criteria) this;
2112 } 2112 }
2113 2113
2114 - public Criteria andCommitTimeGreaterThanOrEqualTo(Date value) { 2114 + public Criteria andSubmitTimeGreaterThanOrEqualTo(Date value) {
2115 - addCriterion("COMMIT_TIME >=", value, "commitTime"); 2115 + addCriterion("SUBMIT_TIME >=", value, "submitTime");
2116 return (Criteria) this; 2116 return (Criteria) this;
2117 } 2117 }
2118 2118
2119 - public Criteria andCommitTimeLessThan(Date value) { 2119 + public Criteria andSubmitTimeLessThan(Date value) {
2120 - addCriterion("COMMIT_TIME <", value, "commitTime"); 2120 + addCriterion("SUBMIT_TIME <", value, "submitTime");
2121 return (Criteria) this; 2121 return (Criteria) this;
2122 } 2122 }
2123 2123
2124 - public Criteria andCommitTimeLessThanOrEqualTo(Date value) { 2124 + public Criteria andSubmitTimeLessThanOrEqualTo(Date value) {
2125 - addCriterion("COMMIT_TIME <=", value, "commitTime"); 2125 + addCriterion("SUBMIT_TIME <=", value, "submitTime");
2126 return (Criteria) this; 2126 return (Criteria) this;
2127 } 2127 }
2128 2128
2129 - public Criteria andCommitTimeIn(List<Date> values) { 2129 + public Criteria andSubmitTimeIn(List<Date> values) {
2130 - addCriterion("COMMIT_TIME in", values, "commitTime"); 2130 + addCriterion("SUBMIT_TIME in", values, "submitTime");
2131 return (Criteria) this; 2131 return (Criteria) this;
2132 } 2132 }
2133 2133
2134 - public Criteria andCommitTimeNotIn(List<Date> values) { 2134 + public Criteria andSubmitTimeNotIn(List<Date> values) {
2135 - addCriterion("COMMIT_TIME not in", values, "commitTime"); 2135 + addCriterion("SUBMIT_TIME not in", values, "submitTime");
2136 return (Criteria) this; 2136 return (Criteria) this;
2137 } 2137 }
2138 2138
2139 - public Criteria andCommitTimeBetween(Date value1, Date value2) { 2139 + public Criteria andSubmitTimeBetween(Date value1, Date value2) {
2140 - addCriterion("COMMIT_TIME between", value1, value2, "commitTime"); 2140 + addCriterion("SUBMIT_TIME between", value1, value2, "submitTime");
2141 return (Criteria) this; 2141 return (Criteria) this;
2142 } 2142 }
2143 2143
2144 - public Criteria andCommitTimeNotBetween(Date value1, Date value2) { 2144 + public Criteria andSubmitTimeNotBetween(Date value1, Date value2) {
2145 - addCriterion("COMMIT_TIME not between", value1, value2, "commitTime"); 2145 + addCriterion("SUBMIT_TIME not between", value1, value2, "submitTime");
2146 return (Criteria) this; 2146 return (Criteria) this;
2147 } 2147 }
2148 2148
......
...@@ -98,6 +98,9 @@ public class KafkaTemporaryStorage implements Serializable { ...@@ -98,6 +98,9 @@ public class KafkaTemporaryStorage implements Serializable {
98 */ 98 */
99 private String data; 99 private String data;
100 100
101 + //非数据库字段
102 + private String message;
103 +
101 private static final long serialVersionUID = 1L; 104 private static final long serialVersionUID = 1L;
102 105
103 public Long getId() { 106 public Long getId() {
...@@ -244,6 +247,14 @@ public class KafkaTemporaryStorage implements Serializable { ...@@ -244,6 +247,14 @@ public class KafkaTemporaryStorage implements Serializable {
244 this.data = data == null ? null : data.trim(); 247 this.data = data == null ? null : data.trim();
245 } 248 }
246 249
250 + public String getMessage() {
251 + return message;
252 + }
253 +
254 + public void setMessage(String message) {
255 + this.message = message;
256 + }
257 +
247 @Override 258 @Override
248 public String toString() { 259 public String toString() {
249 StringBuilder sb = new StringBuilder(); 260 StringBuilder sb = new StringBuilder();
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 sys：系统 系统相关表，例如kafka表 40 sys：系统 系统相关表，例如kafka表
41 log: 日志 日志记录表，例如邮件发送日志表 41 log: 日志 日志记录表，例如邮件发送日志表
42 --> 42 -->
43 - <javaModelGenerator targetPackage="com.fedex.connect.common.model.log" targetProject="src/main/java"> 43 + <javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java">
44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性--> 44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
45 <property name="enableSubPackages" value="false"/> 45 <property name="enableSubPackages" value="false"/>
46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false--> 46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
52 </javaModelGenerator> 52 </javaModelGenerator>
53 53
54 <!-- 生成映射文件*.xml的位置--> 54 <!-- 生成映射文件*.xml的位置-->
55 - <sqlMapGenerator targetPackage="mapper.log" targetProject="src/main/java/com/fedex/connect/common"> 55 + <sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common">
56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
57 <property name="enableSubPackages" value="false"/> 57 <property name="enableSubPackages" value="false"/>
58 </sqlMapGenerator> 58 </sqlMapGenerator>
59 59
60 <!-- 生成DAO的包名和位置 --> 60 <!-- 生成DAO的包名和位置 -->
61 - <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.log" targetProject="src/main/java"> 61 + <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java">
62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
63 <property name="enableSubPackages" value="false"/> 63 <property name="enableSubPackages" value="false"/>
64 </javaClientGenerator> 64 </javaClientGenerator>
...@@ -87,12 +87,12 @@ ...@@ -87,12 +87,12 @@
87 <!-- selectByExampleQueryId="true">--> 87 <!-- selectByExampleQueryId="true">-->
88 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_OPERATION.NEXTVAL FROM DUAL" />--> 88 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_OPERATION.NEXTVAL FROM DUAL" />-->
89 <!-- </table>--> 89 <!-- </table>-->
90 - <table tableName="T_LOG_EMAIL_HISTORY" domainObjectName="EmailHistory" 90 +<!-- <table tableName="T_LOG_EMAIL_HISTORY" domainObjectName="EmailHistory"-->
91 - enableCountByExample="true" enableUpdateByExample="true" 91 +<!-- enableCountByExample="true" enableUpdateByExample="true"-->
92 - enableDeleteByExample="true" enableSelectByExample="true" 92 +<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
93 - selectByExampleQueryId="true"> 93 +<!-- selectByExampleQueryId="true">-->
94 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" /> 94 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
95 - </table> 95 +<!-- </table>-->
96 <!-- <table tableName="T_LOG_USER_LOGIN_INFO" domainObjectName="UserLoginInfo"--> 96 <!-- <table tableName="T_LOG_USER_LOGIN_INFO" domainObjectName="UserLoginInfo"-->
97 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 97 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
98 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 98 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
117 <!-- selectByExampleQueryId="true">--> 117 <!-- selectByExampleQueryId="true">-->
118 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />--> 118 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
119 <!-- </table>--> 119 <!-- </table>-->
120 -<!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"--> 120 + <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
121 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 121 + enableCountByExample="true" enableUpdateByExample="true"
122 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 122 + enableDeleteByExample="true" enableSelectByExample="true"
123 -<!-- selectByExampleQueryId="true">--> 123 + selectByExampleQueryId="true">
124 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />--> 124 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
125 -<!-- </table>--> 125 + </table>
126 <!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"--> 126 <!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
127 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 127 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
128 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 128 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
...@@ -52,7 +52,7 @@ public interface Constant { ...@@ -52,7 +52,7 @@ public interface Constant {
52 interface CE_CONSIGNMENT_COPY_IGNORE_PROP_KEYS{ 52 interface CE_CONSIGNMENT_COPY_IGNORE_PROP_KEYS{
53 String[] IGNORE_PROPERTIES = { 53 String[] IGNORE_PROPERTIES = {
54 BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_SHIPPER_ACCOUNT, 54 BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_SHIPPER_ACCOUNT,
55 - BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY_ID, 55 + BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY_CODE,
56 BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY, 56 BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY,
57 BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_TIME, 57 BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_TIME,
58 BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_ID, 58 BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_ID,
......