Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
799fbb8e 1 parent 5c64b7b8

common-dao、common-dependencies、kafka-cndc-server、manager-server、biz-customer | 修改 | 国际化配置以及表结构调整 

mt
2024年11月7日20:05:55
Inline Side-by-side
Showing 39 changed files with 2241 additions and 70 deletions
package com.fedex.connect.customer.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.ArrayList;
import java.util.List;
/**
* SwaggerConfig配置类.开启Swagger2,自动生成文档
*
* @author EDY
*/
@Configuration
@EnableSwagger2
@Profile({"dev", "test", "uat"})
public class SwaggerConfig {
/**
* 扫描Controller包的路径
*/
public static final String BASE_PACKAGE = "com.fedex.connect.customer.controller";
/**
* API信息
*/
public static final String API_INFO = "iClear Connect-Pre-Clearance Biz-customer APIs";
public static final String API_VERSION = "1.0";
/**
* 创建API应用
*
* @return
*/
@Bean
public Docket restApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo(API_INFO, API_VERSION))
.useDefaultResponseMessages(true)
.forCodeGeneration(false)
.select()
// 扫描指定目录的API
.apis(RequestHandlerSelectors.basePackage(BASE_PACKAGE))
.paths(PathSelectors.any())
.build()
//配置全局io.swagger.model
.securitySchemes(securitySchemes())
//配置将安全上下文应用于哪些api操作(通过正则表达式模式)和HTTP方法
.securityContexts(securityContexts());
}
/**
* API的基本信息
*
* @return
*/
private ApiInfo apiInfo(String title, String version) {
return new ApiInfoBuilder().title(title).description(API_INFO).version(version).build();
}
private List<ApiKey> securitySchemes() {
List<ApiKey> apiKeys = new ArrayList<>();
/*SecurityConstants.TOKEN_HEADER*/
apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
return apiKeys;
}
private List<SecurityContext> securityContexts() {
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(SecurityContext.builder()
.securityReferences(defaultAuth())
//指定/auth 请求下不会携带全局参数
.forPaths(PathSelectors.regex("^(?!/auth).*$")).build());
return securityContexts;
}
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
return securityReferences;
}
}
......@@ -4,12 +4,14 @@ import com.fedex.connect.common.dependencies.date.model.LogShowModel;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
import com.fedex.connect.common.model.sys.User;
import com.fedex.connect.customer.controller.base.BaseController;
import com.fedex.connect.customer.controller.biz.IAttachmentQueryController;
import com.fedex.connect.customer.data.bo.LongBo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -34,15 +36,25 @@ public class AttachmentQueryController extends BaseController implements IAttach
if (responseResultVo != null){
return responseResultVo;
}
Long userId = null;
try {
userId = CurrentUserInfo.getUserId();
//userId = 0L;
} catch (Exception e) {
log.error(LogShowModel.showException("Exception", e));
return ResponseVo.fail(localeMessageUtil.getMessage(BaseResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
}
return attachmentQueryService.findHistory(userId,bo.getId());
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
return attachmentQueryService.findHistory(user.getId(),bo.getId());
}
// @PostMapping("/history")
// @ApiOperation(value = "历史上传记录查询")
// @Override
// public ResponseVo findHistory(@RequestBody LongBo bo) {
// ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
// if (responseResultVo != null){
// return responseResultVo;
// }
// /**
// * 获取当前用户信息
// */
// User user = this.getCurrentUserInfo();
// return attachmentQueryService.findHistory(user.getId(),bo.getId());
// }
}
......
......@@ -35,7 +35,10 @@ public class ConsignmentController extends BaseController implements IConsignmen
if (responseResultVo != null){
return responseResultVo;
}
User user = getUserInfo(localeMessageUtil);
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
return consignmentService.add(bo,user);
}
}
......
......@@ -42,17 +42,20 @@ public class ConsignmentQueryController extends BaseController implements IConsi
@Override
public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "id") Long id) {
/**
* 运单id校验
*/
consignmentInfoValidate.validateConsignmentId(id);
/**
* 获取当前用户信息
*/
User user = this.getCurrentUserInfo();
ConsignmentInfoQuery consignmentInfoQuery = new ConsignmentInfoQuery();
consignmentInfoQuery.setUserId(user.getId());
consignmentInfoQuery.setUserUuid(user.getUserUuid());
consignmentInfoQuery.setConsignmentId(id);
/**
* 运单id校验
* 运单信息查询
*/
consignmentInfoValidate.validateConsignmentId(id);
ConsignmentInfoQuery detailQuery = new ConsignmentInfoQuery();
detailQuery.setUserId(user.getId());
detailQuery.setUuid(user.getUserUuid());
detailQuery.setConsignmentId(id);
return consignmentQueryService.findConsignmentInfo(detailQuery);
return consignmentQueryService.findConsignmentInfo(consignmentInfoQuery);
}
}
......
......@@ -12,7 +12,7 @@ public class ConsignmentInfoQuery {
//用户id
private Long userId;
//用户uuid
private String uuid;
private String userUuid;
//运单id
private Long consignmentId;
}
......
......@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.dao;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -22,4 +23,8 @@ public interface ConsignmentExtMapper {
"ORDER BY CREATE_TIME DESC" +
") WHERE ROWNUM = 1")
Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode);
@Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC INNER JOIN T_BIZ_USER_CONSIGNMENT_MAPPING BUCM ON(BC.ID = BUCM.CONSIGNMENT_ID) " +
"WHERE BC.ID = #{query.consignmentId} AND (BC.USER_UUID = #{query.userUuid} AND BUCM.USER_ID = #{query.userId})")
Consignment findConsignmentInfo(@Param("query") ConsignmentInfoQuery query);
}
......
......@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import java.util.List;
......@@ -12,4 +13,6 @@ public interface IConsignmentExtRepository {
Long findAllCount(ConsignmentQuery query);
Consignment findByConsignmentCode(String consignmentCode);
Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
}
......
......@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo.impl;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
import com.fedex.connect.customer.repository.base.BaseDao;
import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository;
......@@ -26,4 +27,8 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen
public Consignment findByConsignmentCode(String consignmentCode) {
return consignmentExtMapper.findByConsignmentCode(consignmentCode);
}
public Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
return consignmentExtMapper.findConsignmentInfo(consignmentInfoQuery);
}
}
......
......@@ -14,5 +14,12 @@ public interface IConsignmentQueryService {
*/
ResponseVo findConsignments(ConsignmentQuery query);
ResponseVo findConsignmentInfo(ConsignmentInfoQuery detailQuery);
/**
* @Author mt
* @Description 运单信息查询
* @Date 2024/11/7
* @param consignmentInfoQuery
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
}
......
......@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
import com.fedex.connect.common.dependencies.date.vo.PageResult;
import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
import com.fedex.connect.common.dependencies.util.Utils;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
import com.fedex.connect.customer.data.query.ConsignmentQuery;
......@@ -12,6 +13,7 @@ import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
/**
* @Author Szl
......@@ -47,7 +49,26 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
return ResponseVo.succ(pageResult);
}
public ResponseVo findConsignmentInfo(ConsignmentInfoQuery detailQuery){
return null;
/**
* @Author mt
* @Description 运单信息查询
* 如果运单UUID与登录账号UUID相同，则显示运单、收发件人信息
* 如果运单UUID与登录账号UUID不同，则只显示 运单号、shipperAccount、始发国、目的国
* @Date 2024/11/7
* @param consignmentInfoQuery
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
Consignment consignment = consignmentExtRepository.findConsignmentInfo(consignmentInfoQuery);
if(Objects.nonNull(consignment) && !consignment.getUserUuid().equals(consignmentInfoQuery.getUserUuid())){
Consignment consignmentTemp = new Consignment();
consignmentTemp.setId(consignment.getId());
consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
consignmentTemp.setShipperAccount(consignment.getShipperAccount());
consignmentTemp.setOriginCountry(consignment.getOriginCountry());
consignmentTemp.setDestinationCountry(consignment.getDestinationCountry());
consignment = consignmentTemp;
}
return ResponseVo.succ(consignment);
}
}
......
......@@ -20,6 +20,23 @@ spring:
basename: message
encoding: utf-8
import:
jwt:
securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
urlWhiteList:
- /biz-customer/auth
- /biz-customer/monitor/ok
- /biz-customer/user/logout
- /biz-customer/swagger-resources
- /biz-customer/webjars
uriWhiteList:
- /biz-customer/swagger-ui.html
- /biz-customer/swagger-ui/*
- /biz-customer/v2/api-docs
- /biz-customer/login.html
expire_1H: 7200
expire_1D: 604800
mybatis:
mapper-locations:
- classpath*:com/fedex/connect/**/mapper/**/*.xml
......
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
enum_res_code_601=不正确，请重新输入
enum_res_code_601=不正确，请重新输入
enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
con_shipperAccount=发货人计费账号
con_shipperCountry=始发国
con_recipientCountry=目的国
con_shipperAccount=发货人计费账号
con_shipperCountry=始发国
con_recipientCountry=目的国
con_add_oper=添加运单
\ No newline at end of file
con_add_oper=添加运单
\ No newline at end of file
......
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
enum_res_code_601=不正确，请重新输入
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
enum_res_code_601=不正确，请重新输入
enum_res_code_602=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
enum_res_code_603=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
con_shipperAccount=发货人计费账号
con_shipperCountry=始发国
con_recipientCountry=目的国
con_shipperAccount=发货人计费账号
con_shipperCountry=始发国
con_recipientCountry=目的国
con_add_oper=添加运单
\ No newline at end of file
con_add_oper=添加运单
\ No newline at end of file
......
......@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.biz;
import com.fedex.connect.common.model.biz.Consignment;
import com.fedex.connect.common.model.biz.ConsignmentExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ConsignmentMapper {
long countByExample(ConsignmentExample example);
......
package com.fedex.connect.common.dao.biz;
import com.fedex.connect.common.model.biz.UploadRecord;
import com.fedex.connect.common.model.biz.UploadRecordExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface UploadRecordMapper {
long countByExample(UploadRecordExample example);
int deleteByExample(UploadRecordExample example);
int deleteByPrimaryKey(Long id);
int insert(UploadRecord record);
int insertSelective(UploadRecord record);
List<UploadRecord> selectByExample(UploadRecordExample example);
UploadRecord selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") UploadRecord record, @Param("example") UploadRecordExample example);
int updateByExample(@Param("record") UploadRecord record, @Param("example") UploadRecordExample example);
int updateByPrimaryKeySelective(UploadRecord record);
int updateByPrimaryKey(UploadRecord record);
}
\ No newline at end of file
......@@ -18,6 +18,7 @@
<result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
<result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
<result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
<result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -80,7 +81,7 @@
<sql id="Base_Column_List">
ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID,
FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
MODIFY_USER_ID, MODIFY_USER_NAME
MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID
</sql>
<select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap">
<include refid="OracleDialectPrefix" />
......@@ -124,13 +125,13 @@
FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME,
STATUS, CREATE_TIME, CREATE_USER_ID,
CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
MODIFY_USER_NAME)
MODIFY_USER_NAME, UPLOAD_RECORD_ID)
values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC},
#{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR},
#{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR},
#{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
#{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
#{modifyUserName,jdbcType=VARCHAR})
#{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC})
</insert>
<insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
......@@ -184,6 +185,9 @@
<if test="modifyUserName != null">
MODIFY_USER_NAME,
</if>
<if test="uploadRecordId != null">
UPLOAD_RECORD_ID,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{id,jdbcType=NUMERIC},
......@@ -232,6 +236,9 @@
<if test="modifyUserName != null">
#{modifyUserName,jdbcType=VARCHAR},
</if>
<if test="uploadRecordId != null">
#{uploadRecordId,jdbcType=NUMERIC},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long">
......@@ -291,6 +298,9 @@
<if test="record.modifyUserName != null">
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
</if>
<if test="record.uploadRecordId != null">
UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -313,7 +323,8 @@
CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -366,6 +377,9 @@
<if test="modifyUserName != null">
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
</if>
<if test="uploadRecordId != null">
UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
</if>
</set>
where ID = #{id,jdbcType=NUMERIC}
</update>
......@@ -385,7 +399,8 @@
CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC}
where ID = #{id,jdbcType=NUMERIC}
</update>
<sql id="OracleDialectPrefix">
......
......@@ -48,6 +48,10 @@
<result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
<result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
<result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
<result column="USER_INPUT_SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="userInputShipperAccount" />
<result column="USER_INPUT_ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="userInputOriginCountryId" />
<result column="USER_INPUT_ORIGIN_COUNTRY" jdbcType="VARCHAR" property="userInputOriginCountry" />
<result column="ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="originCountryId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -116,7 +120,8 @@
RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_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_ID, STATUS_NAME,
DOC_NONDOC_FLAG, USER_UUID
DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_ID,
USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_ID
</sql>
<select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
<include refid="OracleDialectPrefix" />
......@@ -170,7 +175,9 @@
CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID,
RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
DOC_NONDOC_FLAG, USER_UUID)
DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT,
USER_INPUT_ORIGIN_COUNTRY_ID, USER_INPUT_ORIGIN_COUNTRY,
ORIGIN_COUNTRY_ID)
values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP},
#{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR},
#{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR},
......@@ -186,7 +193,9 @@
#{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
#{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC},
#{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR},
#{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR})
#{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR},
#{userInputOriginCountryId,jdbcType=NUMERIC}, #{userInputOriginCountry,jdbcType=VARCHAR},
#{originCountryId,jdbcType=NUMERIC})
</insert>
<insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
......@@ -330,6 +339,18 @@
<if test="userUuid != null">
USER_UUID,
</if>
<if test="userInputShipperAccount != null">
USER_INPUT_SHIPPER_ACCOUNT,
</if>
<if test="userInputOriginCountryId != null">
USER_INPUT_ORIGIN_COUNTRY_ID,
</if>
<if test="userInputOriginCountry != null">
USER_INPUT_ORIGIN_COUNTRY,
</if>
<if test="originCountryId != null">
ORIGIN_COUNTRY_ID,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{id,jdbcType=NUMERIC},
......@@ -468,6 +489,18 @@
<if test="userUuid != null">
#{userUuid,jdbcType=VARCHAR},
</if>
<if test="userInputShipperAccount != null">
#{userInputShipperAccount,jdbcType=VARCHAR},
</if>
<if test="userInputOriginCountryId != null">
#{userInputOriginCountryId,jdbcType=NUMERIC},
</if>
<if test="userInputOriginCountry != null">
#{userInputOriginCountry,jdbcType=VARCHAR},
</if>
<if test="originCountryId != null">
#{originCountryId,jdbcType=NUMERIC},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long">
......@@ -617,6 +650,18 @@
<if test="record.userUuid != null">
USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
</if>
<if test="record.userInputShipperAccount != null">
USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
</if>
<if test="record.userInputOriginCountryId != null">
USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
</if>
<if test="record.userInputOriginCountry != null">
USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
</if>
<if test="record.originCountryId != null">
ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -669,7 +714,11 @@
STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
USER_UUID = #{record.userUuid,jdbcType=VARCHAR}
USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -812,6 +861,18 @@
<if test="userUuid != null">
USER_UUID = #{userUuid,jdbcType=VARCHAR},
</if>
<if test="userInputShipperAccount != null">
USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
</if>
<if test="userInputOriginCountryId != null">
USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
</if>
<if test="userInputOriginCountry != null">
USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
</if>
<if test="originCountryId != null">
ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC},
</if>
</set>
where ID = #{id,jdbcType=NUMERIC}
</update>
......@@ -861,7 +922,11 @@
STATUS_ID = #{statusId,jdbcType=NUMERIC},
STATUS_NAME = #{statusName,jdbcType=VARCHAR},
DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
USER_UUID = #{userUuid,jdbcType=VARCHAR}
USER_UUID = #{userUuid,jdbcType=VARCHAR},
USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC}
where ID = #{id,jdbcType=NUMERIC}
</update>
<sql id="OracleDialectPrefix">
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fedex.connect.common.dao.biz.UploadRecordMapper">
<resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.UploadRecord">
<id column="ID" jdbcType="NUMERIC" property="id" />
<result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
<result column="UPLOAD_STATUS" jdbcType="VARCHAR" property="uploadStatus" />
<result column="STATUS" jdbcType="NUMERIC" property="status" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
<result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
<result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" />
<result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
<result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
<result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
ID, CONSIGNMENT_ID, UPLOAD_STATUS, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
</sql>
<select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultMap="BaseResultMap">
<include refid="OracleDialectPrefix" />
select
<if test="distinct">
distinct
</if>
'true' as QUERYID,
<include refid="Base_Column_List" />
from T_BIZ_UPLOAD_RECORD
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
<include refid="OracleDialectSuffix" />
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from T_BIZ_UPLOAD_RECORD
where ID = #{id,jdbcType=NUMERIC}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from T_BIZ_UPLOAD_RECORD
where ID = #{id,jdbcType=NUMERIC}
</delete>
<delete id="deleteByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample">
delete from T_BIZ_UPLOAD_RECORD
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL
</selectKey>
insert into T_BIZ_UPLOAD_RECORD (ID, CONSIGNMENT_ID, UPLOAD_STATUS,
STATUS, CREATE_TIME, CREATE_USER_ID,
CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
MODIFY_USER_NAME)
values (#{id,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, #{uploadStatus,jdbcType=VARCHAR},
#{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
#{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
#{modifyUserName,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL
</selectKey>
insert into T_BIZ_UPLOAD_RECORD
<trim prefix="(" suffix=")" suffixOverrides=",">
ID,
<if test="consignmentId != null">
CONSIGNMENT_ID,
</if>
<if test="uploadStatus != null">
UPLOAD_STATUS,
</if>
<if test="status != null">
STATUS,
</if>
<if test="createTime != null">
CREATE_TIME,
</if>
<if test="createUserId != null">
CREATE_USER_ID,
</if>
<if test="createUserName != null">
CREATE_USER_NAME,
</if>
<if test="modifyTime != null">
MODIFY_TIME,
</if>
<if test="modifyUserId != null">
MODIFY_USER_ID,
</if>
<if test="modifyUserName != null">
MODIFY_USER_NAME,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{id,jdbcType=NUMERIC},
<if test="consignmentId != null">
#{consignmentId,jdbcType=NUMERIC},
</if>
<if test="uploadStatus != null">
#{uploadStatus,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=NUMERIC},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createUserId != null">
#{createUserId,jdbcType=NUMERIC},
</if>
<if test="createUserName != null">
#{createUserName,jdbcType=VARCHAR},
</if>
<if test="modifyTime != null">
#{modifyTime,jdbcType=TIMESTAMP},
</if>
<if test="modifyUserId != null">
#{modifyUserId,jdbcType=NUMERIC},
</if>
<if test="modifyUserName != null">
#{modifyUserName,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultType="java.lang.Long">
select count(*) from T_BIZ_UPLOAD_RECORD
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update T_BIZ_UPLOAD_RECORD
<set>
<if test="record.id != null">
ID = #{record.id,jdbcType=NUMERIC},
</if>
<if test="record.consignmentId != null">
CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
</if>
<if test="record.uploadStatus != null">
UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR},
</if>
<if test="record.status != null">
STATUS = #{record.status,jdbcType=NUMERIC},
</if>
<if test="record.createTime != null">
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.createUserId != null">
CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
</if>
<if test="record.createUserName != null">
CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
</if>
<if test="record.modifyTime != null">
MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
</if>
<if test="record.modifyUserId != null">
MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
</if>
<if test="record.modifyUserName != null">
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update T_BIZ_UPLOAD_RECORD
set ID = #{record.id,jdbcType=NUMERIC},
CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR},
STATUS = #{record.status,jdbcType=NUMERIC},
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
update T_BIZ_UPLOAD_RECORD
<set>
<if test="consignmentId != null">
CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
</if>
<if test="uploadStatus != null">
UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR},
</if>
<if test="status != null">
STATUS = #{status,jdbcType=NUMERIC},
</if>
<if test="createTime != null">
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="createUserId != null">
CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
</if>
<if test="createUserName != null">
CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
</if>
<if test="modifyTime != null">
MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
</if>
<if test="modifyUserId != null">
MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
</if>
<if test="modifyUserName != null">
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
</if>
</set>
where ID = #{id,jdbcType=NUMERIC}
</update>
<update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
update T_BIZ_UPLOAD_RECORD
set CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR},
STATUS = #{status,jdbcType=NUMERIC},
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}
where ID = #{id,jdbcType=NUMERIC}
</update>
<sql id="OracleDialectPrefix">
<if test="limitStart != null and limitStart>=0">
select * from ( select row_.*, rownum rownum_ from (
</if>
</sql>
<sql id="OracleDialectSuffix">
<if test="limitStart != null and limitStart>=0">
<![CDATA[ ) row_ ) where rownum_ > #{limitStart} and rownum_ <= #{limitStart}+#{limitSize} ]]>
</if>
</sql>
</mapper>
\ No newline at end of file
......@@ -89,6 +89,11 @@ public class Attachment implements Serializable {
*/
private String modifyUserName;
/**
* 用户上传记录表ID
*/
private Long uploadRecordId;
private static final long serialVersionUID = 1L;
public Long getId() {
......@@ -219,6 +224,14 @@ public class Attachment implements Serializable {
this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
}
public Long getUploadRecordId() {
return uploadRecordId;
}
public void setUploadRecordId(Long uploadRecordId) {
this.uploadRecordId = uploadRecordId;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......@@ -241,6 +254,7 @@ public class Attachment implements Serializable {
sb.append(", modifyTime=").append(modifyTime);
sb.append(", modifyUserId=").append(modifyUserId);
sb.append(", modifyUserName=").append(modifyUserName);
sb.append(", uploadRecordId=").append(uploadRecordId);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......
......@@ -1154,6 +1154,66 @@ public class AttachmentExample {
addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
return (Criteria) this;
}
public Criteria andUploadRecordIdIsNull() {
addCriterion("UPLOAD_RECORD_ID is null");
return (Criteria) this;
}
public Criteria andUploadRecordIdIsNotNull() {
addCriterion("UPLOAD_RECORD_ID is not null");
return (Criteria) this;
}
public Criteria andUploadRecordIdEqualTo(Long value) {
addCriterion("UPLOAD_RECORD_ID =", value, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdNotEqualTo(Long value) {
addCriterion("UPLOAD_RECORD_ID <>", value, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdGreaterThan(Long value) {
addCriterion("UPLOAD_RECORD_ID >", value, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdGreaterThanOrEqualTo(Long value) {
addCriterion("UPLOAD_RECORD_ID >=", value, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdLessThan(Long value) {
addCriterion("UPLOAD_RECORD_ID <", value, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdLessThanOrEqualTo(Long value) {
addCriterion("UPLOAD_RECORD_ID <=", value, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdIn(List<Long> values) {
addCriterion("UPLOAD_RECORD_ID in", values, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdNotIn(List<Long> values) {
addCriterion("UPLOAD_RECORD_ID not in", values, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdBetween(Long value1, Long value2) {
addCriterion("UPLOAD_RECORD_ID between", value1, value2, "uploadRecordId");
return (Criteria) this;
}
public Criteria andUploadRecordIdNotBetween(Long value1, Long value2) {
addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
......@@ -240,6 +240,28 @@ public class Consignment implements Serializable {
*/
private String userUuid;
/**
* 用户录入发货人计费账号
*/
private String userInputShipperAccount;
/**
* 用户录入原产国全称
*/
private Long userInputOriginCountryId;
/**
* 用户录入原产国全称ID，
关联数据字典表。指定字典目录CODE：COUNTRY
*/
private String userInputOriginCountry;
/**
* 原产国全称ID，
关联数据字典表。指定字典目录CODE：COUNTRY
*/
private Long originCountryId;
private static final long serialVersionUID = 1L;
public Long getId() {
......@@ -610,6 +632,38 @@ public class Consignment implements Serializable {
this.userUuid = userUuid == null ? null : userUuid.trim();
}
public String getUserInputShipperAccount() {
return userInputShipperAccount;
}
public void setUserInputShipperAccount(String userInputShipperAccount) {
this.userInputShipperAccount = userInputShipperAccount == null ? null : userInputShipperAccount.trim();
}
public Long getUserInputOriginCountryId() {
return userInputOriginCountryId;
}
public void setUserInputOriginCountryId(Long userInputOriginCountryId) {
this.userInputOriginCountryId = userInputOriginCountryId;
}
public String getUserInputOriginCountry() {
return userInputOriginCountry;
}
public void setUserInputOriginCountry(String userInputOriginCountry) {
this.userInputOriginCountry = userInputOriginCountry == null ? null : userInputOriginCountry.trim();
}
public Long getOriginCountryId() {
return originCountryId;
}
public void setOriginCountryId(Long originCountryId) {
this.originCountryId = originCountryId;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......@@ -662,6 +716,10 @@ public class Consignment implements Serializable {
sb.append(", statusName=").append(statusName);
sb.append(", docNondocFlag=").append(docNondocFlag);
sb.append(", userUuid=").append(userUuid);
sb.append(", userInputShipperAccount=").append(userInputShipperAccount);
sb.append(", userInputOriginCountryId=").append(userInputOriginCountryId);
sb.append(", userInputOriginCountry=").append(userInputOriginCountry);
sb.append(", originCountryId=").append(originCountryId);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......
......@@ -3195,6 +3195,266 @@ public class ConsignmentExample {
addCriterion("USER_UUID not between", value1, value2, "userUuid");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountIsNull() {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT is null");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountIsNotNull() {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT is not null");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountEqualTo(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT =", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountNotEqualTo(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT <>", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountGreaterThan(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT >", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountGreaterThanOrEqualTo(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT >=", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountLessThan(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT <", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountLessThanOrEqualTo(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT <=", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountLike(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT like", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountNotLike(String value) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT not like", value, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountIn(List<String> values) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT in", values, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountNotIn(List<String> values) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT not in", values, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountBetween(String value1, String value2) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT between", value1, value2, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputShipperAccountNotBetween(String value1, String value2) {
addCriterion("USER_INPUT_SHIPPER_ACCOUNT not between", value1, value2, "userInputShipperAccount");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdIsNull() {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is null");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdIsNotNull() {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is not null");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdEqualTo(Long value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID =", value, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdNotEqualTo(Long value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <>", value, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdGreaterThan(Long value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >", value, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdGreaterThanOrEqualTo(Long value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >=", value, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdLessThan(Long value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <", value, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdLessThanOrEqualTo(Long value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <=", value, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdIn(List<Long> values) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID in", values, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdNotIn(List<Long> values) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not in", values, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdBetween(Long value1, Long value2) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID between", value1, value2, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIdNotBetween(Long value1, Long value2) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not between", value1, value2, "userInputOriginCountryId");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIsNull() {
addCriterion("USER_INPUT_ORIGIN_COUNTRY is null");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIsNotNull() {
addCriterion("USER_INPUT_ORIGIN_COUNTRY is not null");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryEqualTo(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY =", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryNotEqualTo(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY <>", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryGreaterThan(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY >", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryGreaterThanOrEqualTo(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY >=", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryLessThan(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY <", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryLessThanOrEqualTo(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY <=", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryLike(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY like", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryNotLike(String value) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY not like", value, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryIn(List<String> values) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY in", values, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryNotIn(List<String> values) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY not in", values, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryBetween(String value1, String value2) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY between", value1, value2, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andUserInputOriginCountryNotBetween(String value1, String value2) {
addCriterion("USER_INPUT_ORIGIN_COUNTRY not between", value1, value2, "userInputOriginCountry");
return (Criteria) this;
}
public Criteria andOriginCountryIdIsNull() {
addCriterion("ORIGIN_COUNTRY_ID is null");
return (Criteria) this;
}
public Criteria andOriginCountryIdIsNotNull() {
addCriterion("ORIGIN_COUNTRY_ID is not null");
return (Criteria) this;
}
public Criteria andOriginCountryIdEqualTo(Long value) {
addCriterion("ORIGIN_COUNTRY_ID =", value, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdNotEqualTo(Long value) {
addCriterion("ORIGIN_COUNTRY_ID <>", value, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdGreaterThan(Long value) {
addCriterion("ORIGIN_COUNTRY_ID >", value, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdGreaterThanOrEqualTo(Long value) {
addCriterion("ORIGIN_COUNTRY_ID >=", value, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdLessThan(Long value) {
addCriterion("ORIGIN_COUNTRY_ID <", value, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdLessThanOrEqualTo(Long value) {
addCriterion("ORIGIN_COUNTRY_ID <=", value, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdIn(List<Long> values) {
addCriterion("ORIGIN_COUNTRY_ID in", values, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdNotIn(List<Long> values) {
addCriterion("ORIGIN_COUNTRY_ID not in", values, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdBetween(Long value1, Long value2) {
addCriterion("ORIGIN_COUNTRY_ID between", value1, value2, "originCountryId");
return (Criteria) this;
}
public Criteria andOriginCountryIdNotBetween(Long value1, Long value2) {
addCriterion("ORIGIN_COUNTRY_ID not between", value1, value2, "originCountryId");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
package com.fedex.connect.common.model.biz;
import java.io.Serializable;
import java.util.Date;
/**
* DESC: 用户上传记录表
* TABLE: T_BIZ_UPLOAD_RECORD
*/
public class UploadRecord implements Serializable {
/**
* ID,自动增加
*/
private Long id;
/**
* 运单ID，关联运单表ID
*/
private Long consignmentId;
/**
* 上传状态(uploaded)
*/
private String uploadStatus;
/**
* 状态(0：无效、1：有效)
*/
private Long status;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人ID，关联用户表ID
*/
private Long createUserId;
/**
* 创建人名称
*/
private String createUserName;
/**
* 修改时间
*/
private Date modifyTime;
/**
* 修改人ID，关联用户表ID
*/
private Long modifyUserId;
/**
* 修改人名称
*/
private String modifyUserName;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getConsignmentId() {
return consignmentId;
}
public void setConsignmentId(Long consignmentId) {
this.consignmentId = consignmentId;
}
public String getUploadStatus() {
return uploadStatus;
}
public void setUploadStatus(String uploadStatus) {
this.uploadStatus = uploadStatus == null ? null : uploadStatus.trim();
}
public Long getStatus() {
return status;
}
public void setStatus(Long status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName == null ? null : createUserName.trim();
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public Long getModifyUserId() {
return modifyUserId;
}
public void setModifyUserId(Long modifyUserId) {
this.modifyUserId = modifyUserId;
}
public String getModifyUserName() {
return modifyUserName;
}
public void setModifyUserName(String modifyUserName) {
this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", consignmentId=").append(consignmentId);
sb.append(", uploadStatus=").append(uploadStatus);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", createUserId=").append(createUserId);
sb.append(", createUserName=").append(createUserName);
sb.append(", modifyTime=").append(modifyTime);
sb.append(", modifyUserId=").append(modifyUserId);
sb.append(", modifyUserName=").append(modifyUserName);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
package com.fedex.connect.common.model.biz;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class UploadRecordExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
protected Integer limitStart;
protected Integer limitSize;
public UploadRecordExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
public void setLimitStart(Integer limitStart) {
this.limitStart=limitStart;
}
public Integer getLimitStart() {
return limitStart;
}
public void setLimitSize(Integer limitSize) {
this.limitSize=limitSize;
}
public Integer getLimitSize() {
return limitSize;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("ID is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("ID is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("ID =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("ID <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("ID >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("ID >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("ID <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("ID <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("ID not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("ID between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("ID not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andConsignmentIdIsNull() {
addCriterion("CONSIGNMENT_ID is null");
return (Criteria) this;
}
public Criteria andConsignmentIdIsNotNull() {
addCriterion("CONSIGNMENT_ID is not null");
return (Criteria) this;
}
public Criteria andConsignmentIdEqualTo(Long value) {
addCriterion("CONSIGNMENT_ID =", value, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdNotEqualTo(Long value) {
addCriterion("CONSIGNMENT_ID <>", value, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdGreaterThan(Long value) {
addCriterion("CONSIGNMENT_ID >", value, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdGreaterThanOrEqualTo(Long value) {
addCriterion("CONSIGNMENT_ID >=", value, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdLessThan(Long value) {
addCriterion("CONSIGNMENT_ID <", value, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdLessThanOrEqualTo(Long value) {
addCriterion("CONSIGNMENT_ID <=", value, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdIn(List<Long> values) {
addCriterion("CONSIGNMENT_ID in", values, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdNotIn(List<Long> values) {
addCriterion("CONSIGNMENT_ID not in", values, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdBetween(Long value1, Long value2) {
addCriterion("CONSIGNMENT_ID between", value1, value2, "consignmentId");
return (Criteria) this;
}
public Criteria andConsignmentIdNotBetween(Long value1, Long value2) {
addCriterion("CONSIGNMENT_ID not between", value1, value2, "consignmentId");
return (Criteria) this;
}
public Criteria andUploadStatusIsNull() {
addCriterion("UPLOAD_STATUS is null");
return (Criteria) this;
}
public Criteria andUploadStatusIsNotNull() {
addCriterion("UPLOAD_STATUS is not null");
return (Criteria) this;
}
public Criteria andUploadStatusEqualTo(String value) {
addCriterion("UPLOAD_STATUS =", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusNotEqualTo(String value) {
addCriterion("UPLOAD_STATUS <>", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusGreaterThan(String value) {
addCriterion("UPLOAD_STATUS >", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusGreaterThanOrEqualTo(String value) {
addCriterion("UPLOAD_STATUS >=", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusLessThan(String value) {
addCriterion("UPLOAD_STATUS <", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusLessThanOrEqualTo(String value) {
addCriterion("UPLOAD_STATUS <=", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusLike(String value) {
addCriterion("UPLOAD_STATUS like", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusNotLike(String value) {
addCriterion("UPLOAD_STATUS not like", value, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusIn(List<String> values) {
addCriterion("UPLOAD_STATUS in", values, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusNotIn(List<String> values) {
addCriterion("UPLOAD_STATUS not in", values, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusBetween(String value1, String value2) {
addCriterion("UPLOAD_STATUS between", value1, value2, "uploadStatus");
return (Criteria) this;
}
public Criteria andUploadStatusNotBetween(String value1, String value2) {
addCriterion("UPLOAD_STATUS not between", value1, value2, "uploadStatus");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("STATUS is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("STATUS is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Long value) {
addCriterion("STATUS =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Long value) {
addCriterion("STATUS <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Long value) {
addCriterion("STATUS >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Long value) {
addCriterion("STATUS >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Long value) {
addCriterion("STATUS <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Long value) {
addCriterion("STATUS <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Long> values) {
addCriterion("STATUS in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Long> values) {
addCriterion("STATUS not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Long value1, Long value2) {
addCriterion("STATUS between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Long value1, Long value2) {
addCriterion("STATUS not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("CREATE_TIME is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("CREATE_TIME is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("CREATE_TIME =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("CREATE_TIME <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("CREATE_TIME >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("CREATE_TIME <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("CREATE_TIME in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("CREATE_TIME not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateUserIdIsNull() {
addCriterion("CREATE_USER_ID is null");
return (Criteria) this;
}
public Criteria andCreateUserIdIsNotNull() {
addCriterion("CREATE_USER_ID is not null");
return (Criteria) this;
}
public Criteria andCreateUserIdEqualTo(Long value) {
addCriterion("CREATE_USER_ID =", value, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdNotEqualTo(Long value) {
addCriterion("CREATE_USER_ID <>", value, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdGreaterThan(Long value) {
addCriterion("CREATE_USER_ID >", value, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("CREATE_USER_ID >=", value, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdLessThan(Long value) {
addCriterion("CREATE_USER_ID <", value, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdLessThanOrEqualTo(Long value) {
addCriterion("CREATE_USER_ID <=", value, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdIn(List<Long> values) {
addCriterion("CREATE_USER_ID in", values, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdNotIn(List<Long> values) {
addCriterion("CREATE_USER_ID not in", values, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdBetween(Long value1, Long value2) {
addCriterion("CREATE_USER_ID between", value1, value2, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserIdNotBetween(Long value1, Long value2) {
addCriterion("CREATE_USER_ID not between", value1, value2, "createUserId");
return (Criteria) this;
}
public Criteria andCreateUserNameIsNull() {
addCriterion("CREATE_USER_NAME is null");
return (Criteria) this;
}
public Criteria andCreateUserNameIsNotNull() {
addCriterion("CREATE_USER_NAME is not null");
return (Criteria) this;
}
public Criteria andCreateUserNameEqualTo(String value) {
addCriterion("CREATE_USER_NAME =", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameNotEqualTo(String value) {
addCriterion("CREATE_USER_NAME <>", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameGreaterThan(String value) {
addCriterion("CREATE_USER_NAME >", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameGreaterThanOrEqualTo(String value) {
addCriterion("CREATE_USER_NAME >=", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameLessThan(String value) {
addCriterion("CREATE_USER_NAME <", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameLessThanOrEqualTo(String value) {
addCriterion("CREATE_USER_NAME <=", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameLike(String value) {
addCriterion("CREATE_USER_NAME like", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameNotLike(String value) {
addCriterion("CREATE_USER_NAME not like", value, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameIn(List<String> values) {
addCriterion("CREATE_USER_NAME in", values, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameNotIn(List<String> values) {
addCriterion("CREATE_USER_NAME not in", values, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameBetween(String value1, String value2) {
addCriterion("CREATE_USER_NAME between", value1, value2, "createUserName");
return (Criteria) this;
}
public Criteria andCreateUserNameNotBetween(String value1, String value2) {
addCriterion("CREATE_USER_NAME not between", value1, value2, "createUserName");
return (Criteria) this;
}
public Criteria andModifyTimeIsNull() {
addCriterion("MODIFY_TIME is null");
return (Criteria) this;
}
public Criteria andModifyTimeIsNotNull() {
addCriterion("MODIFY_TIME is not null");
return (Criteria) this;
}
public Criteria andModifyTimeEqualTo(Date value) {
addCriterion("MODIFY_TIME =", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeNotEqualTo(Date value) {
addCriterion("MODIFY_TIME <>", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeGreaterThan(Date value) {
addCriterion("MODIFY_TIME >", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
addCriterion("MODIFY_TIME >=", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeLessThan(Date value) {
addCriterion("MODIFY_TIME <", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
addCriterion("MODIFY_TIME <=", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeIn(List<Date> values) {
addCriterion("MODIFY_TIME in", values, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeNotIn(List<Date> values) {
addCriterion("MODIFY_TIME not in", values, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeBetween(Date value1, Date value2) {
addCriterion("MODIFY_TIME between", value1, value2, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
addCriterion("MODIFY_TIME not between", value1, value2, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyUserIdIsNull() {
addCriterion("MODIFY_USER_ID is null");
return (Criteria) this;
}
public Criteria andModifyUserIdIsNotNull() {
addCriterion("MODIFY_USER_ID is not null");
return (Criteria) this;
}
public Criteria andModifyUserIdEqualTo(Long value) {
addCriterion("MODIFY_USER_ID =", value, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdNotEqualTo(Long value) {
addCriterion("MODIFY_USER_ID <>", value, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdGreaterThan(Long value) {
addCriterion("MODIFY_USER_ID >", value, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("MODIFY_USER_ID >=", value, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdLessThan(Long value) {
addCriterion("MODIFY_USER_ID <", value, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdLessThanOrEqualTo(Long value) {
addCriterion("MODIFY_USER_ID <=", value, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdIn(List<Long> values) {
addCriterion("MODIFY_USER_ID in", values, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdNotIn(List<Long> values) {
addCriterion("MODIFY_USER_ID not in", values, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdBetween(Long value1, Long value2) {
addCriterion("MODIFY_USER_ID between", value1, value2, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserIdNotBetween(Long value1, Long value2) {
addCriterion("MODIFY_USER_ID not between", value1, value2, "modifyUserId");
return (Criteria) this;
}
public Criteria andModifyUserNameIsNull() {
addCriterion("MODIFY_USER_NAME is null");
return (Criteria) this;
}
public Criteria andModifyUserNameIsNotNull() {
addCriterion("MODIFY_USER_NAME is not null");
return (Criteria) this;
}
public Criteria andModifyUserNameEqualTo(String value) {
addCriterion("MODIFY_USER_NAME =", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameNotEqualTo(String value) {
addCriterion("MODIFY_USER_NAME <>", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameGreaterThan(String value) {
addCriterion("MODIFY_USER_NAME >", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameGreaterThanOrEqualTo(String value) {
addCriterion("MODIFY_USER_NAME >=", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameLessThan(String value) {
addCriterion("MODIFY_USER_NAME <", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameLessThanOrEqualTo(String value) {
addCriterion("MODIFY_USER_NAME <=", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameLike(String value) {
addCriterion("MODIFY_USER_NAME like", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameNotLike(String value) {
addCriterion("MODIFY_USER_NAME not like", value, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameIn(List<String> values) {
addCriterion("MODIFY_USER_NAME in", values, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameNotIn(List<String> values) {
addCriterion("MODIFY_USER_NAME not in", values, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameBetween(String value1, String value2) {
addCriterion("MODIFY_USER_NAME between", value1, value2, "modifyUserName");
return (Criteria) this;
}
public Criteria andModifyUserNameNotBetween(String value1, String value2) {
addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
......@@ -93,12 +93,18 @@
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<!-- <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />
</table>
<table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"
enableCountByExample="true" enableUpdateByExample="true"
enableDeleteByExample="true" enableSelectByExample="true"
selectByExampleQueryId="true">
<generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />
</table>
<!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
package com.fedex.connect.common.dependencies.authentication;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
/**
* 读取配置文件
* @author Administrator
*/
@ConfigurationProperties(prefix = "export.jwt")
@Configuration
@ConfigurationProperties(prefix = "import.jwt")
@PropertySource("classpath:application.yml")
public class SecurityConstants {
/**
......
......@@ -73,6 +73,9 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class);
IRedisSlabService redisSlabService = SpringBeanUtil.getBean(IRedisSlabService.class);
String str = localeMessageUtil.getMessage("auth_filter_user_error");
System.out.println(str);
if (token == null || !token.startsWith(SecurityConstants.TOKEN_PREFIX)) {
SecurityContextHolder.clearContext();
......
......@@ -2,15 +2,18 @@ package com.fedex.connect.common.dependencies.i18n;
import org.springframework.context.MessageSource;
import org.springframework.context.MessageSourceResolvable;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Locale;
/**
* 根据语言编码查询内容
*/
@Component
@PropertySource("classpath:application.yml")
public class LocaleMessageUtil {
@Resource
......
......@@ -31,12 +31,12 @@ public class SwaggerConfig {
/**
* 扫描Controller包的路径
*/
public static final String BASE_PACKAGE = "com.fedex.export.controller";
public static final String BASE_PACKAGE = "com.fedex.connect.kafka.controller";
/**
* API信息
*/
public static final String API_INFO = "Export TW APIs";
public static final String API_INFO = "iClear Connect-Pre-Clearance Kafka-cndc-server APIs";
public static final String API_VERSION = "1.0";
/**
......
......@@ -9,7 +9,25 @@ spring:
active: @activatedProperties@
messages:
basename: message
encoding: utf-8
import:
jwt:
securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
urlWhiteList:
- /kafka-cndc-server/auth
- /kafka-cndc-server/monitor/ok
- /kafka-cndc-server/user/logout
- /kafka-cndc-server/swagger-resources
- /kafka-cndc-server/webjars
- /kafka-cndc-server/csrf
uriWhiteList:
- /kafka-cndc-server/swagger-ui.html
- /kafka-cndc-server/swagger-ui/*
- /kafka-cndc-server/v2/api-docs
- /kafka-cndc-server/login.html
expire_1H: 7200
expire_1D: 604800
mybatis:
mapper-locations:
......
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
\ No newline at end of file
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
enum_res_code_301=登錄身份異常
enum_res_code_305=登錄已過期，請重新登錄
\ No newline at end of file
package com.fedex.connect.manager.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.ArrayList;
import java.util.List;
/**
* SwaggerConfig配置类.开启Swagger2,自动生成文档
*
* @author EDY
*/
@Configuration
@EnableSwagger2
@Profile({"dev", "test", "uat"})
public class SwaggerConfig {
/**
* 扫描Controller包的路径
*/
public static final String BASE_PACKAGE = "com.fedex.connect.manager.controller";
/**
* API信息
*/
public static final String API_INFO = "iClear Connect-Pre-Clearance Manager-server APIs";
public static final String API_VERSION = "1.0";
/**
* 创建API应用
*
* @return
*/
@Bean
public Docket restApi() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo(API_INFO, API_VERSION))
.useDefaultResponseMessages(true)
.forCodeGeneration(false)
.select()
// 扫描指定目录的API
.apis(RequestHandlerSelectors.basePackage(BASE_PACKAGE))
.paths(PathSelectors.any())
.build()
//配置全局io.swagger.model
.securitySchemes(securitySchemes())
//配置将安全上下文应用于哪些api操作(通过正则表达式模式)和HTTP方法
.securityContexts(securityContexts());
}
/**
* API的基本信息
*
* @return
*/
private ApiInfo apiInfo(String title, String version) {
return new ApiInfoBuilder().title(title).description(API_INFO).version(version).build();
}
private List<ApiKey> securitySchemes() {
List<ApiKey> apiKeys = new ArrayList<>();
/*SecurityConstants.TOKEN_HEADER*/
apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
return apiKeys;
}
private List<SecurityContext> securityContexts() {
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(SecurityContext.builder()
.securityReferences(defaultAuth())
//指定/auth 请求下不会携带全局参数
.forPaths(PathSelectors.regex("^(?!/auth).*$")).build());
return securityContexts;
}
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
return securityReferences;
}
}
......@@ -20,6 +20,23 @@ spring:
basename: message
encoding: utf-8
import:
jwt:
securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
urlWhiteList:
- /manager-server/auth
- /manager-server/monitor/ok
- /manager-server/user/logout
- /manager-server/swagger-resources
- /manager-server/webjars
uriWhiteList:
- /manager-server/swagger-ui.html
- /manager-server/swagger-ui/*
- /manager-server/v2/api-docs
- /manager-server/login.html
expire_1H: 7200
expire_1D: 604800
mybatis:
mapper-locations:
- classpath*:com/fedex/connect/**/mapper/**/*.xml
......
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
\ No newline at end of file
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
\ No newline at end of file
......
#authentication包
auth_exc_no_auth=沒有訪問許可權
auth_exc_no_pass_auth=沒有通過許可權認證
auth_filter_user_error=登錄身份異常
auth_filter_timeout=登錄超過8小時，請重新登錄
auth_filter_stale_dated=登錄已過期
\ No newline at end of file
......