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 274 additions and 114 deletions
......@@ -14,6 +14,9 @@ mkdir $base_dir/${pName}
rm -f $base_dir/${pName}/*.war
echo '######## 清除历史war包'
cd $base_dir/${server}/base-starter
mvn clean install -Dmaven.test.skip=true
cd $base_dir/${server}/common-dao
mvn clean install -Dmaven.test.skip=true
......@@ -53,7 +56,7 @@ tarName=${moduleName}-${version}_${profile}.war
cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName}
echo '######## 打包完成目录: '$base_dir/${pName}/${tarName}
moduleName='manager-server'
moduleName='task-schedule'
sVersion='1.0.0'
version='1.0.0'
echo '######## 打包模块: '${moduleName}
......
......@@ -47,7 +47,7 @@ public class ConsignmentController extends BaseController implements IConsignmen
*/
ConsignmentBo consignmentBo = JSONObject.parseObject(consignmentJson,ConsignmentBo.class);
/**
* 运单字段非空校验
* 运单字段校验
*/
consignmentValidate.validateConsignmentSubmit(consignmentBo);
/**
......
......@@ -31,6 +31,9 @@ public enum ResponseCode {
MESSAGE_CODE_30011(30011,"business_exception_30011"),
MESSAGE_CODE_30012(30012,"business_exception_30012"),
MESSAGE_CODE_30013(30013,"business_exception_30013"),
MESSAGE_CODE_30014(30014,"business_exception_30014"),
MESSAGE_CODE_30015(30015,"business_success_30015"),
/******打个样，编写样例*****/
// MESSAGE_CODE_30001(30001,"business_exception_30001"),
......
......@@ -19,4 +19,8 @@ public interface IConsignmentRepository {
Consignment findByConsignmentCode(String consignmentCode,LocalDate dateParam);
Consignment findConsignmentInfo(UserConsignmentInfoQuery consignmentInfoQuery);
Consignment save(Consignment entity);
void saveAll(List<Consignment> list);
}
......
......@@ -62,4 +62,27 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe
public Consignment findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){
return consignmentExtMapper.findConsignmentInfo(userConsignmentInfoQuery);
}
@Override
public Consignment save(Consignment entity) {
if(entity != null) {
if (entity.getId() == null || entity.getId().longValue() <= 0) {
consignmentMapper.insertSelective(entity);
} else if (entity.getId() != null && entity.getId().longValue() > 0){
consignmentMapper.updateByPrimaryKeySelective(entity);
}
}
return entity;
}
@Override
public void saveAll(List<Consignment> list) {
list.stream().forEach(p->{
if(p.getId() == null || p.getId().longValue() <=0){
consignmentMapper.insertSelective(p);
}else if(p.getId() != null && p.getId().longValue() >0){
consignmentMapper.updateByPrimaryKeySelective(p);
}
});
}
}
......
package com.fedex.connect.customer.service.biz.impl;
import com.fedex.connect.common.dependencies.contants.BaseSeparatorConstants;
import com.fedex.connect.common.dependencies.util.DateUtil;
import com.fedex.connect.common.model.biz.Attachment;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.service.base.BaseService;
......@@ -10,6 +12,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -49,11 +52,14 @@ public class AttachmentServiceImpl extends BaseService implements IAttachmentSer
User user,
String consignmentCode){
List<Attachment> attachmentList = new ArrayList<>();
String yyyyMMddHHmmss = DateUtil.yyyyMMddHHmmss(new Date());
try {
for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i];
String bizType = attachmentBizTypeList.get(i);
Attachment attachment = attachmentUtil.uploadFile(file, bizType, user, consignmentCode, (i + 1));
//构造文件后缀
String fileSuffix = yyyyMMddHHmmss + BaseSeparatorConstants.SEPARATOR_UNDERLINE + String.format("%03d",(i + 1));
Attachment attachment = attachmentUtil.uploadFile(file, bizType, user, consignmentCode, fileSuffix);
attachmentList.add(attachment);
}
}catch(Exception ex){
......
......@@ -4,13 +4,16 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.util.ResponseUtils;
import com.fedex.connect.common.model.biz.Attachment;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.common.model.biz.UploadRecord;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.data.bo.AddBo;
import com.fedex.connect.customer.data.bo.ConsignmentBo;
import com.fedex.connect.customer.enums.ResponseCode;
import com.fedex.connect.customer.service.base.BaseService;
import com.fedex.connect.customer.service.biz.IAttachmentService;
import com.fedex.connect.customer.service.biz.IConsignmentService;
import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
import com.fedex.connect.customer.util.service.biz.UploadRecordUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -27,10 +30,11 @@ import java.util.Objects;
*/
@Service
public class ConsignmentServiceImpl extends BaseService implements IConsignmentService {
@Autowired
private ConsignmentUtil consignmentUtil;
@Autowired
private UploadRecordUtil uploadRecordUtil;
@Autowired
private IAttachmentService attachmentService;
/**
......@@ -98,8 +102,19 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
consignmentBo.getAttachmentBizTypeList(),
user,
consignmentBo.getConsignmentCode());
/**
* 初始化运单信息
*/
Consignment consignment = consignmentUtil.initConsignment(consignmentBo,user);
/**
* 初始化上传记录信息
*/
// UploadRecord uploadRecord = uploadRecordUtil.initUploadRecord(consignment.getConsignmentCode());
return responseUtils.success(ResponseCode.MESSAGE_CODE_30015);
}
private void saveSubmitInfo(List<Attachment> attachmentList,Consignment consignment,UploadRecord uploadRecord){
return null;
}
}
\ No newline at end of file
......
......@@ -21,7 +21,6 @@ import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Objects;
......@@ -98,19 +97,19 @@ public class AttachmentUtil {
* @param user
* @return com.fedex.connect.common.model.biz.Attachment
*/
public Attachment uploadFile(MultipartFile file,String bizType, User user,String consignmentCode,int index){
public Attachment uploadFile(MultipartFile file,String bizType, User user,String consignmentCode,String fileSuffix){
Attachment attachment = new Attachment();
//用户上传文件名称，文件名去除前后空格
String sourceFileName = file.getOriginalFilename().trim();
//文件后缀
String suffix = sourceFileName.substring(sourceFileName.lastIndexOf(BaseSeparatorConstants.SEPARATOR_POINT));
String filePathName = null;
try{
//用户上传原文件名称
attachment.setSourceFileName(sourceFileName);
//生成系统文件名称例子：AWB_123456789012_20241023164532982_001.pdf
String fileName = AttachmentBizTypeEnum.valueOf(bizType).getExt1() + BaseSeparatorConstants.SEPARATOR_UNDERLINE +
consignmentCode + BaseSeparatorConstants.SEPARATOR_UNDERLINE +
DateUtil.yyyyMMddHHmmss(new Date()) + BaseSeparatorConstants.SEPARATOR_UNDERLINE +
String.format("%03d",(index + 1));
consignmentCode + BaseSeparatorConstants.SEPARATOR_UNDERLINE + fileSuffix + suffix;
//系统生成文件名称
attachment.setFileName(fileName);
//文件存放目录格式：xxxxx/2024-11-15/123456789012
......
package com.fedex.connect.customer.util.service.biz;
import com.fedex.connect.common.dependencies.cache.CacheSystem;
import com.fedex.connect.common.dependencies.contants.DigitConstants;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
import com.fedex.connect.common.dependencies.util.ResponseUtils;
import com.fedex.connect.common.model.bi.DictionaryEntries;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.data.bo.AddBo;
......@@ -10,10 +13,12 @@ import com.fedex.connect.customer.data.bo.ConsignmentBo;
import com.fedex.connect.customer.data.dto.ConsignmentAddDto;
import com.fedex.connect.customer.enums.ResponseCode;
import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.Objects;
/**
......@@ -24,6 +29,8 @@ import java.util.Objects;
@Component
public class ConsignmentUtil {
@Autowired
CacheSystem cacheSystem;
@Autowired
ResponseUtils responseUtils;
@Autowired
IConsignmentRepository consignmentRepository;
......@@ -129,7 +136,42 @@ public class ConsignmentUtil {
*/
public Consignment initConsignment(ConsignmentBo consignmentBo, User user){
Consignment consignment = consignmentRepository.findById(consignmentBo.getConsignmentId());
DictionaryEntries consignmentStatusDic = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
try {
Date nowDate = new Date();
//如果没有运单id，则是通过add添加进来的运单
if (Objects.isNull(consignment)) {
consignment = new Consignment();
//用户录入数据拷贝
BeanUtils.copyProperties(consignmentBo, consignment);
//用户录入shipperaccount
consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
//始发国名称
consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
//始发国编码
consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
/******提交信息记录******/
consignment.setFirstSubmitTime(nowDate);
consignment.setFirstSubmitter(user.getUserName());
consignment.setFirstSubmitterId(user.getId());
consignment.setCreateTime(nowDate);
consignment.setCreateUserName(user.getUserName());
consignment.setCreateUserId(user.getId());
} else {
consignment.setModifyTime(nowDate);
consignment.setModifyUserName(user.getUserName());
consignment.setModifyUserId(user.getId());
}
//记录当前提交人信息
consignment.setSubmitTime(nowDate);
consignment.setSubmitter(user.getUserName());
consignment.setSubmitterId(user.getId());
//记录当前提交运单状态
consignment.setStatusCode(consignmentStatusDic.getCode());
consignment.setStatusName(consignmentStatusDic.getDescription());
}catch(Exception ex){
responseUtils.fail(ResponseCode.MESSAGE_CODE_30014,ex);
}
return consignment;
}
}
......
package com.fedex.connect.customer.util.service.biz;
import com.fedex.connect.common.dependencies.cache.CacheSystem;
import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
import com.fedex.connect.common.model.bi.DictionaryEntries;
import com.fedex.connect.common.model.biz.UploadRecord;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* @Author mt
* @Description 上传记录相关util
* @Date 2024/11/19
*/
@Slf4j
@Component
public class UploadRecordUtil {
@Autowired
CacheSystem cacheSystem;
/**
* @Author mt
* @Description 初始化上传记录实体 ，除ID与运单ID以外参数
* @Date 2024/11/19
* @param consignmentCode
* @return com.fedex.connect.common.model.biz.UploadRecord
*/
public UploadRecord initUploadRecord(String consignmentCode) throws Exception{
DictionaryEntries consignmentStatusDic = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
UploadRecord uploadRecord = new UploadRecord();
//记录当前运单号
uploadRecord.setConsignmentCode(consignmentCode);
//记录当前运单状态
uploadRecord.setStatusCode(consignmentStatusDic.getCode());
uploadRecord.setStatusName(consignmentStatusDic.getDescription());
/**
* 初始化基础字段
*/
AssignmentFieldUtils.assignmentTableBaseField(uploadRecord);
return uploadRecord;
}
}
......@@ -8,6 +8,8 @@ import com.fedex.connect.customer.enums.ResponseCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Objects;
/**
* @Author Szl
* @Description 类说明 运单校验类
......@@ -42,9 +44,12 @@ public class ConsignmentValidate {
* @return void
*/
public void validateConsignmentSubmit(ConsignmentBo consignmentBo){
//运单ID为空，则需要判断其他字段不能为空
if(Objects.isNull(consignmentBo.getConsignmentId())){
/**
* 非空字段校验
*/
baseValidateUtils.notBlankValidate(consignmentBo,ResponseCode.MESSAGE_CODE_30001);
}
}
}
......
......@@ -41,3 +41,5 @@ business_exception_30010=文件类型不在：运单、发票、箱单、其他
business_exception_30011=该运单已被其他人创建，不可以重复创建
business_exception_30012=UUID不一致
business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
business_exception_30014=运单信息加载失败，请稍后重试
business_success_30015=提交成功
\ No newline at end of file
......
......@@ -41,3 +41,5 @@ business_exception_30010=文件类型不在：运单、发票、箱单、其他
business_exception_30011=该运单已被其他人创建，不可以重复创建
business_exception_30012=UUID不一致
business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
business_exception_30014=运单信息加载失败，请稍后重试
business_success_30015=提交成功
\ No newline at end of file
......
......@@ -28,10 +28,10 @@
<result column="RECIPIENT_ADDR_LINE2" jdbcType="VARCHAR" property="recipientAddrLine2" />
<result column="RECIPIENT_ADDR_LINE3" jdbcType="VARCHAR" property="recipientAddrLine3" />
<result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
<result column="FIRST_COMMIT_TIME" jdbcType="TIMESTAMP" property="firstCommitTime" />
<result column="FIRST_SUBMIT_TIME" jdbcType="TIMESTAMP" property="firstSubmitTime" />
<result column="FIRST_SUBMITTER_ID" jdbcType="NUMERIC" property="firstSubmitterId" />
<result column="FIRST_SUBMITTER" jdbcType="VARCHAR" property="firstSubmitter" />
<result column="COMMIT_TIME" jdbcType="TIMESTAMP" property="commitTime" />
<result column="SUBMIT_TIME" jdbcType="TIMESTAMP" property="submitTime" />
<result column="SUBMITTER_ID" jdbcType="NUMERIC" property="submitterId" />
<result column="SUBMITTER" jdbcType="VARCHAR" property="submitter" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
......@@ -119,7 +119,7 @@
SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2,
SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY,
RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY,
FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID,
FIRST_SUBMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, SUBMIT_TIME, SUBMITTER_ID,
SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG,
USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, USER_INPUT_ORIGIN_COUNTRY,
......@@ -172,8 +172,8 @@
SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME,
RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1,
RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3,
RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID,
FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID,
RECIPIENT_CITY, FIRST_SUBMIT_TIME, FIRST_SUBMITTER_ID,
FIRST_SUBMITTER, SUBMIT_TIME, SUBMITTER_ID,
SUBMITTER, CREATE_TIME, CREATE_USER_ID,
CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE,
......@@ -191,8 +191,8 @@
#{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR},
#{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR},
#{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR},
#{recipientCity,jdbcType=VARCHAR}, #{firstCommitTime,jdbcType=TIMESTAMP}, #{firstSubmitterId,jdbcType=NUMERIC},
#{firstSubmitter,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{submitterId,jdbcType=NUMERIC},
#{recipientCity,jdbcType=VARCHAR}, #{firstSubmitTime,jdbcType=TIMESTAMP}, #{firstSubmitterId,jdbcType=NUMERIC},
#{firstSubmitter,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{submitterId,jdbcType=NUMERIC},
#{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
#{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
#{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, #{recipientPostalCode,jdbcType=VARCHAR},
......@@ -284,8 +284,8 @@
<if test="recipientCity != null">
RECIPIENT_CITY,
</if>
<if test="firstCommitTime != null">
FIRST_COMMIT_TIME,
<if test="firstSubmitTime != null">
FIRST_SUBMIT_TIME,
</if>
<if test="firstSubmitterId != null">
FIRST_SUBMITTER_ID,
......@@ -293,8 +293,8 @@
<if test="firstSubmitter != null">
FIRST_SUBMITTER,
</if>
<if test="commitTime != null">
COMMIT_TIME,
<if test="submitTime != null">
SUBMIT_TIME,
</if>
<if test="submitterId != null">
SUBMITTER_ID,
......@@ -440,8 +440,8 @@
<if test="recipientCity != null">
#{recipientCity,jdbcType=VARCHAR},
</if>
<if test="firstCommitTime != null">
#{firstCommitTime,jdbcType=TIMESTAMP},
<if test="firstSubmitTime != null">
#{firstSubmitTime,jdbcType=TIMESTAMP},
</if>
<if test="firstSubmitterId != null">
#{firstSubmitterId,jdbcType=NUMERIC},
......@@ -449,8 +449,8 @@
<if test="firstSubmitter != null">
#{firstSubmitter,jdbcType=VARCHAR},
</if>
<if test="commitTime != null">
#{commitTime,jdbcType=TIMESTAMP},
<if test="submitTime != null">
#{submitTime,jdbcType=TIMESTAMP},
</if>
<if test="submitterId != null">
#{submitterId,jdbcType=NUMERIC},
......@@ -607,8 +607,8 @@
<if test="record.recipientCity != null">
RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
</if>
<if test="record.firstCommitTime != null">
FIRST_COMMIT_TIME = #{record.firstCommitTime,jdbcType=TIMESTAMP},
<if test="record.firstSubmitTime != null">
FIRST_SUBMIT_TIME = #{record.firstSubmitTime,jdbcType=TIMESTAMP},
</if>
<if test="record.firstSubmitterId != null">
FIRST_SUBMITTER_ID = #{record.firstSubmitterId,jdbcType=NUMERIC},
......@@ -616,8 +616,8 @@
<if test="record.firstSubmitter != null">
FIRST_SUBMITTER = #{record.firstSubmitter,jdbcType=VARCHAR},
</if>
<if test="record.commitTime != null">
COMMIT_TIME = #{record.commitTime,jdbcType=TIMESTAMP},
<if test="record.submitTime != null">
SUBMIT_TIME = #{record.submitTime,jdbcType=TIMESTAMP},
</if>
<if test="record.submitterId != null">
SUBMITTER_ID = #{record.submitterId,jdbcType=NUMERIC},
......@@ -718,10 +718,10 @@
RECIPIENT_ADDR_LINE2 = #{record.recipientAddrLine2,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR},
RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
FIRST_COMMIT_TIME = #{record.firstCommitTime,jdbcType=TIMESTAMP},
FIRST_SUBMIT_TIME = #{record.firstSubmitTime,jdbcType=TIMESTAMP},
FIRST_SUBMITTER_ID = #{record.firstSubmitterId,jdbcType=NUMERIC},
FIRST_SUBMITTER = #{record.firstSubmitter,jdbcType=VARCHAR},
COMMIT_TIME = #{record.commitTime,jdbcType=TIMESTAMP},
SUBMIT_TIME = #{record.submitTime,jdbcType=TIMESTAMP},
SUBMITTER_ID = #{record.submitterId,jdbcType=NUMERIC},
SUBMITTER = #{record.submitter,jdbcType=VARCHAR},
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
......@@ -826,8 +826,8 @@
<if test="recipientCity != null">
RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
</if>
<if test="firstCommitTime != null">
FIRST_COMMIT_TIME = #{firstCommitTime,jdbcType=TIMESTAMP},
<if test="firstSubmitTime != null">
FIRST_SUBMIT_TIME = #{firstSubmitTime,jdbcType=TIMESTAMP},
</if>
<if test="firstSubmitterId != null">
FIRST_SUBMITTER_ID = #{firstSubmitterId,jdbcType=NUMERIC},
......@@ -835,8 +835,8 @@
<if test="firstSubmitter != null">
FIRST_SUBMITTER = #{firstSubmitter,jdbcType=VARCHAR},
</if>
<if test="commitTime != null">
COMMIT_TIME = #{commitTime,jdbcType=TIMESTAMP},
<if test="submitTime != null">
SUBMIT_TIME = #{submitTime,jdbcType=TIMESTAMP},
</if>
<if test="submitterId != null">
SUBMITTER_ID = #{submitterId,jdbcType=NUMERIC},
......@@ -934,10 +934,10 @@
RECIPIENT_ADDR_LINE2 = #{recipientAddrLine2,jdbcType=VARCHAR},
RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR},
RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
FIRST_COMMIT_TIME = #{firstCommitTime,jdbcType=TIMESTAMP},
FIRST_SUBMIT_TIME = #{firstSubmitTime,jdbcType=TIMESTAMP},
FIRST_SUBMITTER_ID = #{firstSubmitterId,jdbcType=NUMERIC},
FIRST_SUBMITTER = #{firstSubmitter,jdbcType=VARCHAR},
COMMIT_TIME = #{commitTime,jdbcType=TIMESTAMP},
SUBMIT_TIME = #{submitTime,jdbcType=TIMESTAMP},
SUBMITTER_ID = #{submitterId,jdbcType=NUMERIC},
SUBMITTER = #{submitter,jdbcType=VARCHAR},
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
......
......@@ -142,7 +142,7 @@ public class Consignment implements Serializable {
/**
* 首次提交时间
*/
private Date firstCommitTime;
private Date firstSubmitTime;
/**
* 首次提交人ID，关联用户表ID
......@@ -157,7 +157,7 @@ public class Consignment implements Serializable {
/**
* 提交时间
*/
private Date commitTime;
private Date submitTime;
/**
* 提交人ID，关联用户表ID
......@@ -482,12 +482,12 @@ public class Consignment implements Serializable {
this.recipientCity = recipientCity == null ? null : recipientCity.trim();
}
public Date getFirstCommitTime() {
return firstCommitTime;
public Date getFirstSubmitTime() {
return firstSubmitTime;
}
public void setFirstCommitTime(Date firstCommitTime) {
this.firstCommitTime = firstCommitTime;
public void setFirstSubmitTime(Date firstSubmitTime) {
this.firstSubmitTime = firstSubmitTime;
}
public Long getFirstSubmitterId() {
......@@ -506,12 +506,12 @@ public class Consignment implements Serializable {
this.firstSubmitter = firstSubmitter == null ? null : firstSubmitter.trim();
}
public Date getCommitTime() {
return commitTime;
public Date getSubmitTime() {
return submitTime;
}
public void setCommitTime(Date commitTime) {
this.commitTime = commitTime;
public void setSubmitTime(Date submitTime) {
this.submitTime = submitTime;
}
public Long getSubmitterId() {
......@@ -722,10 +722,10 @@ public class Consignment implements Serializable {
sb.append(", recipientAddrLine2=").append(recipientAddrLine2);
sb.append(", recipientAddrLine3=").append(recipientAddrLine3);
sb.append(", recipientCity=").append(recipientCity);
sb.append(", firstCommitTime=").append(firstCommitTime);
sb.append(", firstSubmitTime=").append(firstSubmitTime);
sb.append(", firstSubmitterId=").append(firstSubmitterId);
sb.append(", firstSubmitter=").append(firstSubmitter);
sb.append(", commitTime=").append(commitTime);
sb.append(", submitTime=").append(submitTime);
sb.append(", submitterId=").append(submitterId);
sb.append(", submitter=").append(submitter);
sb.append(", createTime=").append(createTime);
......
......@@ -1896,63 +1896,63 @@ public class ConsignmentExample {
return (Criteria) this;
}
public Criteria andFirstCommitTimeIsNull() {
addCriterion("FIRST_COMMIT_TIME is null");
public Criteria andFirstSubmitTimeIsNull() {
addCriterion("FIRST_SUBMIT_TIME is null");
return (Criteria) this;
}
public Criteria andFirstCommitTimeIsNotNull() {
addCriterion("FIRST_COMMIT_TIME is not null");
public Criteria andFirstSubmitTimeIsNotNull() {
addCriterion("FIRST_SUBMIT_TIME is not null");
return (Criteria) this;
}
public Criteria andFirstCommitTimeEqualTo(Date value) {
addCriterion("FIRST_COMMIT_TIME =", value, "firstCommitTime");
public Criteria andFirstSubmitTimeEqualTo(Date value) {
addCriterion("FIRST_SUBMIT_TIME =", value, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeNotEqualTo(Date value) {
addCriterion("FIRST_COMMIT_TIME <>", value, "firstCommitTime");
public Criteria andFirstSubmitTimeNotEqualTo(Date value) {
addCriterion("FIRST_SUBMIT_TIME <>", value, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeGreaterThan(Date value) {
addCriterion("FIRST_COMMIT_TIME >", value, "firstCommitTime");
public Criteria andFirstSubmitTimeGreaterThan(Date value) {
addCriterion("FIRST_SUBMIT_TIME >", value, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeGreaterThanOrEqualTo(Date value) {
addCriterion("FIRST_COMMIT_TIME >=", value, "firstCommitTime");
public Criteria andFirstSubmitTimeGreaterThanOrEqualTo(Date value) {
addCriterion("FIRST_SUBMIT_TIME >=", value, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeLessThan(Date value) {
addCriterion("FIRST_COMMIT_TIME <", value, "firstCommitTime");
public Criteria andFirstSubmitTimeLessThan(Date value) {
addCriterion("FIRST_SUBMIT_TIME <", value, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeLessThanOrEqualTo(Date value) {
addCriterion("FIRST_COMMIT_TIME <=", value, "firstCommitTime");
public Criteria andFirstSubmitTimeLessThanOrEqualTo(Date value) {
addCriterion("FIRST_SUBMIT_TIME <=", value, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeIn(List<Date> values) {
addCriterion("FIRST_COMMIT_TIME in", values, "firstCommitTime");
public Criteria andFirstSubmitTimeIn(List<Date> values) {
addCriterion("FIRST_SUBMIT_TIME in", values, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeNotIn(List<Date> values) {
addCriterion("FIRST_COMMIT_TIME not in", values, "firstCommitTime");
public Criteria andFirstSubmitTimeNotIn(List<Date> values) {
addCriterion("FIRST_SUBMIT_TIME not in", values, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeBetween(Date value1, Date value2) {
addCriterion("FIRST_COMMIT_TIME between", value1, value2, "firstCommitTime");
public Criteria andFirstSubmitTimeBetween(Date value1, Date value2) {
addCriterion("FIRST_SUBMIT_TIME between", value1, value2, "firstSubmitTime");
return (Criteria) this;
}
public Criteria andFirstCommitTimeNotBetween(Date value1, Date value2) {
addCriterion("FIRST_COMMIT_TIME not between", value1, value2, "firstCommitTime");
public Criteria andFirstSubmitTimeNotBetween(Date value1, Date value2) {
addCriterion("FIRST_SUBMIT_TIME not between", value1, value2, "firstSubmitTime");
return (Criteria) this;
}
......@@ -2086,63 +2086,63 @@ public class ConsignmentExample {
return (Criteria) this;
}
public Criteria andCommitTimeIsNull() {
addCriterion("COMMIT_TIME is null");
public Criteria andSubmitTimeIsNull() {
addCriterion("SUBMIT_TIME is null");
return (Criteria) this;
}
public Criteria andCommitTimeIsNotNull() {
addCriterion("COMMIT_TIME is not null");
public Criteria andSubmitTimeIsNotNull() {
addCriterion("SUBMIT_TIME is not null");
return (Criteria) this;
}
public Criteria andCommitTimeEqualTo(Date value) {
addCriterion("COMMIT_TIME =", value, "commitTime");
public Criteria andSubmitTimeEqualTo(Date value) {
addCriterion("SUBMIT_TIME =", value, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeNotEqualTo(Date value) {
addCriterion("COMMIT_TIME <>", value, "commitTime");
public Criteria andSubmitTimeNotEqualTo(Date value) {
addCriterion("SUBMIT_TIME <>", value, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeGreaterThan(Date value) {
addCriterion("COMMIT_TIME >", value, "commitTime");
public Criteria andSubmitTimeGreaterThan(Date value) {
addCriterion("SUBMIT_TIME >", value, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeGreaterThanOrEqualTo(Date value) {
addCriterion("COMMIT_TIME >=", value, "commitTime");
public Criteria andSubmitTimeGreaterThanOrEqualTo(Date value) {
addCriterion("SUBMIT_TIME >=", value, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeLessThan(Date value) {
addCriterion("COMMIT_TIME <", value, "commitTime");
public Criteria andSubmitTimeLessThan(Date value) {
addCriterion("SUBMIT_TIME <", value, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeLessThanOrEqualTo(Date value) {
addCriterion("COMMIT_TIME <=", value, "commitTime");
public Criteria andSubmitTimeLessThanOrEqualTo(Date value) {
addCriterion("SUBMIT_TIME <=", value, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeIn(List<Date> values) {
addCriterion("COMMIT_TIME in", values, "commitTime");
public Criteria andSubmitTimeIn(List<Date> values) {
addCriterion("SUBMIT_TIME in", values, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeNotIn(List<Date> values) {
addCriterion("COMMIT_TIME not in", values, "commitTime");
public Criteria andSubmitTimeNotIn(List<Date> values) {
addCriterion("SUBMIT_TIME not in", values, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeBetween(Date value1, Date value2) {
addCriterion("COMMIT_TIME between", value1, value2, "commitTime");
public Criteria andSubmitTimeBetween(Date value1, Date value2) {
addCriterion("SUBMIT_TIME between", value1, value2, "submitTime");
return (Criteria) this;
}
public Criteria andCommitTimeNotBetween(Date value1, Date value2) {
addCriterion("COMMIT_TIME not between", value1, value2, "commitTime");
public Criteria andSubmitTimeNotBetween(Date value1, Date value2) {
addCriterion("SUBMIT_TIME not between", value1, value2, "submitTime");
return (Criteria) this;
}
......
......@@ -98,6 +98,9 @@ public class KafkaTemporaryStorage implements Serializable {
*/
private String data;
//非数据库字段
private String message;
private static final long serialVersionUID = 1L;
public Long getId() {
......@@ -244,6 +247,14 @@ public class KafkaTemporaryStorage implements Serializable {
this.data = data == null ? null : data.trim();
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......
......@@ -40,7 +40,7 @@
sys：系统 系统相关表，例如kafka表
log: 日志 日志记录表，例如邮件发送日志表
-->
<javaModelGenerator targetPackage="com.fedex.connect.common.model.log" targetProject="src/main/java">
<javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java">
<!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
<property name="enableSubPackages" value="false"/>
<!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
......@@ -52,13 +52,13 @@
</javaModelGenerator>
<!-- 生成映射文件*.xml的位置-->
<sqlMapGenerator targetPackage="mapper.log" targetProject="src/main/java/com/fedex/connect/common">
<sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common">
<!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
<property name="enableSubPackages" value="false"/>
</sqlMapGenerator>
<!-- 生成DAO的包名和位置 -->
<javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.log" targetProject="src/main/java">
<javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java">
<!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
<property name="enableSubPackages" value="false"/>
</javaClientGenerator>
......@@ -87,12 +87,12 @@
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_OPERATION.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table tableName="T_LOG_EMAIL_HISTORY" domainObjectName="EmailHistory"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />
</table>
<!-- <table tableName="T_LOG_EMAIL_HISTORY" domainObjectName="EmailHistory"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<!-- <table tableName="T_LOG_USER_LOGIN_INFO" domainObjectName="UserLoginInfo"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......@@ -117,12 +117,12 @@
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
</table>
<!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
......@@ -52,7 +52,7 @@ public interface Constant {
interface CE_CONSIGNMENT_COPY_IGNORE_PROP_KEYS{
String[] IGNORE_PROPERTIES = {
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_SHIPPER_ACCOUNT,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY_ID,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY_CODE,
BaseConstants.CONSIGNMENT_TABLE_COLUMN_KEYS.USER_INPUT_ORIGIN_COUNTRY,
BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_TIME,
BaseConstants.BASE_TABLE_COLUMN_KEYS.CREATE_USER_ID,
......