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
1 +package com.fedex.connect.customer.config;
2 +
3 +import org.springframework.context.annotation.Bean;
4 +import org.springframework.context.annotation.Configuration;
5 +import org.springframework.context.annotation.Profile;
6 +import springfox.documentation.builders.ApiInfoBuilder;
7 +import springfox.documentation.builders.PathSelectors;
8 +import springfox.documentation.builders.RequestHandlerSelectors;
9 +import springfox.documentation.service.ApiInfo;
10 +import springfox.documentation.service.ApiKey;
11 +import springfox.documentation.service.AuthorizationScope;
12 +import springfox.documentation.service.SecurityReference;
13 +import springfox.documentation.spi.DocumentationType;
14 +import springfox.documentation.spi.service.contexts.SecurityContext;
15 +import springfox.documentation.spring.web.plugins.Docket;
16 +import springfox.documentation.swagger2.annotations.EnableSwagger2;
17 +
18 +import java.util.ArrayList;
19 +import java.util.List;
20 +
21 +/**
22 + * SwaggerConfig配置类.开启Swagger2,自动生成文档
23 + *
24 + * @author EDY
25 + */
26 +@Configuration
27 +@EnableSwagger2
28 +@Profile({"dev", "test", "uat"})
29 +public class SwaggerConfig {
30 +
31 + /**
32 + * 扫描Controller包的路径
33 + */
34 + public static final String BASE_PACKAGE = "com.fedex.connect.customer.controller";
35 +
36 + /**
37 + * API信息
38 + */
39 + public static final String API_INFO = "iClear Connect-Pre-Clearance Biz-customer APIs";
40 + public static final String API_VERSION = "1.0";
41 +
42 + /**
43 + * 创建API应用
44 + *
45 + * @return
46 + */
47 + @Bean
48 + public Docket restApi() {
49 + return new Docket(DocumentationType.SWAGGER_2)
50 + .apiInfo(apiInfo(API_INFO, API_VERSION))
51 + .useDefaultResponseMessages(true)
52 + .forCodeGeneration(false)
53 + .select()
54 + // 扫描指定目录的API
55 + .apis(RequestHandlerSelectors.basePackage(BASE_PACKAGE))
56 + .paths(PathSelectors.any())
57 + .build()
58 + //配置全局io.swagger.model
59 + .securitySchemes(securitySchemes())
60 + //配置将安全上下文应用于哪些api操作(通过正则表达式模式)和HTTP方法
61 + .securityContexts(securityContexts());
62 + }
63 +
64 + /**
65 + * API的基本信息
66 + *
67 + * @return
68 + */
69 + private ApiInfo apiInfo(String title, String version) {
70 + return new ApiInfoBuilder().title(title).description(API_INFO).version(version).build();
71 + }
72 +
73 + private List<ApiKey> securitySchemes() {
74 + List<ApiKey> apiKeys = new ArrayList<>();
75 + /*SecurityConstants.TOKEN_HEADER*/
76 + apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
77 + return apiKeys;
78 + }
79 +
80 + private List<SecurityContext> securityContexts() {
81 + List<SecurityContext> securityContexts = new ArrayList<>();
82 + securityContexts.add(SecurityContext.builder()
83 + .securityReferences(defaultAuth())
84 + //指定/auth 请求下不会携带全局参数
85 + .forPaths(PathSelectors.regex("^(?!/auth).*$")).build());
86 + return securityContexts;
87 + }
88 + private List<SecurityReference> defaultAuth() {
89 + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
90 + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
91 + authorizationScopes[0] = authorizationScope;
92 + List<SecurityReference> securityReferences = new ArrayList<>();
93 + securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
94 + return securityReferences;
95 + }
96 +}
...@@ -4,12 +4,14 @@ import com.fedex.connect.common.dependencies.date.model.LogShowModel; ...@@ -4,12 +4,14 @@ import com.fedex.connect.common.dependencies.date.model.LogShowModel;
4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 4 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
5 import com.fedex.connect.common.dependencies.enums.BaseResponseCode; 5 import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
6 import com.fedex.connect.common.dependencies.util.CurrentUserInfo; 6 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
7 +import com.fedex.connect.common.model.sys.User;
7 import com.fedex.connect.customer.controller.base.BaseController; 8 import com.fedex.connect.customer.controller.base.BaseController;
8 import com.fedex.connect.customer.controller.biz.IAttachmentQueryController; 9 import com.fedex.connect.customer.controller.biz.IAttachmentQueryController;
9 import com.fedex.connect.customer.data.bo.LongBo; 10 import com.fedex.connect.customer.data.bo.LongBo;
10 import io.swagger.annotations.Api; 11 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiOperation; 12 import io.swagger.annotations.ApiOperation;
12 import lombok.extern.slf4j.Slf4j; 13 import lombok.extern.slf4j.Slf4j;
14 +import oracle.jdbc.proxy.annotation.Post;
13 import org.springframework.web.bind.annotation.PostMapping; 15 import org.springframework.web.bind.annotation.PostMapping;
14 import org.springframework.web.bind.annotation.RequestBody; 16 import org.springframework.web.bind.annotation.RequestBody;
15 import org.springframework.web.bind.annotation.RequestMapping; 17 import org.springframework.web.bind.annotation.RequestMapping;
...@@ -34,15 +36,25 @@ public class AttachmentQueryController extends BaseController implements IAttach ...@@ -34,15 +36,25 @@ public class AttachmentQueryController extends BaseController implements IAttach
34 if (responseResultVo != null){ 36 if (responseResultVo != null){
35 return responseResultVo; 37 return responseResultVo;
36 } 38 }
37 - Long userId = null; 39 + /**
38 - try { 40 + * 获取当前用户信息
39 - userId = CurrentUserInfo.getUserId(); 41 + */
40 - //userId = 0L; 42 + User user = this.getCurrentUserInfo();
41 - } catch (Exception e) { 43 + return attachmentQueryService.findHistory(user.getId(),bo.getId());
42 - log.error(LogShowModel.showException("Exception", e));
43 - return ResponseVo.fail(localeMessageUtil.getMessage(BaseResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
44 - }
45 - return attachmentQueryService.findHistory(userId,bo.getId());
46 } 44 }
47 45
46 +// @PostMapping("/history")
47 +// @ApiOperation(value = "历史上传记录查询")
48 +// @Override
49 +// public ResponseVo findHistory(@RequestBody LongBo bo) {
50 +// ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
51 +// if (responseResultVo != null){
52 +// return responseResultVo;
53 +// }
54 +// /**
55 +// * 获取当前用户信息
56 +// */
57 +// User user = this.getCurrentUserInfo();
58 +// return attachmentQueryService.findHistory(user.getId(),bo.getId());
59 +// }
48 } 60 }
......
...@@ -35,7 +35,10 @@ public class ConsignmentController extends BaseController implements IConsignmen ...@@ -35,7 +35,10 @@ public class ConsignmentController extends BaseController implements IConsignmen
35 if (responseResultVo != null){ 35 if (responseResultVo != null){
36 return responseResultVo; 36 return responseResultVo;
37 } 37 }
38 - User user = getUserInfo(localeMessageUtil); 38 + /**
39 + * 获取当前用户信息
40 + */
41 + User user = this.getCurrentUserInfo();
39 return consignmentService.add(bo,user); 42 return consignmentService.add(bo,user);
40 } 43 }
41 } 44 }
......
...@@ -42,17 +42,20 @@ public class ConsignmentQueryController extends BaseController implements IConsi ...@@ -42,17 +42,20 @@ public class ConsignmentQueryController extends BaseController implements IConsi
42 @Override 42 @Override
43 public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "id") Long id) { 43 public ResponseVo findConsignmentInfo(@ApiParam(value="运单ID",required = true) @PathVariable(value = "id") Long id) {
44 /** 44 /**
45 + * 运单id校验
46 + */
47 + consignmentInfoValidate.validateConsignmentId(id);
48 + /**
45 * 获取当前用户信息 49 * 获取当前用户信息
46 */ 50 */
47 User user = this.getCurrentUserInfo(); 51 User user = this.getCurrentUserInfo();
52 + ConsignmentInfoQuery consignmentInfoQuery = new ConsignmentInfoQuery();
53 + consignmentInfoQuery.setUserId(user.getId());
54 + consignmentInfoQuery.setUserUuid(user.getUserUuid());
55 + consignmentInfoQuery.setConsignmentId(id);
48 /** 56 /**
49 - * 运单id校验 57 + * 运单信息查询
50 */ 58 */
51 - consignmentInfoValidate.validateConsignmentId(id); 59 + return consignmentQueryService.findConsignmentInfo(consignmentInfoQuery);
52 - ConsignmentInfoQuery detailQuery = new ConsignmentInfoQuery();
53 - detailQuery.setUserId(user.getId());
54 - detailQuery.setUuid(user.getUserUuid());
55 - detailQuery.setConsignmentId(id);
56 - return consignmentQueryService.findConsignmentInfo(detailQuery);
57 } 60 }
58 } 61 }
......
...@@ -12,7 +12,7 @@ public class ConsignmentInfoQuery { ...@@ -12,7 +12,7 @@ public class ConsignmentInfoQuery {
12 //用户id 12 //用户id
13 private Long userId; 13 private Long userId;
14 //用户uuid 14 //用户uuid
15 - private String uuid; 15 + private String userUuid;
16 //运单id 16 //运单id
17 private Long consignmentId; 17 private Long consignmentId;
18 } 18 }
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.dao; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.dao;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
5 +import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
5 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
6 import org.apache.ibatis.annotations.Mapper; 7 import org.apache.ibatis.annotations.Mapper;
7 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
...@@ -22,4 +23,8 @@ public interface ConsignmentExtMapper { ...@@ -22,4 +23,8 @@ public interface ConsignmentExtMapper {
22 "ORDER BY CREATE_TIME DESC" + 23 "ORDER BY CREATE_TIME DESC" +
23 ") WHERE ROWNUM = 1") 24 ") WHERE ROWNUM = 1")
24 Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode); 25 Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode);
26 +
27 + @Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC INNER JOIN T_BIZ_USER_CONSIGNMENT_MAPPING BUCM ON(BC.ID = BUCM.CONSIGNMENT_ID) " +
28 + "WHERE BC.ID = #{query.consignmentId} AND (BC.USER_UUID = #{query.userUuid} AND BUCM.USER_ID = #{query.userId})")
29 + Consignment findConsignmentInfo(@Param("query") ConsignmentInfoQuery query);
25 } 30 }
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
5 +import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
5 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
6 7
7 import java.util.List; 8 import java.util.List;
...@@ -12,4 +13,6 @@ public interface IConsignmentExtRepository { ...@@ -12,4 +13,6 @@ public interface IConsignmentExtRepository {
12 Long findAllCount(ConsignmentQuery query); 13 Long findAllCount(ConsignmentQuery query);
13 14
14 Consignment findByConsignmentCode(String consignmentCode); 15 Consignment findByConsignmentCode(String consignmentCode);
16 +
17 + Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
15 } 18 }
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo.impl; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.repository.repo.impl;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 4 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
5 +import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
5 import com.fedex.connect.customer.data.query.ConsignmentQuery; 6 import com.fedex.connect.customer.data.query.ConsignmentQuery;
6 import com.fedex.connect.customer.repository.base.BaseDao; 7 import com.fedex.connect.customer.repository.base.BaseDao;
7 import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository; 8 import com.fedex.connect.customer.repository.repo.IConsignmentExtRepository;
...@@ -26,4 +27,8 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen ...@@ -26,4 +27,8 @@ public class ConsignmentExtRepositoryImpl extends BaseDao implements IConsignmen
26 public Consignment findByConsignmentCode(String consignmentCode) { 27 public Consignment findByConsignmentCode(String consignmentCode) {
27 return consignmentExtMapper.findByConsignmentCode(consignmentCode); 28 return consignmentExtMapper.findByConsignmentCode(consignmentCode);
28 } 29 }
30 +
31 + public Consignment findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
32 + return consignmentExtMapper.findConsignmentInfo(consignmentInfoQuery);
33 + }
29 } 34 }
......
...@@ -14,5 +14,12 @@ public interface IConsignmentQueryService { ...@@ -14,5 +14,12 @@ public interface IConsignmentQueryService {
14 */ 14 */
15 ResponseVo findConsignments(ConsignmentQuery query); 15 ResponseVo findConsignments(ConsignmentQuery query);
16 16
17 - ResponseVo findConsignmentInfo(ConsignmentInfoQuery detailQuery); 17 + /**
18 + * @Author mt
19 + * @Description 运单信息查询
20 + * @Date 2024/11/7
21 + * @param consignmentInfoQuery
22 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
23 + */
24 + ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery);
18 } 25 }
......
...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex; ...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
4 import com.fedex.connect.common.dependencies.date.vo.PageResult; 4 import com.fedex.connect.common.dependencies.date.vo.PageResult;
5 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 5 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
6 import com.fedex.connect.common.dependencies.util.Utils; 6 import com.fedex.connect.common.dependencies.util.Utils;
7 +import com.fedex.connect.common.model.biz.Consignment;
7 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 8 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
8 import com.fedex.connect.customer.data.query.ConsignmentInfoQuery; 9 import com.fedex.connect.customer.data.query.ConsignmentInfoQuery;
9 import com.fedex.connect.customer.data.query.ConsignmentQuery; 10 import com.fedex.connect.customer.data.query.ConsignmentQuery;
...@@ -12,6 +13,7 @@ import com.fedex.connect.customer.service.biz.IConsignmentQueryService; ...@@ -12,6 +13,7 @@ import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
12 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
13 14
14 import java.util.List; 15 import java.util.List;
16 +import java.util.Objects;
15 17
16 /** 18 /**
17 * @Author Szl 19 * @Author Szl
...@@ -47,7 +49,26 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign ...@@ -47,7 +49,26 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
47 return ResponseVo.succ(pageResult); 49 return ResponseVo.succ(pageResult);
48 } 50 }
49 51
50 - public ResponseVo findConsignmentInfo(ConsignmentInfoQuery detailQuery){ 52 + /**
51 - return null; 53 + * @Author mt
54 + * @Description 运单信息查询
55 + * 如果运单UUID与登录账号UUID相同，则显示运单、收发件人信息
56 + * 如果运单UUID与登录账号UUID不同，则只显示 运单号、shipperAccount、始发国、目的国
57 + * @Date 2024/11/7
58 + * @param consignmentInfoQuery
59 + * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
60 + */
61 + public ResponseVo findConsignmentInfo(ConsignmentInfoQuery consignmentInfoQuery){
62 + Consignment consignment = consignmentExtRepository.findConsignmentInfo(consignmentInfoQuery);
63 + if(Objects.nonNull(consignment) && !consignment.getUserUuid().equals(consignmentInfoQuery.getUserUuid())){
64 + Consignment consignmentTemp = new Consignment();
65 + consignmentTemp.setId(consignment.getId());
66 + consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
67 + consignmentTemp.setShipperAccount(consignment.getShipperAccount());
68 + consignmentTemp.setOriginCountry(consignment.getOriginCountry());
69 + consignmentTemp.setDestinationCountry(consignment.getDestinationCountry());
70 + consignment = consignmentTemp;
71 + }
72 + return ResponseVo.succ(consignment);
52 } 73 }
53 } 74 }
......
...@@ -20,6 +20,23 @@ spring: ...@@ -20,6 +20,23 @@ spring:
20 basename: message 20 basename: message
21 encoding: utf-8 21 encoding: utf-8
22 22
23 +import:
24 + jwt:
25 + securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
26 + urlWhiteList:
27 + - /biz-customer/auth
28 + - /biz-customer/monitor/ok
29 + - /biz-customer/user/logout
30 + - /biz-customer/swagger-resources
31 + - /biz-customer/webjars
32 + uriWhiteList:
33 + - /biz-customer/swagger-ui.html
34 + - /biz-customer/swagger-ui/*
35 + - /biz-customer/v2/api-docs
36 + - /biz-customer/login.html
37 + expire_1H: 7200
38 + expire_1D: 604800
39 +
23 mybatis: 40 mybatis:
24 mapper-locations: 41 mapper-locations:
25 - classpath*:com/fedex/connect/**/mapper/**/*.xml 42 - classpath*:com/fedex/connect/**/mapper/**/*.xml
......
1 -conl_cus_declare_count_max=單次最多可查詢1000個運單號碼 1 +conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
2 2
3 -#authentication包 3 +#authentication包
4 -auth_exc_no_auth=沒有訪問許可權 4 +auth_exc_no_auth=沒有訪問許可權
5 -auth_exc_no_pass_auth=沒有通過許可權認證 5 +auth_exc_no_pass_auth=沒有通過許可權認證
6 -auth_filter_user_error=登錄身份異常 6 +auth_filter_user_error=登錄身份異常
7 -auth_filter_timeout=登錄超過8小時，請重新登錄 7 +auth_filter_timeout=登錄超過8小時，請重新登錄
8 -auth_filter_stale_dated=登錄已過期 8 +auth_filter_stale_dated=登錄已過期
9 9
10 -enum_res_code_301=登錄身份異常 10 +enum_res_code_301=登錄身份異常
11 -enum_res_code_305=登錄已過期，請重新登錄 11 +enum_res_code_305=登錄已過期，請重新登錄
12 12
13 -enum_res_code_601=不正确，请重新输入 13 +enum_res_code_601=不正确，请重新输入
14 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. 14 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.
15 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. 15 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.
16 16
17 -con_shipperAccount=发货人计费账号 17 +con_shipperAccount=发货人计费账号
18 -con_shipperCountry=始发国 18 +con_shipperCountry=始发国
19 -con_recipientCountry=目的国 19 +con_recipientCountry=目的国
20 20
21 -con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
21 +con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
......
1 -conl_cus_declare_count_max=單次最多可查詢1000個運單號碼 1 +conl_cus_declare_count_max=單次最多可查詢1000個運單號碼
2 2
3 -enum_res_code_301=登錄身份異常 3 +#authentication包
4 -enum_res_code_305=登錄已過期，請重新登錄 4 +auth_exc_no_auth=沒有訪問許可權
5 +auth_exc_no_pass_auth=沒有通過許可權認證
6 +auth_filter_user_error=登錄身份異常
7 +auth_filter_timeout=登錄超過8小時，請重新登錄
8 +auth_filter_stale_dated=登錄已過期
5 9
6 -enum_res_code_601=不正确，请重新输入 10 +enum_res_code_301=登錄身份異常
11 +enum_res_code_305=登錄已過期，請重新登錄
12 +
13 +enum_res_code_601=不正确，请重新输入
7 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. 14 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.
8 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. 15 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.
9 16
10 -con_shipperAccount=发货人计费账号 17 +con_shipperAccount=发货人计费账号
11 -con_shipperCountry=始发国 18 +con_shipperCountry=始发国
12 -con_recipientCountry=目的国 19 +con_recipientCountry=目的国
13 20
14 -con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
21 +con_add_oper=添加运单
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.biz; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.biz;
2 2
3 import com.fedex.connect.common.model.biz.Consignment; 3 import com.fedex.connect.common.model.biz.Consignment;
4 import com.fedex.connect.common.model.biz.ConsignmentExample; 4 import com.fedex.connect.common.model.biz.ConsignmentExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface ConsignmentMapper { 8 public interface ConsignmentMapper {
10 long countByExample(ConsignmentExample example); 9 long countByExample(ConsignmentExample example);
......
1 +package com.fedex.connect.common.dao.biz;
2 +
3 +import com.fedex.connect.common.model.biz.UploadRecord;
4 +import com.fedex.connect.common.model.biz.UploadRecordExample;
5 +import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
7 +
8 +public interface UploadRecordMapper {
9 + long countByExample(UploadRecordExample example);
10 +
11 + int deleteByExample(UploadRecordExample example);
12 +
13 + int deleteByPrimaryKey(Long id);
14 +
15 + int insert(UploadRecord record);
16 +
17 + int insertSelective(UploadRecord record);
18 +
19 + List<UploadRecord> selectByExample(UploadRecordExample example);
20 +
21 + UploadRecord selectByPrimaryKey(Long id);
22 +
23 + int updateByExampleSelective(@Param("record") UploadRecord record, @Param("example") UploadRecordExample example);
24 +
25 + int updateByExample(@Param("record") UploadRecord record, @Param("example") UploadRecordExample example);
26 +
27 + int updateByPrimaryKeySelective(UploadRecord record);
28 +
29 + int updateByPrimaryKey(UploadRecord record);
30 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
18 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 18 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
19 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 19 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
20 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 20 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
21 + <result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" />
21 </resultMap> 22 </resultMap>
22 <sql id="Example_Where_Clause"> 23 <sql id="Example_Where_Clause">
23 <where> 24 <where>
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
80 <sql id="Base_Column_List"> 81 <sql id="Base_Column_List">
81 ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID, 82 ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID,
82 FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 83 FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
83 - MODIFY_USER_ID, MODIFY_USER_NAME 84 + MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID
84 </sql> 85 </sql>
85 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap"> 86 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap">
86 <include refid="OracleDialectPrefix" /> 87 <include refid="OracleDialectPrefix" />
...@@ -124,13 +125,13 @@ ...@@ -124,13 +125,13 @@
124 FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME, 125 FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME,
125 STATUS, CREATE_TIME, CREATE_USER_ID, 126 STATUS, CREATE_TIME, CREATE_USER_ID,
126 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 127 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
127 - MODIFY_USER_NAME) 128 + MODIFY_USER_NAME, UPLOAD_RECORD_ID)
128 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC}, 129 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC},
129 #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, 130 #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR},
130 #{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR}, 131 #{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR},
131 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 132 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
132 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 133 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
133 - #{modifyUserName,jdbcType=VARCHAR}) 134 + #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC})
134 </insert> 135 </insert>
135 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment"> 136 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment">
136 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 137 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -184,6 +185,9 @@ ...@@ -184,6 +185,9 @@
184 <if test="modifyUserName != null"> 185 <if test="modifyUserName != null">
185 MODIFY_USER_NAME, 186 MODIFY_USER_NAME,
186 </if> 187 </if>
188 + <if test="uploadRecordId != null">
189 + UPLOAD_RECORD_ID,
190 + </if>
187 </trim> 191 </trim>
188 <trim prefix="values (" suffix=")" suffixOverrides=","> 192 <trim prefix="values (" suffix=")" suffixOverrides=",">
189 #{id,jdbcType=NUMERIC}, 193 #{id,jdbcType=NUMERIC},
...@@ -232,6 +236,9 @@ ...@@ -232,6 +236,9 @@
232 <if test="modifyUserName != null"> 236 <if test="modifyUserName != null">
233 #{modifyUserName,jdbcType=VARCHAR}, 237 #{modifyUserName,jdbcType=VARCHAR},
234 </if> 238 </if>
239 + <if test="uploadRecordId != null">
240 + #{uploadRecordId,jdbcType=NUMERIC},
241 + </if>
235 </trim> 242 </trim>
236 </insert> 243 </insert>
237 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long"> 244 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long">
...@@ -291,6 +298,9 @@ ...@@ -291,6 +298,9 @@
291 <if test="record.modifyUserName != null"> 298 <if test="record.modifyUserName != null">
292 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 299 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
293 </if> 300 </if>
301 + <if test="record.uploadRecordId != null">
302 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
303 + </if>
294 </set> 304 </set>
295 <if test="_parameter != null"> 305 <if test="_parameter != null">
296 <include refid="Update_By_Example_Where_Clause" /> 306 <include refid="Update_By_Example_Where_Clause" />
...@@ -313,7 +323,8 @@ ...@@ -313,7 +323,8 @@
313 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR}, 323 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
314 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 324 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
315 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 325 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
316 - MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR} 326 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
327 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC}
317 <if test="_parameter != null"> 328 <if test="_parameter != null">
318 <include refid="Update_By_Example_Where_Clause" /> 329 <include refid="Update_By_Example_Where_Clause" />
319 </if> 330 </if>
...@@ -366,6 +377,9 @@ ...@@ -366,6 +377,9 @@
366 <if test="modifyUserName != null"> 377 <if test="modifyUserName != null">
367 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 378 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
368 </if> 379 </if>
380 + <if test="uploadRecordId != null">
381 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
382 + </if>
369 </set> 383 </set>
370 where ID = #{id,jdbcType=NUMERIC} 384 where ID = #{id,jdbcType=NUMERIC}
371 </update> 385 </update>
...@@ -385,7 +399,8 @@ ...@@ -385,7 +399,8 @@
385 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR}, 399 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
386 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 400 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
387 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 401 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
388 - MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR} 402 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
403 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC}
389 where ID = #{id,jdbcType=NUMERIC} 404 where ID = #{id,jdbcType=NUMERIC}
390 </update> 405 </update>
391 <sql id="OracleDialectPrefix"> 406 <sql id="OracleDialectPrefix">
......
...@@ -48,6 +48,10 @@ ...@@ -48,6 +48,10 @@
48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" /> 49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
50 <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" /> 50 <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
51 + <result column="USER_INPUT_SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="userInputShipperAccount" />
52 + <result column="USER_INPUT_ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="userInputOriginCountryId" />
53 + <result column="USER_INPUT_ORIGIN_COUNTRY" jdbcType="VARCHAR" property="userInputOriginCountry" />
54 + <result column="ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="originCountryId" />
51 </resultMap> 55 </resultMap>
52 <sql id="Example_Where_Clause"> 56 <sql id="Example_Where_Clause">
53 <where> 57 <where>
...@@ -116,7 +120,8 @@ ...@@ -116,7 +120,8 @@
116 RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 120 RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME,
117 SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 121 SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
118 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 122 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
119 - DOC_NONDOC_FLAG, USER_UUID 123 + DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_ID,
124 + USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_ID
120 </sql> 125 </sql>
121 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap"> 126 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
122 <include refid="OracleDialectPrefix" /> 127 <include refid="OracleDialectPrefix" />
...@@ -170,7 +175,9 @@ ...@@ -170,7 +175,9 @@
170 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 175 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
171 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, 176 MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID,
172 RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 177 RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME,
173 - DOC_NONDOC_FLAG, USER_UUID) 178 + DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT,
179 + USER_INPUT_ORIGIN_COUNTRY_ID, USER_INPUT_ORIGIN_COUNTRY,
180 + ORIGIN_COUNTRY_ID)
174 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 181 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP},
175 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR}, 182 #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR},
176 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 183 #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR},
...@@ -186,7 +193,9 @@ ...@@ -186,7 +193,9 @@
186 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 193 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
187 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, 194 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC},
188 #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 195 #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR},
189 - #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}) 196 + #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR},
197 + #{userInputOriginCountryId,jdbcType=NUMERIC}, #{userInputOriginCountry,jdbcType=VARCHAR},
198 + #{originCountryId,jdbcType=NUMERIC})
190 </insert> 199 </insert>
191 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment"> 200 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
192 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 201 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -330,6 +339,18 @@ ...@@ -330,6 +339,18 @@
330 <if test="userUuid != null"> 339 <if test="userUuid != null">
331 USER_UUID, 340 USER_UUID,
332 </if> 341 </if>
342 + <if test="userInputShipperAccount != null">
343 + USER_INPUT_SHIPPER_ACCOUNT,
344 + </if>
345 + <if test="userInputOriginCountryId != null">
346 + USER_INPUT_ORIGIN_COUNTRY_ID,
347 + </if>
348 + <if test="userInputOriginCountry != null">
349 + USER_INPUT_ORIGIN_COUNTRY,
350 + </if>
351 + <if test="originCountryId != null">
352 + ORIGIN_COUNTRY_ID,
353 + </if>
333 </trim> 354 </trim>
334 <trim prefix="values (" suffix=")" suffixOverrides=","> 355 <trim prefix="values (" suffix=")" suffixOverrides=",">
335 #{id,jdbcType=NUMERIC}, 356 #{id,jdbcType=NUMERIC},
...@@ -468,6 +489,18 @@ ...@@ -468,6 +489,18 @@
468 <if test="userUuid != null"> 489 <if test="userUuid != null">
469 #{userUuid,jdbcType=VARCHAR}, 490 #{userUuid,jdbcType=VARCHAR},
470 </if> 491 </if>
492 + <if test="userInputShipperAccount != null">
493 + #{userInputShipperAccount,jdbcType=VARCHAR},
494 + </if>
495 + <if test="userInputOriginCountryId != null">
496 + #{userInputOriginCountryId,jdbcType=NUMERIC},
497 + </if>
498 + <if test="userInputOriginCountry != null">
499 + #{userInputOriginCountry,jdbcType=VARCHAR},
500 + </if>
501 + <if test="originCountryId != null">
502 + #{originCountryId,jdbcType=NUMERIC},
503 + </if>
471 </trim> 504 </trim>
472 </insert> 505 </insert>
473 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long"> 506 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long">
...@@ -617,6 +650,18 @@ ...@@ -617,6 +650,18 @@
617 <if test="record.userUuid != null"> 650 <if test="record.userUuid != null">
618 USER_UUID = #{record.userUuid,jdbcType=VARCHAR}, 651 USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
619 </if> 652 </if>
653 + <if test="record.userInputShipperAccount != null">
654 + USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
655 + </if>
656 + <if test="record.userInputOriginCountryId != null">
657 + USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
658 + </if>
659 + <if test="record.userInputOriginCountry != null">
660 + USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
661 + </if>
662 + <if test="record.originCountryId != null">
663 + ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC},
664 + </if>
620 </set> 665 </set>
621 <if test="_parameter != null"> 666 <if test="_parameter != null">
622 <include refid="Update_By_Example_Where_Clause" /> 667 <include refid="Update_By_Example_Where_Clause" />
...@@ -669,7 +714,11 @@ ...@@ -669,7 +714,11 @@
669 STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 714 STATUS_ID = #{record.statusId,jdbcType=NUMERIC},
670 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 715 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
671 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}, 716 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
672 - USER_UUID = #{record.userUuid,jdbcType=VARCHAR} 717 + USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
718 + USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
719 + USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC},
720 + USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
721 + ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC}
673 <if test="_parameter != null"> 722 <if test="_parameter != null">
674 <include refid="Update_By_Example_Where_Clause" /> 723 <include refid="Update_By_Example_Where_Clause" />
675 </if> 724 </if>
...@@ -812,6 +861,18 @@ ...@@ -812,6 +861,18 @@
812 <if test="userUuid != null"> 861 <if test="userUuid != null">
813 USER_UUID = #{userUuid,jdbcType=VARCHAR}, 862 USER_UUID = #{userUuid,jdbcType=VARCHAR},
814 </if> 863 </if>
864 + <if test="userInputShipperAccount != null">
865 + USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
866 + </if>
867 + <if test="userInputOriginCountryId != null">
868 + USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
869 + </if>
870 + <if test="userInputOriginCountry != null">
871 + USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
872 + </if>
873 + <if test="originCountryId != null">
874 + ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC},
875 + </if>
815 </set> 876 </set>
816 where ID = #{id,jdbcType=NUMERIC} 877 where ID = #{id,jdbcType=NUMERIC}
817 </update> 878 </update>
...@@ -861,7 +922,11 @@ ...@@ -861,7 +922,11 @@
861 STATUS_ID = #{statusId,jdbcType=NUMERIC}, 922 STATUS_ID = #{statusId,jdbcType=NUMERIC},
862 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 923 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
863 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}, 924 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
864 - USER_UUID = #{userUuid,jdbcType=VARCHAR} 925 + USER_UUID = #{userUuid,jdbcType=VARCHAR},
926 + USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
927 + USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC},
928 + USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
929 + ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC}
865 where ID = #{id,jdbcType=NUMERIC} 930 where ID = #{id,jdbcType=NUMERIC}
866 </update> 931 </update>
867 <sql id="OracleDialectPrefix"> 932 <sql id="OracleDialectPrefix">
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 +<mapper namespace="com.fedex.connect.common.dao.biz.UploadRecordMapper">
4 + <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.UploadRecord">
5 + <id column="ID" jdbcType="NUMERIC" property="id" />
6 + <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
7 + <result column="UPLOAD_STATUS" jdbcType="VARCHAR" property="uploadStatus" />
8 + <result column="STATUS" jdbcType="NUMERIC" property="status" />
9 + <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
10 + <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
11 + <result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" />
12 + <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
13 + <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
14 + <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
15 + </resultMap>
16 + <sql id="Example_Where_Clause">
17 + <where>
18 + <foreach collection="oredCriteria" item="criteria" separator="or">
19 + <if test="criteria.valid">
20 + <trim prefix="(" prefixOverrides="and" suffix=")">
21 + <foreach collection="criteria.criteria" item="criterion">
22 + <choose>
23 + <when test="criterion.noValue">
24 + and ${criterion.condition}
25 + </when>
26 + <when test="criterion.singleValue">
27 + and ${criterion.condition} #{criterion.value}
28 + </when>
29 + <when test="criterion.betweenValue">
30 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
31 + </when>
32 + <when test="criterion.listValue">
33 + and ${criterion.condition}
34 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
35 + #{listItem}
36 + </foreach>
37 + </when>
38 + </choose>
39 + </foreach>
40 + </trim>
41 + </if>
42 + </foreach>
43 + </where>
44 + </sql>
45 + <sql id="Update_By_Example_Where_Clause">
46 + <where>
47 + <foreach collection="example.oredCriteria" item="criteria" separator="or">
48 + <if test="criteria.valid">
49 + <trim prefix="(" prefixOverrides="and" suffix=")">
50 + <foreach collection="criteria.criteria" item="criterion">
51 + <choose>
52 + <when test="criterion.noValue">
53 + and ${criterion.condition}
54 + </when>
55 + <when test="criterion.singleValue">
56 + and ${criterion.condition} #{criterion.value}
57 + </when>
58 + <when test="criterion.betweenValue">
59 + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
60 + </when>
61 + <when test="criterion.listValue">
62 + and ${criterion.condition}
63 + <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
64 + #{listItem}
65 + </foreach>
66 + </when>
67 + </choose>
68 + </foreach>
69 + </trim>
70 + </if>
71 + </foreach>
72 + </where>
73 + </sql>
74 + <sql id="Base_Column_List">
75 + ID, CONSIGNMENT_ID, UPLOAD_STATUS, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
76 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
77 + </sql>
78 + <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultMap="BaseResultMap">
79 + <include refid="OracleDialectPrefix" />
80 + select
81 + <if test="distinct">
82 + distinct
83 + </if>
84 + 'true' as QUERYID,
85 + <include refid="Base_Column_List" />
86 + from T_BIZ_UPLOAD_RECORD
87 + <if test="_parameter != null">
88 + <include refid="Example_Where_Clause" />
89 + </if>
90 + <if test="orderByClause != null">
91 + order by ${orderByClause}
92 + </if>
93 + <include refid="OracleDialectSuffix" />
94 + </select>
95 + <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
96 + select
97 + <include refid="Base_Column_List" />
98 + from T_BIZ_UPLOAD_RECORD
99 + where ID = #{id,jdbcType=NUMERIC}
100 + </select>
101 + <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
102 + delete from T_BIZ_UPLOAD_RECORD
103 + where ID = #{id,jdbcType=NUMERIC}
104 + </delete>
105 + <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample">
106 + delete from T_BIZ_UPLOAD_RECORD
107 + <if test="_parameter != null">
108 + <include refid="Example_Where_Clause" />
109 + </if>
110 + </delete>
111 + <insert id="insert" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
112 + <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
113 + SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL
114 + </selectKey>
115 + insert into T_BIZ_UPLOAD_RECORD (ID, CONSIGNMENT_ID, UPLOAD_STATUS,
116 + STATUS, CREATE_TIME, CREATE_USER_ID,
117 + CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
118 + MODIFY_USER_NAME)
119 + values (#{id,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, #{uploadStatus,jdbcType=VARCHAR},
120 + #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
121 + #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
122 + #{modifyUserName,jdbcType=VARCHAR})
123 + </insert>
124 + <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
125 + <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
126 + SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL
127 + </selectKey>
128 + insert into T_BIZ_UPLOAD_RECORD
129 + <trim prefix="(" suffix=")" suffixOverrides=",">
130 + ID,
131 + <if test="consignmentId != null">
132 + CONSIGNMENT_ID,
133 + </if>
134 + <if test="uploadStatus != null">
135 + UPLOAD_STATUS,
136 + </if>
137 + <if test="status != null">
138 + STATUS,
139 + </if>
140 + <if test="createTime != null">
141 + CREATE_TIME,
142 + </if>
143 + <if test="createUserId != null">
144 + CREATE_USER_ID,
145 + </if>
146 + <if test="createUserName != null">
147 + CREATE_USER_NAME,
148 + </if>
149 + <if test="modifyTime != null">
150 + MODIFY_TIME,
151 + </if>
152 + <if test="modifyUserId != null">
153 + MODIFY_USER_ID,
154 + </if>
155 + <if test="modifyUserName != null">
156 + MODIFY_USER_NAME,
157 + </if>
158 + </trim>
159 + <trim prefix="values (" suffix=")" suffixOverrides=",">
160 + #{id,jdbcType=NUMERIC},
161 + <if test="consignmentId != null">
162 + #{consignmentId,jdbcType=NUMERIC},
163 + </if>
164 + <if test="uploadStatus != null">
165 + #{uploadStatus,jdbcType=VARCHAR},
166 + </if>
167 + <if test="status != null">
168 + #{status,jdbcType=NUMERIC},
169 + </if>
170 + <if test="createTime != null">
171 + #{createTime,jdbcType=TIMESTAMP},
172 + </if>
173 + <if test="createUserId != null">
174 + #{createUserId,jdbcType=NUMERIC},
175 + </if>
176 + <if test="createUserName != null">
177 + #{createUserName,jdbcType=VARCHAR},
178 + </if>
179 + <if test="modifyTime != null">
180 + #{modifyTime,jdbcType=TIMESTAMP},
181 + </if>
182 + <if test="modifyUserId != null">
183 + #{modifyUserId,jdbcType=NUMERIC},
184 + </if>
185 + <if test="modifyUserName != null">
186 + #{modifyUserName,jdbcType=VARCHAR},
187 + </if>
188 + </trim>
189 + </insert>
190 + <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultType="java.lang.Long">
191 + select count(*) from T_BIZ_UPLOAD_RECORD
192 + <if test="_parameter != null">
193 + <include refid="Example_Where_Clause" />
194 + </if>
195 + </select>
196 + <update id="updateByExampleSelective" parameterType="map">
197 + update T_BIZ_UPLOAD_RECORD
198 + <set>
199 + <if test="record.id != null">
200 + ID = #{record.id,jdbcType=NUMERIC},
201 + </if>
202 + <if test="record.consignmentId != null">
203 + CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
204 + </if>
205 + <if test="record.uploadStatus != null">
206 + UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR},
207 + </if>
208 + <if test="record.status != null">
209 + STATUS = #{record.status,jdbcType=NUMERIC},
210 + </if>
211 + <if test="record.createTime != null">
212 + CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
213 + </if>
214 + <if test="record.createUserId != null">
215 + CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
216 + </if>
217 + <if test="record.createUserName != null">
218 + CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
219 + </if>
220 + <if test="record.modifyTime != null">
221 + MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
222 + </if>
223 + <if test="record.modifyUserId != null">
224 + MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
225 + </if>
226 + <if test="record.modifyUserName != null">
227 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
228 + </if>
229 + </set>
230 + <if test="_parameter != null">
231 + <include refid="Update_By_Example_Where_Clause" />
232 + </if>
233 + </update>
234 + <update id="updateByExample" parameterType="map">
235 + update T_BIZ_UPLOAD_RECORD
236 + set ID = #{record.id,jdbcType=NUMERIC},
237 + CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
238 + UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR},
239 + STATUS = #{record.status,jdbcType=NUMERIC},
240 + CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
241 + CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
242 + CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
243 + MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
244 + MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
245 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}
246 + <if test="_parameter != null">
247 + <include refid="Update_By_Example_Where_Clause" />
248 + </if>
249 + </update>
250 + <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
251 + update T_BIZ_UPLOAD_RECORD
252 + <set>
253 + <if test="consignmentId != null">
254 + CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
255 + </if>
256 + <if test="uploadStatus != null">
257 + UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR},
258 + </if>
259 + <if test="status != null">
260 + STATUS = #{status,jdbcType=NUMERIC},
261 + </if>
262 + <if test="createTime != null">
263 + CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
264 + </if>
265 + <if test="createUserId != null">
266 + CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
267 + </if>
268 + <if test="createUserName != null">
269 + CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
270 + </if>
271 + <if test="modifyTime != null">
272 + MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
273 + </if>
274 + <if test="modifyUserId != null">
275 + MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
276 + </if>
277 + <if test="modifyUserName != null">
278 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
279 + </if>
280 + </set>
281 + where ID = #{id,jdbcType=NUMERIC}
282 + </update>
283 + <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
284 + update T_BIZ_UPLOAD_RECORD
285 + set CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
286 + UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR},
287 + STATUS = #{status,jdbcType=NUMERIC},
288 + CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
289 + CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
290 + CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
291 + MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
292 + MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
293 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}
294 + where ID = #{id,jdbcType=NUMERIC}
295 + </update>
296 + <sql id="OracleDialectPrefix">
297 + <if test="limitStart != null and limitStart>=0">
298 + select * from ( select row_.*, rownum rownum_ from (
299 + </if>
300 + </sql>
301 + <sql id="OracleDialectSuffix">
302 + <if test="limitStart != null and limitStart>=0">
303 + <![CDATA[ ) row_ ) where rownum_ > #{limitStart} and rownum_ <= #{limitStart}+#{limitSize} ]]>
304 + </if>
305 + </sql>
306 +</mapper>
...\ No newline at end of file ...\ No newline at end of file
...@@ -89,6 +89,11 @@ public class Attachment implements Serializable { ...@@ -89,6 +89,11 @@ public class Attachment implements Serializable {
89 */ 89 */
90 private String modifyUserName; 90 private String modifyUserName;
91 91
92 + /**
93 + * 用户上传记录表ID
94 + */
95 + private Long uploadRecordId;
96 +
92 private static final long serialVersionUID = 1L; 97 private static final long serialVersionUID = 1L;
93 98
94 public Long getId() { 99 public Long getId() {
...@@ -219,6 +224,14 @@ public class Attachment implements Serializable { ...@@ -219,6 +224,14 @@ public class Attachment implements Serializable {
219 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 224 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
220 } 225 }
221 226
227 + public Long getUploadRecordId() {
228 + return uploadRecordId;
229 + }
230 +
231 + public void setUploadRecordId(Long uploadRecordId) {
232 + this.uploadRecordId = uploadRecordId;
233 + }
234 +
222 @Override 235 @Override
223 public String toString() { 236 public String toString() {
224 StringBuilder sb = new StringBuilder(); 237 StringBuilder sb = new StringBuilder();
...@@ -241,6 +254,7 @@ public class Attachment implements Serializable { ...@@ -241,6 +254,7 @@ public class Attachment implements Serializable {
241 sb.append(", modifyTime=").append(modifyTime); 254 sb.append(", modifyTime=").append(modifyTime);
242 sb.append(", modifyUserId=").append(modifyUserId); 255 sb.append(", modifyUserId=").append(modifyUserId);
243 sb.append(", modifyUserName=").append(modifyUserName); 256 sb.append(", modifyUserName=").append(modifyUserName);
257 + sb.append(", uploadRecordId=").append(uploadRecordId);
244 sb.append(", serialVersionUID=").append(serialVersionUID); 258 sb.append(", serialVersionUID=").append(serialVersionUID);
245 sb.append("]"); 259 sb.append("]");
246 return sb.toString(); 260 return sb.toString();
......
...@@ -1154,6 +1154,66 @@ public class AttachmentExample { ...@@ -1154,6 +1154,66 @@ public class AttachmentExample {
1154 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName"); 1154 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
1155 return (Criteria) this; 1155 return (Criteria) this;
1156 } 1156 }
1157 +
1158 + public Criteria andUploadRecordIdIsNull() {
1159 + addCriterion("UPLOAD_RECORD_ID is null");
1160 + return (Criteria) this;
1161 + }
1162 +
1163 + public Criteria andUploadRecordIdIsNotNull() {
1164 + addCriterion("UPLOAD_RECORD_ID is not null");
1165 + return (Criteria) this;
1166 + }
1167 +
1168 + public Criteria andUploadRecordIdEqualTo(Long value) {
1169 + addCriterion("UPLOAD_RECORD_ID =", value, "uploadRecordId");
1170 + return (Criteria) this;
1171 + }
1172 +
1173 + public Criteria andUploadRecordIdNotEqualTo(Long value) {
1174 + addCriterion("UPLOAD_RECORD_ID <>", value, "uploadRecordId");
1175 + return (Criteria) this;
1176 + }
1177 +
1178 + public Criteria andUploadRecordIdGreaterThan(Long value) {
1179 + addCriterion("UPLOAD_RECORD_ID >", value, "uploadRecordId");
1180 + return (Criteria) this;
1181 + }
1182 +
1183 + public Criteria andUploadRecordIdGreaterThanOrEqualTo(Long value) {
1184 + addCriterion("UPLOAD_RECORD_ID >=", value, "uploadRecordId");
1185 + return (Criteria) this;
1186 + }
1187 +
1188 + public Criteria andUploadRecordIdLessThan(Long value) {
1189 + addCriterion("UPLOAD_RECORD_ID <", value, "uploadRecordId");
1190 + return (Criteria) this;
1191 + }
1192 +
1193 + public Criteria andUploadRecordIdLessThanOrEqualTo(Long value) {
1194 + addCriterion("UPLOAD_RECORD_ID <=", value, "uploadRecordId");
1195 + return (Criteria) this;
1196 + }
1197 +
1198 + public Criteria andUploadRecordIdIn(List<Long> values) {
1199 + addCriterion("UPLOAD_RECORD_ID in", values, "uploadRecordId");
1200 + return (Criteria) this;
1201 + }
1202 +
1203 + public Criteria andUploadRecordIdNotIn(List<Long> values) {
1204 + addCriterion("UPLOAD_RECORD_ID not in", values, "uploadRecordId");
1205 + return (Criteria) this;
1206 + }
1207 +
1208 + public Criteria andUploadRecordIdBetween(Long value1, Long value2) {
1209 + addCriterion("UPLOAD_RECORD_ID between", value1, value2, "uploadRecordId");
1210 + return (Criteria) this;
1211 + }
1212 +
1213 + public Criteria andUploadRecordIdNotBetween(Long value1, Long value2) {
1214 + addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId");
1215 + return (Criteria) this;
1216 + }
1157 } 1217 }
1158 1218
1159 public static class Criteria extends GeneratedCriteria { 1219 public static class Criteria extends GeneratedCriteria {
......
...@@ -240,6 +240,28 @@ public class Consignment implements Serializable { ...@@ -240,6 +240,28 @@ public class Consignment implements Serializable {
240 */ 240 */
241 private String userUuid; 241 private String userUuid;
242 242
243 + /**
244 + * 用户录入发货人计费账号
245 + */
246 + private String userInputShipperAccount;
247 +
248 + /**
249 + * 用户录入原产国全称
250 + */
251 + private Long userInputOriginCountryId;
252 +
253 + /**
254 + * 用户录入原产国全称ID，
255 +关联数据字典表。指定字典目录CODE：COUNTRY
256 + */
257 + private String userInputOriginCountry;
258 +
259 + /**
260 + * 原产国全称ID，
261 +关联数据字典表。指定字典目录CODE：COUNTRY
262 + */
263 + private Long originCountryId;
264 +
243 private static final long serialVersionUID = 1L; 265 private static final long serialVersionUID = 1L;
244 266
245 public Long getId() { 267 public Long getId() {
...@@ -610,6 +632,38 @@ public class Consignment implements Serializable { ...@@ -610,6 +632,38 @@ public class Consignment implements Serializable {
610 this.userUuid = userUuid == null ? null : userUuid.trim(); 632 this.userUuid = userUuid == null ? null : userUuid.trim();
611 } 633 }
612 634
635 + public String getUserInputShipperAccount() {
636 + return userInputShipperAccount;
637 + }
638 +
639 + public void setUserInputShipperAccount(String userInputShipperAccount) {
640 + this.userInputShipperAccount = userInputShipperAccount == null ? null : userInputShipperAccount.trim();
641 + }
642 +
643 + public Long getUserInputOriginCountryId() {
644 + return userInputOriginCountryId;
645 + }
646 +
647 + public void setUserInputOriginCountryId(Long userInputOriginCountryId) {
648 + this.userInputOriginCountryId = userInputOriginCountryId;
649 + }
650 +
651 + public String getUserInputOriginCountry() {
652 + return userInputOriginCountry;
653 + }
654 +
655 + public void setUserInputOriginCountry(String userInputOriginCountry) {
656 + this.userInputOriginCountry = userInputOriginCountry == null ? null : userInputOriginCountry.trim();
657 + }
658 +
659 + public Long getOriginCountryId() {
660 + return originCountryId;
661 + }
662 +
663 + public void setOriginCountryId(Long originCountryId) {
664 + this.originCountryId = originCountryId;
665 + }
666 +
613 @Override 667 @Override
614 public String toString() { 668 public String toString() {
615 StringBuilder sb = new StringBuilder(); 669 StringBuilder sb = new StringBuilder();
...@@ -662,6 +716,10 @@ public class Consignment implements Serializable { ...@@ -662,6 +716,10 @@ public class Consignment implements Serializable {
662 sb.append(", statusName=").append(statusName); 716 sb.append(", statusName=").append(statusName);
663 sb.append(", docNondocFlag=").append(docNondocFlag); 717 sb.append(", docNondocFlag=").append(docNondocFlag);
664 sb.append(", userUuid=").append(userUuid); 718 sb.append(", userUuid=").append(userUuid);
719 + sb.append(", userInputShipperAccount=").append(userInputShipperAccount);
720 + sb.append(", userInputOriginCountryId=").append(userInputOriginCountryId);
721 + sb.append(", userInputOriginCountry=").append(userInputOriginCountry);
722 + sb.append(", originCountryId=").append(originCountryId);
665 sb.append(", serialVersionUID=").append(serialVersionUID); 723 sb.append(", serialVersionUID=").append(serialVersionUID);
666 sb.append("]"); 724 sb.append("]");
667 return sb.toString(); 725 return sb.toString();
......
...@@ -3195,6 +3195,266 @@ public class ConsignmentExample { ...@@ -3195,6 +3195,266 @@ public class ConsignmentExample {
3195 addCriterion("USER_UUID not between", value1, value2, "userUuid"); 3195 addCriterion("USER_UUID not between", value1, value2, "userUuid");
3196 return (Criteria) this; 3196 return (Criteria) this;
3197 } 3197 }
3198 +
3199 + public Criteria andUserInputShipperAccountIsNull() {
3200 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT is null");
3201 + return (Criteria) this;
3202 + }
3203 +
3204 + public Criteria andUserInputShipperAccountIsNotNull() {
3205 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT is not null");
3206 + return (Criteria) this;
3207 + }
3208 +
3209 + public Criteria andUserInputShipperAccountEqualTo(String value) {
3210 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT =", value, "userInputShipperAccount");
3211 + return (Criteria) this;
3212 + }
3213 +
3214 + public Criteria andUserInputShipperAccountNotEqualTo(String value) {
3215 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT <>", value, "userInputShipperAccount");
3216 + return (Criteria) this;
3217 + }
3218 +
3219 + public Criteria andUserInputShipperAccountGreaterThan(String value) {
3220 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT >", value, "userInputShipperAccount");
3221 + return (Criteria) this;
3222 + }
3223 +
3224 + public Criteria andUserInputShipperAccountGreaterThanOrEqualTo(String value) {
3225 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT >=", value, "userInputShipperAccount");
3226 + return (Criteria) this;
3227 + }
3228 +
3229 + public Criteria andUserInputShipperAccountLessThan(String value) {
3230 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT <", value, "userInputShipperAccount");
3231 + return (Criteria) this;
3232 + }
3233 +
3234 + public Criteria andUserInputShipperAccountLessThanOrEqualTo(String value) {
3235 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT <=", value, "userInputShipperAccount");
3236 + return (Criteria) this;
3237 + }
3238 +
3239 + public Criteria andUserInputShipperAccountLike(String value) {
3240 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT like", value, "userInputShipperAccount");
3241 + return (Criteria) this;
3242 + }
3243 +
3244 + public Criteria andUserInputShipperAccountNotLike(String value) {
3245 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT not like", value, "userInputShipperAccount");
3246 + return (Criteria) this;
3247 + }
3248 +
3249 + public Criteria andUserInputShipperAccountIn(List<String> values) {
3250 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT in", values, "userInputShipperAccount");
3251 + return (Criteria) this;
3252 + }
3253 +
3254 + public Criteria andUserInputShipperAccountNotIn(List<String> values) {
3255 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT not in", values, "userInputShipperAccount");
3256 + return (Criteria) this;
3257 + }
3258 +
3259 + public Criteria andUserInputShipperAccountBetween(String value1, String value2) {
3260 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT between", value1, value2, "userInputShipperAccount");
3261 + return (Criteria) this;
3262 + }
3263 +
3264 + public Criteria andUserInputShipperAccountNotBetween(String value1, String value2) {
3265 + addCriterion("USER_INPUT_SHIPPER_ACCOUNT not between", value1, value2, "userInputShipperAccount");
3266 + return (Criteria) this;
3267 + }
3268 +
3269 + public Criteria andUserInputOriginCountryIdIsNull() {
3270 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is null");
3271 + return (Criteria) this;
3272 + }
3273 +
3274 + public Criteria andUserInputOriginCountryIdIsNotNull() {
3275 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is not null");
3276 + return (Criteria) this;
3277 + }
3278 +
3279 + public Criteria andUserInputOriginCountryIdEqualTo(Long value) {
3280 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID =", value, "userInputOriginCountryId");
3281 + return (Criteria) this;
3282 + }
3283 +
3284 + public Criteria andUserInputOriginCountryIdNotEqualTo(Long value) {
3285 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <>", value, "userInputOriginCountryId");
3286 + return (Criteria) this;
3287 + }
3288 +
3289 + public Criteria andUserInputOriginCountryIdGreaterThan(Long value) {
3290 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >", value, "userInputOriginCountryId");
3291 + return (Criteria) this;
3292 + }
3293 +
3294 + public Criteria andUserInputOriginCountryIdGreaterThanOrEqualTo(Long value) {
3295 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >=", value, "userInputOriginCountryId");
3296 + return (Criteria) this;
3297 + }
3298 +
3299 + public Criteria andUserInputOriginCountryIdLessThan(Long value) {
3300 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <", value, "userInputOriginCountryId");
3301 + return (Criteria) this;
3302 + }
3303 +
3304 + public Criteria andUserInputOriginCountryIdLessThanOrEqualTo(Long value) {
3305 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <=", value, "userInputOriginCountryId");
3306 + return (Criteria) this;
3307 + }
3308 +
3309 + public Criteria andUserInputOriginCountryIdIn(List<Long> values) {
3310 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID in", values, "userInputOriginCountryId");
3311 + return (Criteria) this;
3312 + }
3313 +
3314 + public Criteria andUserInputOriginCountryIdNotIn(List<Long> values) {
3315 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not in", values, "userInputOriginCountryId");
3316 + return (Criteria) this;
3317 + }
3318 +
3319 + public Criteria andUserInputOriginCountryIdBetween(Long value1, Long value2) {
3320 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID between", value1, value2, "userInputOriginCountryId");
3321 + return (Criteria) this;
3322 + }
3323 +
3324 + public Criteria andUserInputOriginCountryIdNotBetween(Long value1, Long value2) {
3325 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not between", value1, value2, "userInputOriginCountryId");
3326 + return (Criteria) this;
3327 + }
3328 +
3329 + public Criteria andUserInputOriginCountryIsNull() {
3330 + addCriterion("USER_INPUT_ORIGIN_COUNTRY is null");
3331 + return (Criteria) this;
3332 + }
3333 +
3334 + public Criteria andUserInputOriginCountryIsNotNull() {
3335 + addCriterion("USER_INPUT_ORIGIN_COUNTRY is not null");
3336 + return (Criteria) this;
3337 + }
3338 +
3339 + public Criteria andUserInputOriginCountryEqualTo(String value) {
3340 + addCriterion("USER_INPUT_ORIGIN_COUNTRY =", value, "userInputOriginCountry");
3341 + return (Criteria) this;
3342 + }
3343 +
3344 + public Criteria andUserInputOriginCountryNotEqualTo(String value) {
3345 + addCriterion("USER_INPUT_ORIGIN_COUNTRY <>", value, "userInputOriginCountry");
3346 + return (Criteria) this;
3347 + }
3348 +
3349 + public Criteria andUserInputOriginCountryGreaterThan(String value) {
3350 + addCriterion("USER_INPUT_ORIGIN_COUNTRY >", value, "userInputOriginCountry");
3351 + return (Criteria) this;
3352 + }
3353 +
3354 + public Criteria andUserInputOriginCountryGreaterThanOrEqualTo(String value) {
3355 + addCriterion("USER_INPUT_ORIGIN_COUNTRY >=", value, "userInputOriginCountry");
3356 + return (Criteria) this;
3357 + }
3358 +
3359 + public Criteria andUserInputOriginCountryLessThan(String value) {
3360 + addCriterion("USER_INPUT_ORIGIN_COUNTRY <", value, "userInputOriginCountry");
3361 + return (Criteria) this;
3362 + }
3363 +
3364 + public Criteria andUserInputOriginCountryLessThanOrEqualTo(String value) {
3365 + addCriterion("USER_INPUT_ORIGIN_COUNTRY <=", value, "userInputOriginCountry");
3366 + return (Criteria) this;
3367 + }
3368 +
3369 + public Criteria andUserInputOriginCountryLike(String value) {
3370 + addCriterion("USER_INPUT_ORIGIN_COUNTRY like", value, "userInputOriginCountry");
3371 + return (Criteria) this;
3372 + }
3373 +
3374 + public Criteria andUserInputOriginCountryNotLike(String value) {
3375 + addCriterion("USER_INPUT_ORIGIN_COUNTRY not like", value, "userInputOriginCountry");
3376 + return (Criteria) this;
3377 + }
3378 +
3379 + public Criteria andUserInputOriginCountryIn(List<String> values) {
3380 + addCriterion("USER_INPUT_ORIGIN_COUNTRY in", values, "userInputOriginCountry");
3381 + return (Criteria) this;
3382 + }
3383 +
3384 + public Criteria andUserInputOriginCountryNotIn(List<String> values) {
3385 + addCriterion("USER_INPUT_ORIGIN_COUNTRY not in", values, "userInputOriginCountry");
3386 + return (Criteria) this;
3387 + }
3388 +
3389 + public Criteria andUserInputOriginCountryBetween(String value1, String value2) {
3390 + addCriterion("USER_INPUT_ORIGIN_COUNTRY between", value1, value2, "userInputOriginCountry");
3391 + return (Criteria) this;
3392 + }
3393 +
3394 + public Criteria andUserInputOriginCountryNotBetween(String value1, String value2) {
3395 + addCriterion("USER_INPUT_ORIGIN_COUNTRY not between", value1, value2, "userInputOriginCountry");
3396 + return (Criteria) this;
3397 + }
3398 +
3399 + public Criteria andOriginCountryIdIsNull() {
3400 + addCriterion("ORIGIN_COUNTRY_ID is null");
3401 + return (Criteria) this;
3402 + }
3403 +
3404 + public Criteria andOriginCountryIdIsNotNull() {
3405 + addCriterion("ORIGIN_COUNTRY_ID is not null");
3406 + return (Criteria) this;
3407 + }
3408 +
3409 + public Criteria andOriginCountryIdEqualTo(Long value) {
3410 + addCriterion("ORIGIN_COUNTRY_ID =", value, "originCountryId");
3411 + return (Criteria) this;
3412 + }
3413 +
3414 + public Criteria andOriginCountryIdNotEqualTo(Long value) {
3415 + addCriterion("ORIGIN_COUNTRY_ID <>", value, "originCountryId");
3416 + return (Criteria) this;
3417 + }
3418 +
3419 + public Criteria andOriginCountryIdGreaterThan(Long value) {
3420 + addCriterion("ORIGIN_COUNTRY_ID >", value, "originCountryId");
3421 + return (Criteria) this;
3422 + }
3423 +
3424 + public Criteria andOriginCountryIdGreaterThanOrEqualTo(Long value) {
3425 + addCriterion("ORIGIN_COUNTRY_ID >=", value, "originCountryId");
3426 + return (Criteria) this;
3427 + }
3428 +
3429 + public Criteria andOriginCountryIdLessThan(Long value) {
3430 + addCriterion("ORIGIN_COUNTRY_ID <", value, "originCountryId");
3431 + return (Criteria) this;
3432 + }
3433 +
3434 + public Criteria andOriginCountryIdLessThanOrEqualTo(Long value) {
3435 + addCriterion("ORIGIN_COUNTRY_ID <=", value, "originCountryId");
3436 + return (Criteria) this;
3437 + }
3438 +
3439 + public Criteria andOriginCountryIdIn(List<Long> values) {
3440 + addCriterion("ORIGIN_COUNTRY_ID in", values, "originCountryId");
3441 + return (Criteria) this;
3442 + }
3443 +
3444 + public Criteria andOriginCountryIdNotIn(List<Long> values) {
3445 + addCriterion("ORIGIN_COUNTRY_ID not in", values, "originCountryId");
3446 + return (Criteria) this;
3447 + }
3448 +
3449 + public Criteria andOriginCountryIdBetween(Long value1, Long value2) {
3450 + addCriterion("ORIGIN_COUNTRY_ID between", value1, value2, "originCountryId");
3451 + return (Criteria) this;
3452 + }
3453 +
3454 + public Criteria andOriginCountryIdNotBetween(Long value1, Long value2) {
3455 + addCriterion("ORIGIN_COUNTRY_ID not between", value1, value2, "originCountryId");
3456 + return (Criteria) this;
3457 + }
3198 } 3458 }
3199 3459
3200 public static class Criteria extends GeneratedCriteria { 3460 public static class Criteria extends GeneratedCriteria {
......
1 +package com.fedex.connect.common.model.biz;
2 +
3 +import java.io.Serializable;
4 +import java.util.Date;
5 +
6 +/**
7 + * DESC: 用户上传记录表
8 + * TABLE: T_BIZ_UPLOAD_RECORD
9 + */
10 +public class UploadRecord implements Serializable {
11 + /**
12 + * ID,自动增加
13 + */
14 + private Long id;
15 +
16 + /**
17 + * 运单ID，关联运单表ID
18 + */
19 + private Long consignmentId;
20 +
21 + /**
22 + * 上传状态(uploaded)
23 + */
24 + private String uploadStatus;
25 +
26 + /**
27 + * 状态(0：无效、1：有效)
28 + */
29 + private Long status;
30 +
31 + /**
32 + * 创建时间
33 + */
34 + private Date createTime;
35 +
36 + /**
37 + * 创建人ID，关联用户表ID
38 + */
39 + private Long createUserId;
40 +
41 + /**
42 + * 创建人名称
43 + */
44 + private String createUserName;
45 +
46 + /**
47 + * 修改时间
48 + */
49 + private Date modifyTime;
50 +
51 + /**
52 + * 修改人ID，关联用户表ID
53 + */
54 + private Long modifyUserId;
55 +
56 + /**
57 + * 修改人名称
58 + */
59 + private String modifyUserName;
60 +
61 + private static final long serialVersionUID = 1L;
62 +
63 + public Long getId() {
64 + return id;
65 + }
66 +
67 + public void setId(Long id) {
68 + this.id = id;
69 + }
70 +
71 + public Long getConsignmentId() {
72 + return consignmentId;
73 + }
74 +
75 + public void setConsignmentId(Long consignmentId) {
76 + this.consignmentId = consignmentId;
77 + }
78 +
79 + public String getUploadStatus() {
80 + return uploadStatus;
81 + }
82 +
83 + public void setUploadStatus(String uploadStatus) {
84 + this.uploadStatus = uploadStatus == null ? null : uploadStatus.trim();
85 + }
86 +
87 + public Long getStatus() {
88 + return status;
89 + }
90 +
91 + public void setStatus(Long status) {
92 + this.status = status;
93 + }
94 +
95 + public Date getCreateTime() {
96 + return createTime;
97 + }
98 +
99 + public void setCreateTime(Date createTime) {
100 + this.createTime = createTime;
101 + }
102 +
103 + public Long getCreateUserId() {
104 + return createUserId;
105 + }
106 +
107 + public void setCreateUserId(Long createUserId) {
108 + this.createUserId = createUserId;
109 + }
110 +
111 + public String getCreateUserName() {
112 + return createUserName;
113 + }
114 +
115 + public void setCreateUserName(String createUserName) {
116 + this.createUserName = createUserName == null ? null : createUserName.trim();
117 + }
118 +
119 + public Date getModifyTime() {
120 + return modifyTime;
121 + }
122 +
123 + public void setModifyTime(Date modifyTime) {
124 + this.modifyTime = modifyTime;
125 + }
126 +
127 + public Long getModifyUserId() {
128 + return modifyUserId;
129 + }
130 +
131 + public void setModifyUserId(Long modifyUserId) {
132 + this.modifyUserId = modifyUserId;
133 + }
134 +
135 + public String getModifyUserName() {
136 + return modifyUserName;
137 + }
138 +
139 + public void setModifyUserName(String modifyUserName) {
140 + this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
141 + }
142 +
143 + @Override
144 + public String toString() {
145 + StringBuilder sb = new StringBuilder();
146 + sb.append(getClass().getSimpleName());
147 + sb.append(" [");
148 + sb.append("Hash = ").append(hashCode());
149 + sb.append(", id=").append(id);
150 + sb.append(", consignmentId=").append(consignmentId);
151 + sb.append(", uploadStatus=").append(uploadStatus);
152 + sb.append(", status=").append(status);
153 + sb.append(", createTime=").append(createTime);
154 + sb.append(", createUserId=").append(createUserId);
155 + sb.append(", createUserName=").append(createUserName);
156 + sb.append(", modifyTime=").append(modifyTime);
157 + sb.append(", modifyUserId=").append(modifyUserId);
158 + sb.append(", modifyUserName=").append(modifyUserName);
159 + sb.append(", serialVersionUID=").append(serialVersionUID);
160 + sb.append("]");
161 + return sb.toString();
162 + }
163 +}
...\ No newline at end of file ...\ No newline at end of file
1 +package com.fedex.connect.common.model.biz;
2 +
3 +import java.util.ArrayList;
4 +import java.util.Date;
5 +import java.util.List;
6 +
7 +public class UploadRecordExample {
8 + protected String orderByClause;
9 +
10 + protected boolean distinct;
11 +
12 + protected List<Criteria> oredCriteria;
13 +
14 + protected Integer limitStart;
15 +
16 + protected Integer limitSize;
17 +
18 + public UploadRecordExample() {
19 + oredCriteria = new ArrayList<Criteria>();
20 + }
21 +
22 + public void setOrderByClause(String orderByClause) {
23 + this.orderByClause = orderByClause;
24 + }
25 +
26 + public String getOrderByClause() {
27 + return orderByClause;
28 + }
29 +
30 + public void setDistinct(boolean distinct) {
31 + this.distinct = distinct;
32 + }
33 +
34 + public boolean isDistinct() {
35 + return distinct;
36 + }
37 +
38 + public List<Criteria> getOredCriteria() {
39 + return oredCriteria;
40 + }
41 +
42 + public void or(Criteria criteria) {
43 + oredCriteria.add(criteria);
44 + }
45 +
46 + public Criteria or() {
47 + Criteria criteria = createCriteriaInternal();
48 + oredCriteria.add(criteria);
49 + return criteria;
50 + }
51 +
52 + public Criteria createCriteria() {
53 + Criteria criteria = createCriteriaInternal();
54 + if (oredCriteria.size() == 0) {
55 + oredCriteria.add(criteria);
56 + }
57 + return criteria;
58 + }
59 +
60 + protected Criteria createCriteriaInternal() {
61 + Criteria criteria = new Criteria();
62 + return criteria;
63 + }
64 +
65 + public void clear() {
66 + oredCriteria.clear();
67 + orderByClause = null;
68 + distinct = false;
69 + }
70 +
71 + public void setLimitStart(Integer limitStart) {
72 + this.limitStart=limitStart;
73 + }
74 +
75 + public Integer getLimitStart() {
76 + return limitStart;
77 + }
78 +
79 + public void setLimitSize(Integer limitSize) {
80 + this.limitSize=limitSize;
81 + }
82 +
83 + public Integer getLimitSize() {
84 + return limitSize;
85 + }
86 +
87 + protected abstract static class GeneratedCriteria {
88 + protected List<Criterion> criteria;
89 +
90 + protected GeneratedCriteria() {
91 + super();
92 + criteria = new ArrayList<Criterion>();
93 + }
94 +
95 + public boolean isValid() {
96 + return criteria.size() > 0;
97 + }
98 +
99 + public List<Criterion> getAllCriteria() {
100 + return criteria;
101 + }
102 +
103 + public List<Criterion> getCriteria() {
104 + return criteria;
105 + }
106 +
107 + protected void addCriterion(String condition) {
108 + if (condition == null) {
109 + throw new RuntimeException("Value for condition cannot be null");
110 + }
111 + criteria.add(new Criterion(condition));
112 + }
113 +
114 + protected void addCriterion(String condition, Object value, String property) {
115 + if (value == null) {
116 + throw new RuntimeException("Value for " + property + " cannot be null");
117 + }
118 + criteria.add(new Criterion(condition, value));
119 + }
120 +
121 + protected void addCriterion(String condition, Object value1, Object value2, String property) {
122 + if (value1 == null || value2 == null) {
123 + throw new RuntimeException("Between values for " + property + " cannot be null");
124 + }
125 + criteria.add(new Criterion(condition, value1, value2));
126 + }
127 +
128 + public Criteria andIdIsNull() {
129 + addCriterion("ID is null");
130 + return (Criteria) this;
131 + }
132 +
133 + public Criteria andIdIsNotNull() {
134 + addCriterion("ID is not null");
135 + return (Criteria) this;
136 + }
137 +
138 + public Criteria andIdEqualTo(Long value) {
139 + addCriterion("ID =", value, "id");
140 + return (Criteria) this;
141 + }
142 +
143 + public Criteria andIdNotEqualTo(Long value) {
144 + addCriterion("ID <>", value, "id");
145 + return (Criteria) this;
146 + }
147 +
148 + public Criteria andIdGreaterThan(Long value) {
149 + addCriterion("ID >", value, "id");
150 + return (Criteria) this;
151 + }
152 +
153 + public Criteria andIdGreaterThanOrEqualTo(Long value) {
154 + addCriterion("ID >=", value, "id");
155 + return (Criteria) this;
156 + }
157 +
158 + public Criteria andIdLessThan(Long value) {
159 + addCriterion("ID <", value, "id");
160 + return (Criteria) this;
161 + }
162 +
163 + public Criteria andIdLessThanOrEqualTo(Long value) {
164 + addCriterion("ID <=", value, "id");
165 + return (Criteria) this;
166 + }
167 +
168 + public Criteria andIdIn(List<Long> values) {
169 + addCriterion("ID in", values, "id");
170 + return (Criteria) this;
171 + }
172 +
173 + public Criteria andIdNotIn(List<Long> values) {
174 + addCriterion("ID not in", values, "id");
175 + return (Criteria) this;
176 + }
177 +
178 + public Criteria andIdBetween(Long value1, Long value2) {
179 + addCriterion("ID between", value1, value2, "id");
180 + return (Criteria) this;
181 + }
182 +
183 + public Criteria andIdNotBetween(Long value1, Long value2) {
184 + addCriterion("ID not between", value1, value2, "id");
185 + return (Criteria) this;
186 + }
187 +
188 + public Criteria andConsignmentIdIsNull() {
189 + addCriterion("CONSIGNMENT_ID is null");
190 + return (Criteria) this;
191 + }
192 +
193 + public Criteria andConsignmentIdIsNotNull() {
194 + addCriterion("CONSIGNMENT_ID is not null");
195 + return (Criteria) this;
196 + }
197 +
198 + public Criteria andConsignmentIdEqualTo(Long value) {
199 + addCriterion("CONSIGNMENT_ID =", value, "consignmentId");
200 + return (Criteria) this;
201 + }
202 +
203 + public Criteria andConsignmentIdNotEqualTo(Long value) {
204 + addCriterion("CONSIGNMENT_ID <>", value, "consignmentId");
205 + return (Criteria) this;
206 + }
207 +
208 + public Criteria andConsignmentIdGreaterThan(Long value) {
209 + addCriterion("CONSIGNMENT_ID >", value, "consignmentId");
210 + return (Criteria) this;
211 + }
212 +
213 + public Criteria andConsignmentIdGreaterThanOrEqualTo(Long value) {
214 + addCriterion("CONSIGNMENT_ID >=", value, "consignmentId");
215 + return (Criteria) this;
216 + }
217 +
218 + public Criteria andConsignmentIdLessThan(Long value) {
219 + addCriterion("CONSIGNMENT_ID <", value, "consignmentId");
220 + return (Criteria) this;
221 + }
222 +
223 + public Criteria andConsignmentIdLessThanOrEqualTo(Long value) {
224 + addCriterion("CONSIGNMENT_ID <=", value, "consignmentId");
225 + return (Criteria) this;
226 + }
227 +
228 + public Criteria andConsignmentIdIn(List<Long> values) {
229 + addCriterion("CONSIGNMENT_ID in", values, "consignmentId");
230 + return (Criteria) this;
231 + }
232 +
233 + public Criteria andConsignmentIdNotIn(List<Long> values) {
234 + addCriterion("CONSIGNMENT_ID not in", values, "consignmentId");
235 + return (Criteria) this;
236 + }
237 +
238 + public Criteria andConsignmentIdBetween(Long value1, Long value2) {
239 + addCriterion("CONSIGNMENT_ID between", value1, value2, "consignmentId");
240 + return (Criteria) this;
241 + }
242 +
243 + public Criteria andConsignmentIdNotBetween(Long value1, Long value2) {
244 + addCriterion("CONSIGNMENT_ID not between", value1, value2, "consignmentId");
245 + return (Criteria) this;
246 + }
247 +
248 + public Criteria andUploadStatusIsNull() {
249 + addCriterion("UPLOAD_STATUS is null");
250 + return (Criteria) this;
251 + }
252 +
253 + public Criteria andUploadStatusIsNotNull() {
254 + addCriterion("UPLOAD_STATUS is not null");
255 + return (Criteria) this;
256 + }
257 +
258 + public Criteria andUploadStatusEqualTo(String value) {
259 + addCriterion("UPLOAD_STATUS =", value, "uploadStatus");
260 + return (Criteria) this;
261 + }
262 +
263 + public Criteria andUploadStatusNotEqualTo(String value) {
264 + addCriterion("UPLOAD_STATUS <>", value, "uploadStatus");
265 + return (Criteria) this;
266 + }
267 +
268 + public Criteria andUploadStatusGreaterThan(String value) {
269 + addCriterion("UPLOAD_STATUS >", value, "uploadStatus");
270 + return (Criteria) this;
271 + }
272 +
273 + public Criteria andUploadStatusGreaterThanOrEqualTo(String value) {
274 + addCriterion("UPLOAD_STATUS >=", value, "uploadStatus");
275 + return (Criteria) this;
276 + }
277 +
278 + public Criteria andUploadStatusLessThan(String value) {
279 + addCriterion("UPLOAD_STATUS <", value, "uploadStatus");
280 + return (Criteria) this;
281 + }
282 +
283 + public Criteria andUploadStatusLessThanOrEqualTo(String value) {
284 + addCriterion("UPLOAD_STATUS <=", value, "uploadStatus");
285 + return (Criteria) this;
286 + }
287 +
288 + public Criteria andUploadStatusLike(String value) {
289 + addCriterion("UPLOAD_STATUS like", value, "uploadStatus");
290 + return (Criteria) this;
291 + }
292 +
293 + public Criteria andUploadStatusNotLike(String value) {
294 + addCriterion("UPLOAD_STATUS not like", value, "uploadStatus");
295 + return (Criteria) this;
296 + }
297 +
298 + public Criteria andUploadStatusIn(List<String> values) {
299 + addCriterion("UPLOAD_STATUS in", values, "uploadStatus");
300 + return (Criteria) this;
301 + }
302 +
303 + public Criteria andUploadStatusNotIn(List<String> values) {
304 + addCriterion("UPLOAD_STATUS not in", values, "uploadStatus");
305 + return (Criteria) this;
306 + }
307 +
308 + public Criteria andUploadStatusBetween(String value1, String value2) {
309 + addCriterion("UPLOAD_STATUS between", value1, value2, "uploadStatus");
310 + return (Criteria) this;
311 + }
312 +
313 + public Criteria andUploadStatusNotBetween(String value1, String value2) {
314 + addCriterion("UPLOAD_STATUS not between", value1, value2, "uploadStatus");
315 + return (Criteria) this;
316 + }
317 +
318 + public Criteria andStatusIsNull() {
319 + addCriterion("STATUS is null");
320 + return (Criteria) this;
321 + }
322 +
323 + public Criteria andStatusIsNotNull() {
324 + addCriterion("STATUS is not null");
325 + return (Criteria) this;
326 + }
327 +
328 + public Criteria andStatusEqualTo(Long value) {
329 + addCriterion("STATUS =", value, "status");
330 + return (Criteria) this;
331 + }
332 +
333 + public Criteria andStatusNotEqualTo(Long value) {
334 + addCriterion("STATUS <>", value, "status");
335 + return (Criteria) this;
336 + }
337 +
338 + public Criteria andStatusGreaterThan(Long value) {
339 + addCriterion("STATUS >", value, "status");
340 + return (Criteria) this;
341 + }
342 +
343 + public Criteria andStatusGreaterThanOrEqualTo(Long value) {
344 + addCriterion("STATUS >=", value, "status");
345 + return (Criteria) this;
346 + }
347 +
348 + public Criteria andStatusLessThan(Long value) {
349 + addCriterion("STATUS <", value, "status");
350 + return (Criteria) this;
351 + }
352 +
353 + public Criteria andStatusLessThanOrEqualTo(Long value) {
354 + addCriterion("STATUS <=", value, "status");
355 + return (Criteria) this;
356 + }
357 +
358 + public Criteria andStatusIn(List<Long> values) {
359 + addCriterion("STATUS in", values, "status");
360 + return (Criteria) this;
361 + }
362 +
363 + public Criteria andStatusNotIn(List<Long> values) {
364 + addCriterion("STATUS not in", values, "status");
365 + return (Criteria) this;
366 + }
367 +
368 + public Criteria andStatusBetween(Long value1, Long value2) {
369 + addCriterion("STATUS between", value1, value2, "status");
370 + return (Criteria) this;
371 + }
372 +
373 + public Criteria andStatusNotBetween(Long value1, Long value2) {
374 + addCriterion("STATUS not between", value1, value2, "status");
375 + return (Criteria) this;
376 + }
377 +
378 + public Criteria andCreateTimeIsNull() {
379 + addCriterion("CREATE_TIME is null");
380 + return (Criteria) this;
381 + }
382 +
383 + public Criteria andCreateTimeIsNotNull() {
384 + addCriterion("CREATE_TIME is not null");
385 + return (Criteria) this;
386 + }
387 +
388 + public Criteria andCreateTimeEqualTo(Date value) {
389 + addCriterion("CREATE_TIME =", value, "createTime");
390 + return (Criteria) this;
391 + }
392 +
393 + public Criteria andCreateTimeNotEqualTo(Date value) {
394 + addCriterion("CREATE_TIME <>", value, "createTime");
395 + return (Criteria) this;
396 + }
397 +
398 + public Criteria andCreateTimeGreaterThan(Date value) {
399 + addCriterion("CREATE_TIME >", value, "createTime");
400 + return (Criteria) this;
401 + }
402 +
403 + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
404 + addCriterion("CREATE_TIME >=", value, "createTime");
405 + return (Criteria) this;
406 + }
407 +
408 + public Criteria andCreateTimeLessThan(Date value) {
409 + addCriterion("CREATE_TIME <", value, "createTime");
410 + return (Criteria) this;
411 + }
412 +
413 + public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
414 + addCriterion("CREATE_TIME <=", value, "createTime");
415 + return (Criteria) this;
416 + }
417 +
418 + public Criteria andCreateTimeIn(List<Date> values) {
419 + addCriterion("CREATE_TIME in", values, "createTime");
420 + return (Criteria) this;
421 + }
422 +
423 + public Criteria andCreateTimeNotIn(List<Date> values) {
424 + addCriterion("CREATE_TIME not in", values, "createTime");
425 + return (Criteria) this;
426 + }
427 +
428 + public Criteria andCreateTimeBetween(Date value1, Date value2) {
429 + addCriterion("CREATE_TIME between", value1, value2, "createTime");
430 + return (Criteria) this;
431 + }
432 +
433 + public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
434 + addCriterion("CREATE_TIME not between", value1, value2, "createTime");
435 + return (Criteria) this;
436 + }
437 +
438 + public Criteria andCreateUserIdIsNull() {
439 + addCriterion("CREATE_USER_ID is null");
440 + return (Criteria) this;
441 + }
442 +
443 + public Criteria andCreateUserIdIsNotNull() {
444 + addCriterion("CREATE_USER_ID is not null");
445 + return (Criteria) this;
446 + }
447 +
448 + public Criteria andCreateUserIdEqualTo(Long value) {
449 + addCriterion("CREATE_USER_ID =", value, "createUserId");
450 + return (Criteria) this;
451 + }
452 +
453 + public Criteria andCreateUserIdNotEqualTo(Long value) {
454 + addCriterion("CREATE_USER_ID <>", value, "createUserId");
455 + return (Criteria) this;
456 + }
457 +
458 + public Criteria andCreateUserIdGreaterThan(Long value) {
459 + addCriterion("CREATE_USER_ID >", value, "createUserId");
460 + return (Criteria) this;
461 + }
462 +
463 + public Criteria andCreateUserIdGreaterThanOrEqualTo(Long value) {
464 + addCriterion("CREATE_USER_ID >=", value, "createUserId");
465 + return (Criteria) this;
466 + }
467 +
468 + public Criteria andCreateUserIdLessThan(Long value) {
469 + addCriterion("CREATE_USER_ID <", value, "createUserId");
470 + return (Criteria) this;
471 + }
472 +
473 + public Criteria andCreateUserIdLessThanOrEqualTo(Long value) {
474 + addCriterion("CREATE_USER_ID <=", value, "createUserId");
475 + return (Criteria) this;
476 + }
477 +
478 + public Criteria andCreateUserIdIn(List<Long> values) {
479 + addCriterion("CREATE_USER_ID in", values, "createUserId");
480 + return (Criteria) this;
481 + }
482 +
483 + public Criteria andCreateUserIdNotIn(List<Long> values) {
484 + addCriterion("CREATE_USER_ID not in", values, "createUserId");
485 + return (Criteria) this;
486 + }
487 +
488 + public Criteria andCreateUserIdBetween(Long value1, Long value2) {
489 + addCriterion("CREATE_USER_ID between", value1, value2, "createUserId");
490 + return (Criteria) this;
491 + }
492 +
493 + public Criteria andCreateUserIdNotBetween(Long value1, Long value2) {
494 + addCriterion("CREATE_USER_ID not between", value1, value2, "createUserId");
495 + return (Criteria) this;
496 + }
497 +
498 + public Criteria andCreateUserNameIsNull() {
499 + addCriterion("CREATE_USER_NAME is null");
500 + return (Criteria) this;
501 + }
502 +
503 + public Criteria andCreateUserNameIsNotNull() {
504 + addCriterion("CREATE_USER_NAME is not null");
505 + return (Criteria) this;
506 + }
507 +
508 + public Criteria andCreateUserNameEqualTo(String value) {
509 + addCriterion("CREATE_USER_NAME =", value, "createUserName");
510 + return (Criteria) this;
511 + }
512 +
513 + public Criteria andCreateUserNameNotEqualTo(String value) {
514 + addCriterion("CREATE_USER_NAME <>", value, "createUserName");
515 + return (Criteria) this;
516 + }
517 +
518 + public Criteria andCreateUserNameGreaterThan(String value) {
519 + addCriterion("CREATE_USER_NAME >", value, "createUserName");
520 + return (Criteria) this;
521 + }
522 +
523 + public Criteria andCreateUserNameGreaterThanOrEqualTo(String value) {
524 + addCriterion("CREATE_USER_NAME >=", value, "createUserName");
525 + return (Criteria) this;
526 + }
527 +
528 + public Criteria andCreateUserNameLessThan(String value) {
529 + addCriterion("CREATE_USER_NAME <", value, "createUserName");
530 + return (Criteria) this;
531 + }
532 +
533 + public Criteria andCreateUserNameLessThanOrEqualTo(String value) {
534 + addCriterion("CREATE_USER_NAME <=", value, "createUserName");
535 + return (Criteria) this;
536 + }
537 +
538 + public Criteria andCreateUserNameLike(String value) {
539 + addCriterion("CREATE_USER_NAME like", value, "createUserName");
540 + return (Criteria) this;
541 + }
542 +
543 + public Criteria andCreateUserNameNotLike(String value) {
544 + addCriterion("CREATE_USER_NAME not like", value, "createUserName");
545 + return (Criteria) this;
546 + }
547 +
548 + public Criteria andCreateUserNameIn(List<String> values) {
549 + addCriterion("CREATE_USER_NAME in", values, "createUserName");
550 + return (Criteria) this;
551 + }
552 +
553 + public Criteria andCreateUserNameNotIn(List<String> values) {
554 + addCriterion("CREATE_USER_NAME not in", values, "createUserName");
555 + return (Criteria) this;
556 + }
557 +
558 + public Criteria andCreateUserNameBetween(String value1, String value2) {
559 + addCriterion("CREATE_USER_NAME between", value1, value2, "createUserName");
560 + return (Criteria) this;
561 + }
562 +
563 + public Criteria andCreateUserNameNotBetween(String value1, String value2) {
564 + addCriterion("CREATE_USER_NAME not between", value1, value2, "createUserName");
565 + return (Criteria) this;
566 + }
567 +
568 + public Criteria andModifyTimeIsNull() {
569 + addCriterion("MODIFY_TIME is null");
570 + return (Criteria) this;
571 + }
572 +
573 + public Criteria andModifyTimeIsNotNull() {
574 + addCriterion("MODIFY_TIME is not null");
575 + return (Criteria) this;
576 + }
577 +
578 + public Criteria andModifyTimeEqualTo(Date value) {
579 + addCriterion("MODIFY_TIME =", value, "modifyTime");
580 + return (Criteria) this;
581 + }
582 +
583 + public Criteria andModifyTimeNotEqualTo(Date value) {
584 + addCriterion("MODIFY_TIME <>", value, "modifyTime");
585 + return (Criteria) this;
586 + }
587 +
588 + public Criteria andModifyTimeGreaterThan(Date value) {
589 + addCriterion("MODIFY_TIME >", value, "modifyTime");
590 + return (Criteria) this;
591 + }
592 +
593 + public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
594 + addCriterion("MODIFY_TIME >=", value, "modifyTime");
595 + return (Criteria) this;
596 + }
597 +
598 + public Criteria andModifyTimeLessThan(Date value) {
599 + addCriterion("MODIFY_TIME <", value, "modifyTime");
600 + return (Criteria) this;
601 + }
602 +
603 + public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
604 + addCriterion("MODIFY_TIME <=", value, "modifyTime");
605 + return (Criteria) this;
606 + }
607 +
608 + public Criteria andModifyTimeIn(List<Date> values) {
609 + addCriterion("MODIFY_TIME in", values, "modifyTime");
610 + return (Criteria) this;
611 + }
612 +
613 + public Criteria andModifyTimeNotIn(List<Date> values) {
614 + addCriterion("MODIFY_TIME not in", values, "modifyTime");
615 + return (Criteria) this;
616 + }
617 +
618 + public Criteria andModifyTimeBetween(Date value1, Date value2) {
619 + addCriterion("MODIFY_TIME between", value1, value2, "modifyTime");
620 + return (Criteria) this;
621 + }
622 +
623 + public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
624 + addCriterion("MODIFY_TIME not between", value1, value2, "modifyTime");
625 + return (Criteria) this;
626 + }
627 +
628 + public Criteria andModifyUserIdIsNull() {
629 + addCriterion("MODIFY_USER_ID is null");
630 + return (Criteria) this;
631 + }
632 +
633 + public Criteria andModifyUserIdIsNotNull() {
634 + addCriterion("MODIFY_USER_ID is not null");
635 + return (Criteria) this;
636 + }
637 +
638 + public Criteria andModifyUserIdEqualTo(Long value) {
639 + addCriterion("MODIFY_USER_ID =", value, "modifyUserId");
640 + return (Criteria) this;
641 + }
642 +
643 + public Criteria andModifyUserIdNotEqualTo(Long value) {
644 + addCriterion("MODIFY_USER_ID <>", value, "modifyUserId");
645 + return (Criteria) this;
646 + }
647 +
648 + public Criteria andModifyUserIdGreaterThan(Long value) {
649 + addCriterion("MODIFY_USER_ID >", value, "modifyUserId");
650 + return (Criteria) this;
651 + }
652 +
653 + public Criteria andModifyUserIdGreaterThanOrEqualTo(Long value) {
654 + addCriterion("MODIFY_USER_ID >=", value, "modifyUserId");
655 + return (Criteria) this;
656 + }
657 +
658 + public Criteria andModifyUserIdLessThan(Long value) {
659 + addCriterion("MODIFY_USER_ID <", value, "modifyUserId");
660 + return (Criteria) this;
661 + }
662 +
663 + public Criteria andModifyUserIdLessThanOrEqualTo(Long value) {
664 + addCriterion("MODIFY_USER_ID <=", value, "modifyUserId");
665 + return (Criteria) this;
666 + }
667 +
668 + public Criteria andModifyUserIdIn(List<Long> values) {
669 + addCriterion("MODIFY_USER_ID in", values, "modifyUserId");
670 + return (Criteria) this;
671 + }
672 +
673 + public Criteria andModifyUserIdNotIn(List<Long> values) {
674 + addCriterion("MODIFY_USER_ID not in", values, "modifyUserId");
675 + return (Criteria) this;
676 + }
677 +
678 + public Criteria andModifyUserIdBetween(Long value1, Long value2) {
679 + addCriterion("MODIFY_USER_ID between", value1, value2, "modifyUserId");
680 + return (Criteria) this;
681 + }
682 +
683 + public Criteria andModifyUserIdNotBetween(Long value1, Long value2) {
684 + addCriterion("MODIFY_USER_ID not between", value1, value2, "modifyUserId");
685 + return (Criteria) this;
686 + }
687 +
688 + public Criteria andModifyUserNameIsNull() {
689 + addCriterion("MODIFY_USER_NAME is null");
690 + return (Criteria) this;
691 + }
692 +
693 + public Criteria andModifyUserNameIsNotNull() {
694 + addCriterion("MODIFY_USER_NAME is not null");
695 + return (Criteria) this;
696 + }
697 +
698 + public Criteria andModifyUserNameEqualTo(String value) {
699 + addCriterion("MODIFY_USER_NAME =", value, "modifyUserName");
700 + return (Criteria) this;
701 + }
702 +
703 + public Criteria andModifyUserNameNotEqualTo(String value) {
704 + addCriterion("MODIFY_USER_NAME <>", value, "modifyUserName");
705 + return (Criteria) this;
706 + }
707 +
708 + public Criteria andModifyUserNameGreaterThan(String value) {
709 + addCriterion("MODIFY_USER_NAME >", value, "modifyUserName");
710 + return (Criteria) this;
711 + }
712 +
713 + public Criteria andModifyUserNameGreaterThanOrEqualTo(String value) {
714 + addCriterion("MODIFY_USER_NAME >=", value, "modifyUserName");
715 + return (Criteria) this;
716 + }
717 +
718 + public Criteria andModifyUserNameLessThan(String value) {
719 + addCriterion("MODIFY_USER_NAME <", value, "modifyUserName");
720 + return (Criteria) this;
721 + }
722 +
723 + public Criteria andModifyUserNameLessThanOrEqualTo(String value) {
724 + addCriterion("MODIFY_USER_NAME <=", value, "modifyUserName");
725 + return (Criteria) this;
726 + }
727 +
728 + public Criteria andModifyUserNameLike(String value) {
729 + addCriterion("MODIFY_USER_NAME like", value, "modifyUserName");
730 + return (Criteria) this;
731 + }
732 +
733 + public Criteria andModifyUserNameNotLike(String value) {
734 + addCriterion("MODIFY_USER_NAME not like", value, "modifyUserName");
735 + return (Criteria) this;
736 + }
737 +
738 + public Criteria andModifyUserNameIn(List<String> values) {
739 + addCriterion("MODIFY_USER_NAME in", values, "modifyUserName");
740 + return (Criteria) this;
741 + }
742 +
743 + public Criteria andModifyUserNameNotIn(List<String> values) {
744 + addCriterion("MODIFY_USER_NAME not in", values, "modifyUserName");
745 + return (Criteria) this;
746 + }
747 +
748 + public Criteria andModifyUserNameBetween(String value1, String value2) {
749 + addCriterion("MODIFY_USER_NAME between", value1, value2, "modifyUserName");
750 + return (Criteria) this;
751 + }
752 +
753 + public Criteria andModifyUserNameNotBetween(String value1, String value2) {
754 + addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
755 + return (Criteria) this;
756 + }
757 + }
758 +
759 + public static class Criteria extends GeneratedCriteria {
760 +
761 + protected Criteria() {
762 + super();
763 + }
764 + }
765 +
766 + public static class Criterion {
767 + private String condition;
768 +
769 + private Object value;
770 +
771 + private Object secondValue;
772 +
773 + private boolean noValue;
774 +
775 + private boolean singleValue;
776 +
777 + private boolean betweenValue;
778 +
779 + private boolean listValue;
780 +
781 + private String typeHandler;
782 +
783 + public String getCondition() {
784 + return condition;
785 + }
786 +
787 + public Object getValue() {
788 + return value;
789 + }
790 +
791 + public Object getSecondValue() {
792 + return secondValue;
793 + }
794 +
795 + public boolean isNoValue() {
796 + return noValue;
797 + }
798 +
799 + public boolean isSingleValue() {
800 + return singleValue;
801 + }
802 +
803 + public boolean isBetweenValue() {
804 + return betweenValue;
805 + }
806 +
807 + public boolean isListValue() {
808 + return listValue;
809 + }
810 +
811 + public String getTypeHandler() {
812 + return typeHandler;
813 + }
814 +
815 + protected Criterion(String condition) {
816 + super();
817 + this.condition = condition;
818 + this.typeHandler = null;
819 + this.noValue = true;
820 + }
821 +
822 + protected Criterion(String condition, Object value, String typeHandler) {
823 + super();
824 + this.condition = condition;
825 + this.value = value;
826 + this.typeHandler = typeHandler;
827 + if (value instanceof List<?>) {
828 + this.listValue = true;
829 + } else {
830 + this.singleValue = true;
831 + }
832 + }
833 +
834 + protected Criterion(String condition, Object value) {
835 + this(condition, value, null);
836 + }
837 +
838 + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
839 + super();
840 + this.condition = condition;
841 + this.value = value;
842 + this.secondValue = secondValue;
843 + this.typeHandler = typeHandler;
844 + this.betweenValue = true;
845 + }
846 +
847 + protected Criterion(String condition, Object value, Object secondValue) {
848 + this(condition, value, secondValue, null);
849 + }
850 + }
851 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -93,12 +93,18 @@ ...@@ -93,12 +93,18 @@
93 <!-- selectByExampleQueryId="true">--> 93 <!-- selectByExampleQueryId="true">-->
94 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />--> 94 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
95 <!-- </table>--> 95 <!-- </table>-->
96 -<!-- <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"--> 96 + <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"
97 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 97 + enableCountByExample="true" enableUpdateByExample="true"
98 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 98 + enableDeleteByExample="true" enableSelectByExample="true"
99 -<!-- selectByExampleQueryId="true">--> 99 + selectByExampleQueryId="true">
100 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />--> 100 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />
101 -<!-- </table>--> 101 + </table>
102 + <table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"
103 + enableCountByExample="true" enableUpdateByExample="true"
104 + enableDeleteByExample="true" enableSelectByExample="true"
105 + selectByExampleQueryId="true">
106 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />
107 + </table>
102 <!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"--> 108 <!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
103 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 109 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
104 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 110 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
1 package com.fedex.connect.common.dependencies.authentication; 1 package com.fedex.connect.common.dependencies.authentication;
2 2
3 import org.springframework.boot.context.properties.ConfigurationProperties; 3 import org.springframework.boot.context.properties.ConfigurationProperties;
4 +import org.springframework.context.annotation.Configuration;
5 +import org.springframework.context.annotation.PropertySource;
4 6
5 7
6 /** 8 /**
7 * 读取配置文件 9 * 读取配置文件
8 * @author Administrator 10 * @author Administrator
9 */ 11 */
10 -@ConfigurationProperties(prefix = "export.jwt") 12 +@Configuration
13 +@ConfigurationProperties(prefix = "import.jwt")
14 +@PropertySource("classpath:application.yml")
11 public class SecurityConstants { 15 public class SecurityConstants {
12 16
13 /** 17 /**
......
...@@ -73,6 +73,9 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter { ...@@ -73,6 +73,9 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
73 LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class); 73 LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class);
74 IRedisSlabService redisSlabService = SpringBeanUtil.getBean(IRedisSlabService.class); 74 IRedisSlabService redisSlabService = SpringBeanUtil.getBean(IRedisSlabService.class);
75 75
76 + String str = localeMessageUtil.getMessage("auth_filter_user_error");
77 + System.out.println(str);
78 +
76 if (token == null || !token.startsWith(SecurityConstants.TOKEN_PREFIX)) { 79 if (token == null || !token.startsWith(SecurityConstants.TOKEN_PREFIX)) {
77 SecurityContextHolder.clearContext(); 80 SecurityContextHolder.clearContext();
78 81
......
...@@ -2,15 +2,18 @@ package com.fedex.connect.common.dependencies.i18n; ...@@ -2,15 +2,18 @@ package com.fedex.connect.common.dependencies.i18n;
2 2
3 import org.springframework.context.MessageSource; 3 import org.springframework.context.MessageSource;
4 import org.springframework.context.MessageSourceResolvable; 4 import org.springframework.context.MessageSourceResolvable;
5 +import org.springframework.context.annotation.PropertySource;
5 import org.springframework.context.i18n.LocaleContextHolder; 6 import org.springframework.context.i18n.LocaleContextHolder;
6 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
7 8
8 import javax.annotation.Resource; 9 import javax.annotation.Resource;
10 +import java.util.Locale;
9 11
10 /** 12 /**
11 * 根据语言编码查询内容 13 * 根据语言编码查询内容
12 */ 14 */
13 @Component 15 @Component
16 +@PropertySource("classpath:application.yml")
14 public class LocaleMessageUtil { 17 public class LocaleMessageUtil {
15 18
16 @Resource 19 @Resource
......
...@@ -31,12 +31,12 @@ public class SwaggerConfig { ...@@ -31,12 +31,12 @@ public class SwaggerConfig {
31 /** 31 /**
32 * 扫描Controller包的路径 32 * 扫描Controller包的路径
33 */ 33 */
34 - public static final String BASE_PACKAGE = "com.fedex.export.controller"; 34 + public static final String BASE_PACKAGE = "com.fedex.connect.kafka.controller";
35 35
36 /** 36 /**
37 * API信息 37 * API信息
38 */ 38 */
39 - public static final String API_INFO = "Export TW APIs"; 39 + public static final String API_INFO = "iClear Connect-Pre-Clearance Kafka-cndc-server APIs";
40 public static final String API_VERSION = "1.0"; 40 public static final String API_VERSION = "1.0";
41 41
42 /** 42 /**
......
...@@ -9,7 +9,25 @@ spring: ...@@ -9,7 +9,25 @@ spring:
9 active: @activatedProperties@ 9 active: @activatedProperties@
10 messages: 10 messages:
11 basename: message 11 basename: message
12 + encoding: utf-8
12 13
14 +import:
15 + jwt:
16 + securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
17 + urlWhiteList:
18 + - /kafka-cndc-server/auth
19 + - /kafka-cndc-server/monitor/ok
20 + - /kafka-cndc-server/user/logout
21 + - /kafka-cndc-server/swagger-resources
22 + - /kafka-cndc-server/webjars
23 + - /kafka-cndc-server/csrf
24 + uriWhiteList:
25 + - /kafka-cndc-server/swagger-ui.html
26 + - /kafka-cndc-server/swagger-ui/*
27 + - /kafka-cndc-server/v2/api-docs
28 + - /kafka-cndc-server/login.html
29 + expire_1H: 7200
30 + expire_1D: 604800
13 31
14 mybatis: 32 mybatis:
15 mapper-locations: 33 mapper-locations:
......
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
7 +
8 +enum_res_code_301=登錄身份異常
9 +enum_res_code_305=登錄已過期，請重新登錄
...\ No newline at end of file ...\ No newline at end of file
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
7 +
8 +enum_res_code_301=登錄身份異常
9 +enum_res_code_305=登錄已過期，請重新登錄
...\ No newline at end of file ...\ No newline at end of file
1 +package com.fedex.connect.manager.config;
2 +
3 +import org.springframework.context.annotation.Bean;
4 +import org.springframework.context.annotation.Configuration;
5 +import org.springframework.context.annotation.Profile;
6 +import springfox.documentation.builders.ApiInfoBuilder;
7 +import springfox.documentation.builders.PathSelectors;
8 +import springfox.documentation.builders.RequestHandlerSelectors;
9 +import springfox.documentation.service.ApiInfo;
10 +import springfox.documentation.service.ApiKey;
11 +import springfox.documentation.service.AuthorizationScope;
12 +import springfox.documentation.service.SecurityReference;
13 +import springfox.documentation.spi.DocumentationType;
14 +import springfox.documentation.spi.service.contexts.SecurityContext;
15 +import springfox.documentation.spring.web.plugins.Docket;
16 +import springfox.documentation.swagger2.annotations.EnableSwagger2;
17 +
18 +import java.util.ArrayList;
19 +import java.util.List;
20 +
21 +/**
22 + * SwaggerConfig配置类.开启Swagger2,自动生成文档
23 + *
24 + * @author EDY
25 + */
26 +@Configuration
27 +@EnableSwagger2
28 +@Profile({"dev", "test", "uat"})
29 +public class SwaggerConfig {
30 +
31 + /**
32 + * 扫描Controller包的路径
33 + */
34 + public static final String BASE_PACKAGE = "com.fedex.connect.manager.controller";
35 +
36 + /**
37 + * API信息
38 + */
39 + public static final String API_INFO = "iClear Connect-Pre-Clearance Manager-server APIs";
40 + public static final String API_VERSION = "1.0";
41 +
42 + /**
43 + * 创建API应用
44 + *
45 + * @return
46 + */
47 + @Bean
48 + public Docket restApi() {
49 + return new Docket(DocumentationType.SWAGGER_2)
50 + .apiInfo(apiInfo(API_INFO, API_VERSION))
51 + .useDefaultResponseMessages(true)
52 + .forCodeGeneration(false)
53 + .select()
54 + // 扫描指定目录的API
55 + .apis(RequestHandlerSelectors.basePackage(BASE_PACKAGE))
56 + .paths(PathSelectors.any())
57 + .build()
58 + //配置全局io.swagger.model
59 + .securitySchemes(securitySchemes())
60 + //配置将安全上下文应用于哪些api操作(通过正则表达式模式)和HTTP方法
61 + .securityContexts(securityContexts());
62 + }
63 +
64 + /**
65 + * API的基本信息
66 + *
67 + * @return
68 + */
69 + private ApiInfo apiInfo(String title, String version) {
70 + return new ApiInfoBuilder().title(title).description(API_INFO).version(version).build();
71 + }
72 +
73 + private List<ApiKey> securitySchemes() {
74 + List<ApiKey> apiKeys = new ArrayList<>();
75 + /*SecurityConstants.TOKEN_HEADER*/
76 + apiKeys.add(new ApiKey("Authorization", "Authorization", "header"));
77 + return apiKeys;
78 + }
79 +
80 + private List<SecurityContext> securityContexts() {
81 + List<SecurityContext> securityContexts = new ArrayList<>();
82 + securityContexts.add(SecurityContext.builder()
83 + .securityReferences(defaultAuth())
84 + //指定/auth 请求下不会携带全局参数
85 + .forPaths(PathSelectors.regex("^(?!/auth).*$")).build());
86 + return securityContexts;
87 + }
88 + private List<SecurityReference> defaultAuth() {
89 + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
90 + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
91 + authorizationScopes[0] = authorizationScope;
92 + List<SecurityReference> securityReferences = new ArrayList<>();
93 + securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
94 + return securityReferences;
95 + }
96 +}
...@@ -20,6 +20,23 @@ spring: ...@@ -20,6 +20,23 @@ spring:
20 basename: message 20 basename: message
21 encoding: utf-8 21 encoding: utf-8
22 22
23 +import:
24 + jwt:
25 + securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
26 + urlWhiteList:
27 + - /manager-server/auth
28 + - /manager-server/monitor/ok
29 + - /manager-server/user/logout
30 + - /manager-server/swagger-resources
31 + - /manager-server/webjars
32 + uriWhiteList:
33 + - /manager-server/swagger-ui.html
34 + - /manager-server/swagger-ui/*
35 + - /manager-server/v2/api-docs
36 + - /manager-server/login.html
37 + expire_1H: 7200
38 + expire_1D: 604800
39 +
23 mybatis: 40 mybatis:
24 mapper-locations: 41 mapper-locations:
25 - classpath*:com/fedex/connect/**/mapper/**/*.xml 42 - classpath*:com/fedex/connect/**/mapper/**/*.xml
......
1 -#authentication包
2 -auth_exc_no_auth=沒有訪問許可權
3 -auth_exc_no_pass_auth=沒有通過許可權認證
4 -auth_filter_user_error=登錄身份異常
5 -auth_filter_timeout=登錄超過8小時，請重新登錄
6 -auth_filter_stale_dated=登錄已過期
...\ No newline at end of file ...\ No newline at end of file
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
...\ No newline at end of file ...\ No newline at end of file
......
1 +#authentication包
2 +auth_exc_no_auth=沒有訪問許可權
3 +auth_exc_no_pass_auth=沒有通過許可權認證
4 +auth_filter_user_error=登錄身份異常
5 +auth_filter_timeout=登錄超過8小時，請重新登錄
6 +auth_filter_stale_dated=登錄已過期
...\ No newline at end of file ...\ No newline at end of file
......