Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4c2e273d 2 parents edbb8d6e 1aa36e02

Merge remote-tracking branch 'origin/master' into ver1.0.0-wjh

Expand all
Inline Side-by-side
Showing 195 changed files with 1148 additions and 741 deletions
...@@ -9,6 +9,7 @@ cd ../../ ...@@ -9,6 +9,7 @@ cd ../../
9 base_dir=`pwd` 9 base_dir=`pwd`
10 pName='package' 10 pName='package'
11 server='server' 11 server='server'
12 +prefix='ipc-'
12 13
13 mkdir $base_dir/${pName} 14 mkdir $base_dir/${pName}
14 rm -f $base_dir/${pName}/*.war 15 rm -f $base_dir/${pName}/*.war
...@@ -30,7 +31,7 @@ echo '######## 打包模块: '${moduleName} ...@@ -30,7 +31,7 @@ echo '######## 打包模块: '${moduleName}
30 cd $base_dir/${server}/${moduleName} 31 cd $base_dir/${server}/${moduleName}
31 mvn clean install -Dmaven.test.skip=true -P$profile 32 mvn clean install -Dmaven.test.skip=true -P$profile
32 oriName=${moduleName}-${sVersion}_${profile}.war.original 33 oriName=${moduleName}-${sVersion}_${profile}.war.original
33 -tarName=${moduleName}-${version}_${profile}.war 34 +tarName=${prefix}${moduleName}-${version}_${profile}.war
34 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName} 35 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName}
35 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName} 36 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName}
36 37
...@@ -41,7 +42,7 @@ echo '######## 打包模块: '${moduleName} ...@@ -41,7 +42,7 @@ echo '######## 打包模块: '${moduleName}
41 cd $base_dir/${server}/${moduleName} 42 cd $base_dir/${server}/${moduleName}
42 mvn clean install -Dmaven.test.skip=true -P$profile 43 mvn clean install -Dmaven.test.skip=true -P$profile
43 oriName=${moduleName}-${sVersion}_${profile}.war.original 44 oriName=${moduleName}-${sVersion}_${profile}.war.original
44 -tarName=${moduleName}-${version}_${profile}.war 45 +tarName=${prefix}${moduleName}-${version}_${profile}.war
45 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName} 46 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName}
46 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName} 47 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName}
47 48
...@@ -52,7 +53,7 @@ echo '######## 打包模块: '${moduleName} ...@@ -52,7 +53,7 @@ echo '######## 打包模块: '${moduleName}
52 cd $base_dir/${server}/${moduleName} 53 cd $base_dir/${server}/${moduleName}
53 mvn clean install -Dmaven.test.skip=true -P$profile 54 mvn clean install -Dmaven.test.skip=true -P$profile
54 oriName=${moduleName}-${sVersion}_${profile}.war.original 55 oriName=${moduleName}-${sVersion}_${profile}.war.original
55 -tarName=${moduleName}-${version}_${profile}.war 56 +tarName=${prefix}${moduleName}-${version}_${profile}.war
56 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName} 57 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName}
57 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName} 58 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName}
58 59
...@@ -63,7 +64,7 @@ echo '######## 打包模块: '${moduleName} ...@@ -63,7 +64,7 @@ echo '######## 打包模块: '${moduleName}
63 cd $base_dir/${server}/${moduleName} 64 cd $base_dir/${server}/${moduleName}
64 mvn clean install -Dmaven.test.skip=true -P$profile 65 mvn clean install -Dmaven.test.skip=true -P$profile
65 oriName=${moduleName}-${sVersion}_${profile}.war.original 66 oriName=${moduleName}-${sVersion}_${profile}.war.original
66 -tarName=${moduleName}-${version}_${profile}.war 67 +tarName=${prefix}${moduleName}-${version}_${profile}.war
67 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName} 68 cp target/${oriName} $base_dir && mv $base_dir/${oriName} $base_dir/${pName}/${tarName}
68 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName} 69 echo '######## 打包完成目录: '$base_dir/${pName}/${tarName}
69 70
......
...@@ -14,8 +14,9 @@ public interface CustomerConstant { ...@@ -14,8 +14,9 @@ public interface CustomerConstant {
14 interface VALIDATE_KEYS{ 14 interface VALIDATE_KEYS{
15 //最大上传文件个数100个 15 //最大上传文件个数100个
16 Integer UPLOAD_FILE_MAX_TOTAL = 100; 16 Integer UPLOAD_FILE_MAX_TOTAL = 100;
17 - //最大上传总文件大小95M 17 + //文件大小95M
18 - Integer UPLOAD_FILE_MAX_SIZE = 95 * 1024 * 1024; 18 + Integer FILE_MAX_SIZE = 95;
19 + //最大上传总文件大小95kb
20 + Integer UPLOAD_FILE_MAX_SIZE = FILE_MAX_SIZE * 1024 * 1024;
19 } 21 }
20 -
21 } 22 }
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.fedex.connect.customer.controller.biz.impl; 1 package com.fedex.connect.customer.controller.biz.impl;
2 2
3 +import com.fedex.connect.common.dependencies.annotation.OperationMethodLog;
4 +import com.fedex.connect.common.dependencies.contants.AnnotationConstants;
5 +import com.fedex.connect.common.dependencies.util.FileUtil;
3 import com.fedex.connect.customer.controller.base.BaseController; 6 import com.fedex.connect.customer.controller.base.BaseController;
4 import com.fedex.connect.customer.controller.biz.IAttachmentController; 7 import com.fedex.connect.customer.controller.biz.IAttachmentController;
5 import io.swagger.annotations.Api; 8 import io.swagger.annotations.Api;
9 +import io.swagger.annotations.ApiOperation;
6 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
11 +import org.springframework.web.bind.annotation.GetMapping;
7 import org.springframework.web.bind.annotation.RequestMapping; 12 import org.springframework.web.bind.annotation.RequestMapping;
13 +import org.springframework.web.bind.annotation.RequestParam;
8 import org.springframework.web.bind.annotation.RestController; 14 import org.springframework.web.bind.annotation.RestController;
9 15
16 +import javax.servlet.http.HttpServletRequest;
17 +import javax.servlet.http.HttpServletResponse;
18 +
10 /** 19 /**
11 * @Author Szl 20 * @Author Szl
12 * @Description 类说明 附件相关 21 * @Description 类说明 附件相关
...@@ -18,4 +27,15 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,4 +27,15 @@ import org.springframework.web.bind.annotation.RestController;
18 @Api(value = "AttachmentControllerImpl", tags = {"附件操作相关"}) 27 @Api(value = "AttachmentControllerImpl", tags = {"附件操作相关"})
19 public class AttachmentController extends BaseController implements IAttachmentController { 28 public class AttachmentController extends BaseController implements IAttachmentController {
20 29
30 + @GetMapping(value = "/downLoadFile")
31 + @OperationMethodLog(describe = "business_log_20008",remarkType = AnnotationConstants.LOG_REMARK_TYPE_SPECIAL,status = AnnotationConstants.LOG_STATUS_SHOW)
32 + @ApiOperation(value = "下载单个文件")
33 + public void downLoadFile(HttpServletRequest request, HttpServletResponse response,
34 + @RequestParam(name = "path") String path, @RequestParam(name = "name") String name) throws Exception {
35 +
36 + name = new String(name.getBytes("UTF-8"), "ISO-8859-1");
37 + String contentType = FileUtil.getContentType(name);
38 + response.setHeader("Content-Disposition", "attachment;filename=" + name +";content-type:"+contentType);
39 + FileUtil.download(request, response, path + FileUtil.SIGN, name,contentType);
40 + }
21 } 41 }
......
...@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
26 public class UploadRecordController extends BaseController implements IUploadRecordController { 26 public class UploadRecordController extends BaseController implements IUploadRecordController {
27 27
28 @Override 28 @Override
29 - @PostMapping("/queryHistoryList/{consignmentId}") 29 + @PostMapping("/queryHistoryList")
30 @ApiOperation(value = "ResponseVo", notes = "运单历史上传记录查询") 30 @ApiOperation(value = "ResponseVo", notes = "运单历史上传记录查询")
31 @OperationMethodLog(describe = "business_log_20006") 31 @OperationMethodLog(describe = "business_log_20006")
32 public ResponseVo queryHistoryList(@RequestBody AttachmentHistoryQuery attachmentHistoryQuery) { 32 public ResponseVo queryHistoryList(@RequestBody AttachmentHistoryQuery attachmentHistoryQuery) {
......
...@@ -31,4 +31,6 @@ public class ConsignmentBo { ...@@ -31,4 +31,6 @@ public class ConsignmentBo {
31 //文件业务类型AWB,INV,PKL,OTH(分运单，发票，箱单和其它这四种类型) 31 //文件业务类型AWB,INV,PKL,OTH(分运单，发票，箱单和其它这四种类型)
32 @BaseNotBlank(describe = "business_field_31008") 32 @BaseNotBlank(describe = "business_field_31008")
33 private List<Attachment> attachmentBizTypeList; 33 private List<Attachment> attachmentBizTypeList;
34 + //是否使用DM005标志
35 + private Long ceFlag;
34 } 36 }
......
...@@ -8,5 +8,5 @@ public class ConsignmentAddDto { ...@@ -8,5 +8,5 @@ public class ConsignmentAddDto {
8 * 是否为该用户的运单 1：是 0：否 8 * 是否为该用户的运单 1：是 0：否
9 */ 9 */
10 private Integer isCreatorFlag; 10 private Integer isCreatorFlag;
11 - private Long consignmentId; 11 + private ConsignmentDto consignment;
12 } 12 }
......
1 +package com.fedex.connect.customer.data.dto;
2 +
3 +import com.fedex.connect.common.model.biz.Consignment;
4 +import lombok.Data;
5 +
6 +@Data
7 +public class ConsignmentDto extends Consignment {
8 + private Long ceFlag;
9 +}
...@@ -34,4 +34,6 @@ public class FindConsignmentsDto { ...@@ -34,4 +34,6 @@ public class FindConsignmentsDto {
34 private String userInputOriginCountryCode; 34 private String userInputOriginCountryCode;
35 35
36 private String userInputOriginCountry; 36 private String userInputOriginCountry;
37 +
38 + private Long ceFlag;
37 } 39 }
......
1 package com.fedex.connect.customer.data.query; 1 package com.fedex.connect.customer.data.query;
2 2
3 -import com.fedex.connect.common.dependencies.util.DateUtil;
4 import com.fedex.connect.common.dependencies.util.Utils; 3 import com.fedex.connect.common.dependencies.util.Utils;
5 import com.fedex.connect.customer.data.PageBase; 4 import com.fedex.connect.customer.data.PageBase;
6 import lombok.Data; 5 import lombok.Data;
7 import org.springframework.util.CollectionUtils; 6 import org.springframework.util.CollectionUtils;
8 7
9 import java.time.LocalDate; 8 import java.time.LocalDate;
10 -import java.time.ZoneId; 9 +import java.time.format.DateTimeFormatter;
11 -import java.util.Date;
12 import java.util.List; 10 import java.util.List;
13 11
14 /** 12 /**
...@@ -24,15 +22,34 @@ public class ConsignmentQuery extends PageBase { ...@@ -24,15 +22,34 @@ public class ConsignmentQuery extends PageBase {
24 if (Utils.isNotEmpty(query.getConsignmentCode())) { 22 if (Utils.isNotEmpty(query.getConsignmentCode())) {
25 query.setConsignmentCodeList(Utils.split(query.getConsignmentCode(), "[;\\n]")); 23 query.setConsignmentCodeList(Utils.split(query.getConsignmentCode(), "[;\\n]"));
26 } 24 }
27 - if(!CollectionUtils.isEmpty(query.getConsignmentCodeList())) { 25 + if(!CollectionUtils.isEmpty(query.getConsignmentCodeList()) && Utils.isEmpty(query.getCreateTimeFrom()) && Utils.isEmpty(query.getCreateTimeTo())) {
28 - query.setCreateTimeFrom(null); 26 + // 获取当前日期，减去180天
29 - query.setCreateTimeTo(null); 27 + LocalDate localDate = LocalDate.now().minusDays(180);
30 - } 28 +
31 - //如果没有输入查询条件，则默认查三天的数据 29 + // 设置 createTimeFrom 为 180 天前的日期（不带时分秒）
32 - if (CollectionUtils.isEmpty(query.getConsignmentCodeList()) && Utils.isEmpty(query.getConsignmentCode())){ 30 + String createTimeFrom = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
31 + query.setCreateTimeFrom(createTimeFrom);
32 +
33 + // 获取当前日期（不带时分秒）
34 + LocalDate currentDate = LocalDate.now();
35 +
36 + // 设置 createTimeTo 为今天的日期（不带时分秒）
37 + String createTimeTo = currentDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
38 + query.setCreateTimeTo(createTimeTo);
39 + }else if (Utils.isEmpty(query.getCreateTimeFrom()) && Utils.isEmpty(query.getCreateTimeTo())) {
40 + // 获取当前日期，减去3天
33 LocalDate localDate = LocalDate.now().minusDays(3); 41 LocalDate localDate = LocalDate.now().minusDays(3);
34 - query.setCreateTimeFrom(DateUtil.timeFormat(Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()))); 42 +
35 - query.setCreateTimeTo(DateUtil.timeFormat(new Date())); 43 + // 设置 createTimeFrom 为 3 天前的日期（不带时分秒）
44 + String createTimeFrom = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
45 + query.setCreateTimeFrom(createTimeFrom);
46 +
47 + // 获取当前日期（不带时分秒）
48 + LocalDate currentDate = LocalDate.now();
49 +
50 + // 设置 createTimeTo 为今天的日期（不带时分秒）
51 + String createTimeTo = currentDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
52 + query.setCreateTimeTo(createTimeTo);
36 } 53 }
37 query.setStart(query.getStart()); 54 query.setStart(query.getStart());
38 return query; 55 return query;
......
...@@ -34,6 +34,10 @@ public enum ResponseCode { ...@@ -34,6 +34,10 @@ public enum ResponseCode {
34 MESSAGE_CODE_30014(30014,"business_exception_30014"), 34 MESSAGE_CODE_30014(30014,"business_exception_30014"),
35 MESSAGE_CODE_30015(30015,"business_success_30015"), 35 MESSAGE_CODE_30015(30015,"business_success_30015"),
36 MESSAGE_CODE_30016(30016,"business_exception_30016"), 36 MESSAGE_CODE_30016(30016,"business_exception_30016"),
37 + MESSAGE_CODE_30017(30017,"business_exception_30017"),
38 + MESSAGE_CODE_30018(30018,"business_exception_30018"),
39 + MESSAGE_CODE_30019(30019,"business_exception_30019"),
40 + MESSAGE_CODE_30020(30020,"business_exception_30020"),
37 41
38 /******打个样，编写样例*****/ 42 /******打个样，编写样例*****/
39 // MESSAGE_CODE_30001(30001,"business_exception_30001"), 43 // MESSAGE_CODE_30001(30001,"business_exception_30001"),
......
...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dao.biz.*; ...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dao.biz.*;
4 import com.fedex.connect.customer.repository.dao.AttachmentExtMapper; 4 import com.fedex.connect.customer.repository.dao.AttachmentExtMapper;
5 import com.fedex.connect.customer.repository.dao.ConsignmentExtMapper; 5 import com.fedex.connect.customer.repository.dao.ConsignmentExtMapper;
6 import com.fedex.connect.customer.repository.dao.UploadRecordExtMapper; 6 import com.fedex.connect.customer.repository.dao.UploadRecordExtMapper;
7 +import com.fedex.connect.customer.repository.dao.UserExtMapper;
7 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
8 9
9 public class BaseDao { 10 public class BaseDao {
...@@ -25,4 +26,6 @@ public class BaseDao { ...@@ -25,4 +26,6 @@ public class BaseDao {
25 protected EmailMapper emailMapper; 26 protected EmailMapper emailMapper;
26 @Autowired 27 @Autowired
27 protected UploadRecordExtMapper uploadRecordExtMapper; 28 protected UploadRecordExtMapper uploadRecordExtMapper;
29 + @Autowired
30 + protected UserExtMapper userExtMapper;
28 } 31 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -25,8 +25,9 @@ public interface ConsignmentExtMapper { ...@@ -25,8 +25,9 @@ public interface ConsignmentExtMapper {
25 ") WHERE ROWNUM = 1") 25 ") WHERE ROWNUM = 1")
26 Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode, @Param("dateParam") LocalDate dateParam); 26 Consignment findByConsignmentCode(@Param("consignmentCode") String consignmentCode, @Param("dateParam") LocalDate dateParam);
27 27
28 - @Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC LEFT JOIN T_BIZ_USER_CONSIGNMENT_MAPPING BUCM ON(BC.ID = BUCM.CONSIGNMENT_ID) " + 28 + @Select("SELECT BC.* FROM T_BIZ_CONSIGNMENT BC WHERE BC.ID = #{query.consignmentId}")
29 - "WHERE BC.ID = #{query.consignmentId} AND (BC.USER_UUID = #{query.userUuid} OR BUCM.USER_ID = #{query.userId})")
30 Consignment findConsignmentInfo(@Param("query") UserConsignmentInfoQuery query); 29 Consignment findConsignmentInfo(@Param("query") UserConsignmentInfoQuery query);
31 30
31 + @Select("SELECT ID FROM T_BIZ_CONSIGNMENT WHERE ID = #{id} FOR UPDATE NOWAIT")
32 + Long lockConsignmentRow(@Param("id") Long id);
32 } 33 }
......
1 +package com.fedex.connect.customer.repository.dao;
2 +
3 +import com.fedex.connect.common.model.sys.User;
4 +import org.apache.ibatis.annotations.Mapper;
5 +import org.apache.ibatis.annotations.Param;
6 +import org.apache.ibatis.annotations.Select;
7 +
8 +@Mapper
9 +public interface UserExtMapper {
10 + @Select("SELECT * FROM T_SYS_USER WHERE USER_UUID = #{uuid}")
11 + public User findUserByUuid(@Param("uuid") String uuid);
12 +}
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
33 c.SHIPPER_ACCOUNT, 33 c.SHIPPER_ACCOUNT,
34 c.USER_INPUT_SHIPPER_ACCOUNT, 34 c.USER_INPUT_SHIPPER_ACCOUNT,
35 c.USER_INPUT_ORIGIN_COUNTRY_CODE, 35 c.USER_INPUT_ORIGIN_COUNTRY_CODE,
36 - c.USER_INPUT_ORIGIN_COUNTRY 36 + c.USER_INPUT_ORIGIN_COUNTRY,
37 + MAX(m.CE_FLAG) AS CE_FLAG
37 </sql> 38 </sql>
38 39
39 <select id="findConsignments" resultType="com.fedex.connect.customer.data.dto.FindConsignmentsDto"> 40 <select id="findConsignments" resultType="com.fedex.connect.customer.data.dto.FindConsignmentsDto">
...@@ -47,14 +48,17 @@ ...@@ -47,14 +48,17 @@
47 (m.user_id = #{userId} AND m.consignment_id IS NOT NULL) 48 (m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
48 OR c.user_uuid = #{uuid,jdbcType=VARCHAR} 49 OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
49 ) 50 )
50 - <if test="statusCode != null and statusCode != ''"> 51 + <if test="statusCode != null and statusCode != '' and statusCode != 'null'">
51 AND c.STATUS_CODE = #{statusCode} 52 AND c.STATUS_CODE = #{statusCode}
52 </if> 53 </if>
54 + <if test="statusCode == 'null'">
55 + AND c.STATUS_CODE IS NULL
56 + </if>
53 <if test="createTimeFrom != null and createTimeFrom != ''"> 57 <if test="createTimeFrom != null and createTimeFrom != ''">
54 - AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS') 58 + AND c.CREATE_TIME &gt; TO_DATE(#{createTimeFrom} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS')
55 </if> 59 </if>
56 <if test="createTimeTo != null and createTimeTo != ''"> 60 <if test="createTimeTo != null and createTimeTo != ''">
57 - AND c.CREATE_TIME &lt;= TO_DATE(#{createTimeTo}, 'YYYY-MM-DD HH24:MI:SS') 61 + AND c.CREATE_TIME &lt; TO_DATE(#{createTimeTo} || ' 23:59:59', 'YYYY-MM-DD HH24:MI:SS')
58 </if> 62 </if>
59 <if test="consignmentCodeList != null and consignmentCodeList.size() != 0"> 63 <if test="consignmentCodeList != null and consignmentCodeList.size() != 0">
60 AND c.CONSIGNMENT_CODE IN 64 AND c.CONSIGNMENT_CODE IN
...@@ -62,6 +66,13 @@ ...@@ -62,6 +66,13 @@
62 #{item} 66 #{item}
63 </foreach> 67 </foreach>
64 </if> 68 </if>
69 + GROUP BY
70 + c.ID, c.CONSIGNMENT_CODE, c.RECIPIENT_CONTACT_NAME, c.RECIPIENT_COMPANY,
71 + c.ORIGIN_COUNTRY, c.DOC_NONDOC_FLAG, c.CREATE_USER_NAME, c.CREATE_TIME,
72 + c.MODIFY_TIME, c.STATUS_NAME, c.USER_UUID, c.SHIPPER_ACCOUNT,
73 + c.USER_INPUT_SHIPPER_ACCOUNT, c.USER_INPUT_ORIGIN_COUNTRY_CODE,
74 + c.USER_INPUT_ORIGIN_COUNTRY
75 + ORDER BY c.CREATE_TIME DESC
65 <include refid="OracleDialectSuffix" /> 76 <include refid="OracleDialectSuffix" />
66 </select> 77 </select>
67 78
...@@ -76,10 +87,10 @@ ...@@ -76,10 +87,10 @@
76 OR c.user_uuid = #{uuid,jdbcType=VARCHAR} 87 OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
77 ) 88 )
78 <if test="createTimeFrom != null and createTimeFrom != ''"> 89 <if test="createTimeFrom != null and createTimeFrom != ''">
79 - AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS') 90 + AND c.CREATE_TIME &gt; TO_DATE(#{createTimeFrom} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS')
80 </if> 91 </if>
81 <if test="createTimeTo != null and createTimeTo != ''"> 92 <if test="createTimeTo != null and createTimeTo != ''">
82 - AND c.CREATE_TIME &lt;= TO_DATE(#{createTimeTo}, 'YYYY-MM-DD HH24:MI:SS') 93 + AND c.CREATE_TIME &lt; TO_DATE(#{createTimeTo} || ' 23:59:59', 'YYYY-MM-DD HH24:MI:SS')
83 </if> 94 </if>
84 <if test="consignmentCodeList != null and consignmentCodeList.size() != 0"> 95 <if test="consignmentCodeList != null and consignmentCodeList.size() != 0">
85 AND c.CONSIGNMENT_CODE IN 96 AND c.CONSIGNMENT_CODE IN
...@@ -91,4 +102,5 @@ ...@@ -91,4 +102,5 @@
91 102
92 103
93 104
105 +
94 </mapper> 106 </mapper>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
327 FROM 327 FROM
328 T_BIZ_UPLOAD_RECORD 328 T_BIZ_UPLOAD_RECORD
329 WHERE 329 WHERE
330 - CONSIGNMENT_ID = #{consignmentId} 330 + CONSIGNMENT_ID = #{consignmentId} ORDER BY ID DESC
331 <include refid="OracleDialectSuffix" /> 331 <include refid="OracleDialectSuffix" />
332 </select> 332 </select>
333 </mapper> 333 </mapper>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -23,4 +23,6 @@ public interface IConsignmentRepository { ...@@ -23,4 +23,6 @@ public interface IConsignmentRepository {
23 Consignment saveOrUpdate(Consignment entity); 23 Consignment saveOrUpdate(Consignment entity);
24 24
25 void saveOrUpdateAll(List<Consignment> list); 25 void saveOrUpdateAll(List<Consignment> list);
26 +
27 + void lockConsignmentRow(Long id);
26 } 28 }
......
...@@ -30,4 +30,14 @@ public interface IUserConsignmentMappingRepository { ...@@ -30,4 +30,14 @@ public interface IUserConsignmentMappingRepository {
30 * @return void 30 * @return void
31 */ 31 */
32 void saveOrUpdateAll(List<UserConsignmentMapping> list); 32 void saveOrUpdateAll(List<UserConsignmentMapping> list);
33 +
34 + /**
35 + * @Author Szl
36 + * @Description 功能说明 根据用户id和运单号查询mapping
37 + * @Date 2024/12/31
38 + * @param userId
39 + * @param consignmentCode
40 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
41 + */
42 + UserConsignmentMapping findByUserIdAndConsignmentCode(Long userId,String consignmentCode);
33 } 43 }
......
1 +package com.fedex.connect.customer.repository.repo;
2 +
3 +import com.fedex.connect.common.model.sys.User;
4 +
5 +public interface IUserRepository {
6 + User findUserByUuid(String uuid);
7 +}
...@@ -8,6 +8,7 @@ import com.fedex.connect.customer.data.query.ConsignmentQuery; ...@@ -8,6 +8,7 @@ import com.fedex.connect.customer.data.query.ConsignmentQuery;
8 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery; 8 import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
9 import com.fedex.connect.customer.repository.base.BaseDao; 9 import com.fedex.connect.customer.repository.base.BaseDao;
10 import com.fedex.connect.customer.repository.repo.IConsignmentRepository; 10 import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
11 +import org.apache.commons.lang3.StringUtils;
11 import org.springframework.stereotype.Repository; 12 import org.springframework.stereotype.Repository;
12 13
13 import java.time.LocalDate; 14 import java.time.LocalDate;
...@@ -45,14 +46,10 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe ...@@ -45,14 +46,10 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe
45 if (SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME.equals(consignment.getCreateUserName())){ 46 if (SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME.equals(consignment.getCreateUserName())){
46 consignment.setCreateUserName(user.getUserName()); 47 consignment.setCreateUserName(user.getUserName());
47 } 48 }
48 - if (!user.getUserUuid().equals(consignment.getUserUuid()) && !user.getAccountNo().equals(consignment.getShipperAccount())){ 49 + if (!StringUtils.equals(user.getUserUuid(), consignment.getUserUuid()) && (consignment.getCeFlag() != null && consignment.getCeFlag() == 0)) {
49 consignment.setRecipientContactName(null); 50 consignment.setRecipientContactName(null);
50 consignment.setRecipientCompany(null); 51 consignment.setRecipientCompany(null);
51 consignment.setDocNondocFlag(null); 52 consignment.setDocNondocFlag(null);
52 - consignment.setCreateUserName(null);
53 - consignment.setCreateTime(null);
54 - consignment.setModifyTime(null);
55 - consignment.setStatusName(null);
56 consignment.setUserUuid(null); 53 consignment.setUserUuid(null);
57 consignment.setShipperAccount(null); 54 consignment.setShipperAccount(null);
58 consignment.setOriginCountry(consignment.getUserInputOriginCountry()); 55 consignment.setOriginCountry(consignment.getUserInputOriginCountry());
...@@ -97,4 +94,16 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe ...@@ -97,4 +94,16 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe
97 } 94 }
98 }); 95 });
99 } 96 }
97 +
98 + /**
99 + * @Author mt
100 + * @Description 为运单表增加行级锁，行级锁使用主键id作为标志，否则可能锁表
101 + * @Date 2024/12/20
102 + * @param id
103 + * @return void
104 + */
105 + @Override
106 + public void lockConsignmentRow(Long id){
107 + consignmentExtMapper.lockConsignmentRow(id);
108 + }
100 } 109 }
......
...@@ -51,4 +51,22 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs ...@@ -51,4 +51,22 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs
51 } 51 }
52 }); 52 });
53 } 53 }
54 +
55 + /**
56 + * @Author Szl
57 + * @Description 功能说明 根据用户id和运单号查询mapping
58 + * @Date 2024/12/31
59 + * @param userId
60 + * @param consignmentCode
61 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
62 + */
63 + @Override
64 + public UserConsignmentMapping findByUserIdAndConsignmentCode(Long userId,String consignmentCode){
65 + UserConsignmentMappingExample example = new UserConsignmentMappingExample();
66 + UserConsignmentMappingExample.Criteria criteria = example.createCriteria();
67 + criteria.andUserIdEqualTo(userId);
68 + criteria.andConsignmentCodeEqualTo(consignmentCode);
69 + criteria.andStatusEqualTo(StatusEnum.YES.getCode());
70 + return CollectionUtils.firstElement(userConsignmentMappingMapper.selectByExample(example));
71 + }
54 } 72 }
......
1 +package com.fedex.connect.customer.repository.repo.impl;
2 +
3 +import com.fedex.connect.common.model.sys.User;
4 +import com.fedex.connect.customer.repository.base.BaseDao;
5 +import com.fedex.connect.customer.repository.repo.IUserRepository;
6 +import org.springframework.stereotype.Repository;
7 +
8 +@Repository
9 +public class UserRepositoryImpl extends BaseDao implements IUserRepository {
10 + @Override
11 + public User findUserByUuid(String uuid) {
12 + return userExtMapper.findUserByUuid(uuid);
13 + }
14 +}
1 package com.fedex.connect.customer.service.biz; 1 package com.fedex.connect.customer.service.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.UploadRecord;
4 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
5 6
6 public interface IEmailService { 7 public interface IEmailService {
7 void saveNotificationEmail(Consignment consignment, User user) throws Exception; 8 void saveNotificationEmail(Consignment consignment, User user) throws Exception;
9 +
10 + void savePushConsignmentFileEmail(Consignment consignment, UploadRecord uploadRecord) throws Exception;
8 } 11 }
......
...@@ -78,8 +78,8 @@ public class AttachmentServiceImpl extends BaseService implements IAttachmentSer ...@@ -78,8 +78,8 @@ public class AttachmentServiceImpl extends BaseService implements IAttachmentSer
78 ++i; 78 ++i;
79 } 79 }
80 }catch(Exception ex){ 80 }catch(Exception ex){
81 - //如果上传过程中存在失败，则所有已上传的文件进行删除 81 + //如果上传过程中存在失败，则所有已上传的文件进行删除，已上传文件不进行删除
82 - attachmentUtil.deleteAttachments(attachmentList); 82 +// attachmentUtil.deleteAttachments(attachmentList);
83 throw ex; 83 throw ex;
84 } 84 }
85 return attachmentList; 85 return attachmentList;
......
...@@ -7,11 +7,13 @@ import com.fedex.connect.common.dependencies.util.Utils; ...@@ -7,11 +7,13 @@ import com.fedex.connect.common.dependencies.util.Utils;
7 import com.fedex.connect.common.model.biz.Consignment; 7 import com.fedex.connect.common.model.biz.Consignment;
8 import com.fedex.connect.common.model.sys.User; 8 import com.fedex.connect.common.model.sys.User;
9 import com.fedex.connect.customer.data.dto.FindConsignmentsDto; 9 import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
10 -import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
11 import com.fedex.connect.customer.data.query.ConsignmentQuery; 10 import com.fedex.connect.customer.data.query.ConsignmentQuery;
11 +import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
12 import com.fedex.connect.customer.enums.ResponseCode; 12 import com.fedex.connect.customer.enums.ResponseCode;
13 import com.fedex.connect.customer.service.base.BaseService; 13 import com.fedex.connect.customer.service.base.BaseService;
14 import com.fedex.connect.customer.service.biz.IConsignmentQueryService; 14 import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
15 +import com.fedex.connect.customer.util.service.biz.ConsignmentQueryUtil;
16 +import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.stereotype.Service; 17 import org.springframework.stereotype.Service;
16 18
17 import java.util.List; 19 import java.util.List;
...@@ -24,6 +26,10 @@ import java.util.Objects; ...@@ -24,6 +26,10 @@ import java.util.Objects;
24 */ 26 */
25 @Service 27 @Service
26 public class ConsignmentQueryServiceImpl extends BaseService implements IConsignmentQueryService { 28 public class ConsignmentQueryServiceImpl extends BaseService implements IConsignmentQueryService {
29 +
30 + @Autowired
31 + ConsignmentQueryUtil consignmentQueryUtil;
32 +
27 /** 33 /**
28 * @Author Szl 34 * @Author Szl
29 * @Description 功能说明 运单查询 35 * @Description 功能说明 运单查询
...@@ -60,19 +66,12 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign ...@@ -60,19 +66,12 @@ public class ConsignmentQueryServiceImpl extends BaseService implements IConsign
60 * @param userConsignmentInfoQuery 66 * @param userConsignmentInfoQuery
61 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo 67 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
62 */ 68 */
63 - public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery){ 69 + public ResponseVo findConsignmentInfo(UserConsignmentInfoQuery userConsignmentInfoQuery) {
64 Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery); 70 Consignment consignment = consignmentRepository.findConsignmentInfo(userConsignmentInfoQuery);
65 - if(Objects.nonNull(consignment) 71 + /**
66 - && !consignment.getUserUuid().equals(userConsignmentInfoQuery.getUserUuid()) 72 + * 对查询数据进行筛选
67 - && !consignment.getShipperAccount().equals(userConsignmentInfoQuery.getShipperAccount())){ 73 + */
68 - Consignment consignmentTemp = new Consignment(); 74 + Consignment resultConsignment = consignmentQueryUtil.findConsignment(userConsignmentInfoQuery,consignment);
69 - consignmentTemp.setId(consignment.getId()); 75 + return responseUtils.success(resultConsignment);
70 - consignmentTemp.setConsignmentCode(consignment.getConsignmentCode());
71 - consignmentTemp.setShipperAccount(consignment.getShipperAccount());
72 - consignmentTemp.setOriginCountry(consignment.getOriginCountry());
73 - consignmentTemp.setDestinationCountry(consignment.getDestinationCountry());
74 - consignment = consignmentTemp;
75 - }
76 - return responseUtils.success(consignment);
77 } 76 }
78 } 77 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,11 @@ package com.fedex.connect.customer.service.biz.impl; ...@@ -2,7 +2,11 @@ package com.fedex.connect.customer.service.biz.impl;
2 2
3 import com.fedex.connect.common.dependencies.contants.DigitConstants; 3 import com.fedex.connect.common.dependencies.contants.DigitConstants;
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.model.biz.*; 5 +import com.fedex.connect.common.dependencies.exception.OpErrorException;
6 +import com.fedex.connect.common.model.biz.Attachment;
7 +import com.fedex.connect.common.model.biz.Consignment;
8 +import com.fedex.connect.common.model.biz.UploadRecord;
9 +import com.fedex.connect.common.model.biz.UserConsignmentMapping;
6 import com.fedex.connect.common.model.sys.User; 10 import com.fedex.connect.common.model.sys.User;
7 import com.fedex.connect.customer.data.bo.AddBo; 11 import com.fedex.connect.customer.data.bo.AddBo;
8 import com.fedex.connect.customer.data.bo.ConsignmentBo; 12 import com.fedex.connect.customer.data.bo.ConsignmentBo;
...@@ -11,28 +15,25 @@ import com.fedex.connect.customer.enums.ResponseCode; ...@@ -11,28 +15,25 @@ import com.fedex.connect.customer.enums.ResponseCode;
11 import com.fedex.connect.customer.service.base.BaseService; 15 import com.fedex.connect.customer.service.base.BaseService;
12 import com.fedex.connect.customer.service.biz.IAttachmentService; 16 import com.fedex.connect.customer.service.biz.IAttachmentService;
13 import com.fedex.connect.customer.service.biz.IConsignmentService; 17 import com.fedex.connect.customer.service.biz.IConsignmentService;
14 -import com.fedex.connect.customer.service.biz.IEmailService;
15 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil; 18 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
16 -import com.fedex.connect.customer.util.service.biz.PushObUtil;
17 import com.fedex.connect.customer.util.service.biz.UploadRecordUtil; 19 import com.fedex.connect.customer.util.service.biz.UploadRecordUtil;
18 -import com.fedex.connect.customer.util.service.biz.UserConsignmentMappingUtil; 20 +import com.fedex.connect.customer.validate.controller.biz.AttachmentValidate;
21 +import lombok.extern.slf4j.Slf4j;
19 import org.apache.commons.lang3.StringUtils; 22 import org.apache.commons.lang3.StringUtils;
20 import org.springframework.beans.factory.annotation.Autowired; 23 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.stereotype.Service; 24 import org.springframework.stereotype.Service;
22 -import org.springframework.transaction.annotation.Transactional;
23 import org.springframework.web.multipart.MultipartFile; 25 import org.springframework.web.multipart.MultipartFile;
24 26
25 import java.time.LocalDate; 27 import java.time.LocalDate;
26 -import java.util.ArrayList;
27 import java.util.List; 28 import java.util.List;
28 import java.util.Objects; 29 import java.util.Objects;
29 -import java.util.Optional;
30 30
31 /** 31 /**
32 * @Author Szl 32 * @Author Szl
33 * @Description 类说明 运单操作相关service 33 * @Description 类说明 运单操作相关service
34 * @Date 2024/10/31 34 * @Date 2024/10/31
35 */ 35 */
36 +@Slf4j
36 @Service 37 @Service
37 public class ConsignmentServiceImpl extends BaseService implements IConsignmentService { 38 public class ConsignmentServiceImpl extends BaseService implements IConsignmentService {
38 @Autowired 39 @Autowired
...@@ -40,13 +41,9 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -40,13 +41,9 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
40 @Autowired 41 @Autowired
41 private UploadRecordUtil uploadRecordUtil; 42 private UploadRecordUtil uploadRecordUtil;
42 @Autowired 43 @Autowired
43 - private UserConsignmentMappingUtil userConsignmentMappingUtil;
44 - @Autowired
45 - private PushObUtil pushObUtil;
46 - @Autowired
47 private IAttachmentService attachmentService; 44 private IAttachmentService attachmentService;
48 @Autowired 45 @Autowired
49 - private IEmailService emailService; 46 + private AttachmentValidate attachmentValidate;
50 47
51 /** 48 /**
52 * @Author Szl 49 * @Author Szl
...@@ -57,6 +54,15 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -57,6 +54,15 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
57 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo 54 * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
58 */ 55 */
59 public ResponseVo add(AddBo bo, User user){ 56 public ResponseVo add(AddBo bo, User user){
57 + ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
58 + if (StringUtils.isEmpty(bo.getConsignmentCode()) || !bo.getConsignmentCode().matches("\\d{12}")) {
59 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
60 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30017);
61 + }
62 + if (!StringUtils.isEmpty(bo.getShipperAccount()) && !bo.getShipperAccount().matches("\\d{9}")) {
63 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
64 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30019);
65 + }
60 //查询运单表是否存在已提交的运单 66 //查询运单表是否存在已提交的运单
61 LocalDate thirtyDaysAgo = LocalDate.now().minusDays(30); 67 LocalDate thirtyDaysAgo = LocalDate.now().minusDays(30);
62 Consignment consignment = consignmentRepository.findByConsignmentCode(bo.getConsignmentCode(),thirtyDaysAgo); 68 Consignment consignment = consignmentRepository.findByConsignmentCode(bo.getConsignmentCode(),thirtyDaysAgo);
...@@ -64,7 +70,6 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -64,7 +70,6 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
64 * 不存在则直接返回 70 * 不存在则直接返回
65 */ 71 */
66 if (consignment == null){ 72 if (consignment == null){
67 - ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
68 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ZERO); 73 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ZERO);
69 if (!StringUtils.isEmpty(bo.getShipperAccount())){ 74 if (!StringUtils.isEmpty(bo.getShipperAccount())){
70 if (Objects.equals(user.getAccountNo(),bo.getShipperAccount())){ 75 if (Objects.equals(user.getAccountNo(),bo.getShipperAccount())){
...@@ -73,7 +78,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -73,7 +78,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
73 /** 78 /**
74 * 不存在运单，并且没有填写shipperAccount，则直接返回 79 * 不存在运单，并且没有填写shipperAccount，则直接返回
75 */ 80 */
76 - return responseUtils.success(consignmentAddDto); 81 + return responseUtils.success(ResponseCode.MESSAGE_CODE_30020,consignmentAddDto);
77 } 82 }
78 }else { 83 }else {
79 /** 84 /**
...@@ -83,14 +88,23 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -83,14 +88,23 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
83 } 88 }
84 } 89 }
85 /** 90 /**
91 + * 存在运单则获取mapping表
92 + */
93 + UserConsignmentMapping byUserIdAndConsignmentCode = userConsignmentMappingRepository.findByUserIdAndConsignmentCode(user.getId(), consignment.getConsignmentCode());
94 + Long ceFlag = 1L;
95 + if (byUserIdAndConsignmentCode == null){
96 + ceFlag = 3L;
97 + }else if (byUserIdAndConsignmentCode.getCeFlag() != null){
98 + ceFlag = byUserIdAndConsignmentCode.getCeFlag();
99 + }
100 + /**
86 * 根据是否是DM501返回不同的提示 101 * 根据是否是DM501返回不同的提示
87 */ 102 */
88 - if (StringUtils.isEmpty(consignment.getUserUuid())){ 103 + if (StringUtils.isEmpty(consignment.getUserUuid()) && StringUtils.isEmpty(consignment.getShipperAccount())){
89 /** 104 /**
90 * 非501数据 105 * 非501数据
91 */ 106 */
92 if (StringUtils.isEmpty(bo.getShipperAccount())){ 107 if (StringUtils.isEmpty(bo.getShipperAccount())){
93 - ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
94 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO); 108 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
95 return responseUtils.success(consignmentAddDto); 109 return responseUtils.success(consignmentAddDto);
96 } 110 }
...@@ -99,7 +113,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -99,7 +113,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
99 /** 113 /**
100 * 501数据 114 * 501数据
101 */ 115 */
102 - return consignmentUtil.consignmentCheckWithCe(consignment,bo,user); 116 + return consignmentUtil.consignmentCheckWithCe(consignment,bo,user,ceFlag);
103 } 117 }
104 } 118 }
105 119
...@@ -122,6 +136,11 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -122,6 +136,11 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
122 consignmentBo.getAttachmentBizTypeList(), 136 consignmentBo.getAttachmentBizTypeList(),
123 user, 137 user,
124 consignmentBo.getConsignmentCode()); 138 consignmentBo.getConsignmentCode());
139 +
140 + /**
141 + * 拷贝附件后，需要再次进行附件信息验证
142 + */
143 + attachmentValidate.validateAttachment(attachmentList);
125 /** 144 /**
126 * 初始化运单信息 145 * 初始化运单信息
127 */ 146 */
...@@ -129,87 +148,24 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -129,87 +148,24 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
129 /** 148 /**
130 * 初始化上传记录信息 149 * 初始化上传记录信息
131 */ 150 */
132 - UploadRecord uploadRecord = uploadRecordUtil.initUploadRecord(consignment.getConsignmentCode()); 151 + UploadRecord uploadRecord = uploadRecordUtil.initUploadRecord(consignment.getConsignmentCode(),user);
133 /** 152 /**
134 * 保存运单相关信息 153 * 保存运单相关信息
135 */ 154 */
136 - this.submitInfo(consignment,attachmentList,uploadRecord,user); 155 + consignmentUtil.submitInfo(consignment,attachmentList,uploadRecord,user,consignmentBo.getCeFlag());
156 + }catch(OpErrorException ex){
157 + /**
158 + * 提交异常，需要删除对应已上传附件，已上传文件不进行删除
159 + */
160 +// attachmentService.deleteAttachments(attachmentList);
161 + throw ex;
137 }catch(Exception ex){ 162 }catch(Exception ex){
138 /** 163 /**
139 - * 提交异常，需要删除对应已上传附件 164 + * 提交异常，需要删除对应已上传附件，已上传文件不进行删除
140 */ 165 */
141 - attachmentService.deleteAttachments(attachmentList); 166 +// attachmentService.deleteAttachments(attachmentList);
142 responseUtils.fail(ResponseCode.MESSAGE_CODE_30016,ex); 167 responseUtils.fail(ResponseCode.MESSAGE_CODE_30016,ex);
143 } 168 }
144 return responseUtils.success(ResponseCode.MESSAGE_CODE_30015); 169 return responseUtils.success(ResponseCode.MESSAGE_CODE_30015);
145 } 170 }
146 -
147 - /**
148 - * @Author mt
149 - * @Description 保存运单相关信息
150 - * @Date 2024/11/19
151 - * @param consignment
152 - * @param attachmentList
153 - * @param uploadRecord
154 - * @param user
155 - * @return void
156 - */
157 - @Transactional(rollbackFor = Exception.class)
158 - public void submitInfo(Consignment consignment,
159 - List<Attachment> attachmentList,
160 - UploadRecord uploadRecord,
161 - User user) throws Exception{
162 - /**
163 - * 保存或更新运单表
164 - */
165 - consignmentRepository.saveOrUpdate(consignment);
166 - //设置上传记录表运单ID
167 - uploadRecord.setConsignmentId(consignment.getId());
168 - /**
169 - * 保存上传记录表
170 - */
171 - uploadRecordRepository.saveOrUpdate(uploadRecord);
172 - //设置附件表运单id，上传记录表id
173 - Optional.ofNullable(attachmentList).orElse(new ArrayList<>()).stream().filter(Objects::nonNull).forEach(p->{
174 - p.setBizId(consignment.getId());
175 - p.setUploadRecordId(uploadRecord.getId());
176 - });
177 - /**
178 - * 保存附件表信息
179 - */
180 - attachmentRepository.saveOrUpdateAll(attachmentList);
181 - //用户uuid与运单uuid不一致，则需要添加用户运单中间表信息
182 - if(!user.getUserUuid().equals(consignment.getUserUuid())){
183 - /**
184 - * 查找用户与运单关联信息
185 - */
186 - UserConsignmentMapping userConsignmentMapping = userConsignmentMappingRepository.findByUserIdConsignmentId(user.getId(),consignment.getId());
187 - if(Objects.isNull(userConsignmentMapping)){
188 - /**
189 - * 初始化插入预清关文件推送任务日志
190 - */
191 - userConsignmentMapping = userConsignmentMappingUtil.initUserConsignmentMapping(user.getId(),consignment.getId());
192 - /**
193 - * 初始化插入预清关文件推送任务日志
194 - */
195 - userConsignmentMappingRepository.saveOrUpdate(userConsignmentMapping);
196 - }
197 - }
198 - /**
199 - * Todo 初始化插入预清关文件推送任务日志，szl添加
200 - */
201 -
202 - /**
203 - * 初始化插入预清关文件邮件推送日志，mt添加
204 - */
205 - PushOb pushOb = pushObUtil.initPushOb(consignment,user);
206 - /**
207 - * 初始化插入提醒发件人邮件日志
208 - */
209 - emailService.saveNotificationEmail(consignment,user);
210 - /**
211 - * 推送进口文件主表
212 - */
213 - pushObRepository.saveOrUpdate(pushOb);
214 - }
215 } 171 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.service.biz.impl; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.service.biz.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.common.model.biz.Email; 4 import com.fedex.connect.common.model.biz.Email;
5 +import com.fedex.connect.common.model.biz.UploadRecord;
5 import com.fedex.connect.common.model.sys.User; 6 import com.fedex.connect.common.model.sys.User;
6 import com.fedex.connect.customer.service.base.BaseService; 7 import com.fedex.connect.customer.service.base.BaseService;
7 import com.fedex.connect.customer.service.biz.IEmailService; 8 import com.fedex.connect.customer.service.biz.IEmailService;
...@@ -26,7 +27,7 @@ public class EmailServiceImpl extends BaseService implements IEmailService { ...@@ -26,7 +27,7 @@ public class EmailServiceImpl extends BaseService implements IEmailService {
26 */ 27 */
27 @Override 28 @Override
28 public void saveNotificationEmail(Consignment consignment, User user) throws Exception { 29 public void saveNotificationEmail(Consignment consignment, User user) throws Exception {
29 - if (!StringUtils.isEmpty(consignment.getUserUuid()) && consignment.getUserUuid().equals(user.getUserUuid())){ 30 + if (StringUtils.isEmpty(consignment.getUserUuid()) || consignment.getUserUuid().equals(user.getUserUuid())) {
30 return; 31 return;
31 } 32 }
32 /** 33 /**
...@@ -39,4 +40,17 @@ public class EmailServiceImpl extends BaseService implements IEmailService { ...@@ -39,4 +40,17 @@ public class EmailServiceImpl extends BaseService implements IEmailService {
39 */ 40 */
40 emailRepository.save(email); 41 emailRepository.save(email);
41 } 42 }
43 +
44 + @Override
45 + public void savePushConsignmentFileEmail(Consignment consignment,UploadRecord uploadRecord) throws Exception {
46 + /**
47 + * 初始化Email对象
48 + */
49 + Email email = new Email();
50 + emailUtil.initPushConsignmentFileEmail(email,consignment, uploadRecord);
51 + /**
52 + * 保存入库
53 + */
54 + emailRepository.save(email);
55 + }
42 } 56 }
......
...@@ -38,7 +38,7 @@ public class UploadRecordServiceImpl extends BaseService implements IUploadRecor ...@@ -38,7 +38,7 @@ public class UploadRecordServiceImpl extends BaseService implements IUploadRecor
38 AttachmentHistoryDto attachmentHistoryDto = new AttachmentHistoryDto(); 38 AttachmentHistoryDto attachmentHistoryDto = new AttachmentHistoryDto();
39 attachmentHistoryDto.setUploadRecord(uploadRecord); 39 attachmentHistoryDto.setUploadRecord(uploadRecord);
40 attachmentHistoryDto.setCreatorFlag( 40 attachmentHistoryDto.setCreatorFlag(
41 - (uploadRecord.getCreateUserId() != null) ? 41 + (uploadRecord.getCreateUserId() != null) && uploadRecord.getCreateUserId().equals(user.getId()) ?
42 DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO 42 DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
43 ); 43 );
44 attachmentHistoryDtos.add(attachmentHistoryDto); 44 attachmentHistoryDtos.add(attachmentHistoryDto);
......
...@@ -52,10 +52,10 @@ public class AttachmentUtil { ...@@ -52,10 +52,10 @@ public class AttachmentUtil {
52 private void initAttachment(Attachment attachment,String bizType,User user) throws Exception{ 52 private void initAttachment(Attachment attachment,String bizType,User user) throws Exception{
53 DictionaryEntries attachmentBizTypeEntries = cacheSystem.getDicAttachmentBizType(bizType); 53 DictionaryEntries attachmentBizTypeEntries = cacheSystem.getDicAttachmentBizType(bizType);
54 attachment.setBizTypeCode(attachmentBizTypeEntries.getCode()); 54 attachment.setBizTypeCode(attachmentBizTypeEntries.getCode());
55 - attachment.setBizTypeName(attachmentBizTypeEntries.getEnglishName()); 55 + attachment.setBizTypeName(attachmentBizTypeEntries.getDescription());
56 DictionaryEntries attachmentFileTypeEntries = cacheSystem.getDicAttachmentFileType(AttachmentFileTypeEnum.FILE.getCode()); 56 DictionaryEntries attachmentFileTypeEntries = cacheSystem.getDicAttachmentFileType(AttachmentFileTypeEnum.FILE.getCode());
57 attachment.setFileTypeCode(attachmentFileTypeEntries.getCode()); 57 attachment.setFileTypeCode(attachmentFileTypeEntries.getCode());
58 - attachment.setFileTypeName(attachmentFileTypeEntries.getEnglishName()); 58 + attachment.setFileTypeName(attachmentFileTypeEntries.getDescription());
59 attachment.setStatus(StatusEnum.YES.getCode()); 59 attachment.setStatus(StatusEnum.YES.getCode());
60 attachment.setCreateUserId(user.getId()); 60 attachment.setCreateUserId(user.getId());
61 attachment.setCreateUserName(user.getUserName()); 61 attachment.setCreateUserName(user.getUserName());
...@@ -142,6 +142,7 @@ public class AttachmentUtil { ...@@ -142,6 +142,7 @@ public class AttachmentUtil {
142 142
143 public static MultipartFile findFileByName(MultipartFile[] files, String fileName) { 143 public static MultipartFile findFileByName(MultipartFile[] files, String fileName) {
144 for (MultipartFile file : files) { 144 for (MultipartFile file : files) {
145 + log.info("fileName:" + file.getOriginalFilename());
145 if (file.getOriginalFilename().equals(fileName)) { 146 if (file.getOriginalFilename().equals(fileName)) {
146 return file; // 找到匹配的文件，返回该文件 147 return file; // 找到匹配的文件，返回该文件
147 } 148 }
......
1 +package com.fedex.connect.customer.util.service.biz;
2 +
3 +import com.fedex.connect.common.model.biz.Consignment;
4 +import com.fedex.connect.common.model.biz.UserConsignmentMapping;
5 +import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
6 +import com.fedex.connect.customer.repository.repo.IUserConsignmentMappingRepository;
7 +import lombok.extern.slf4j.Slf4j;
8 +import org.springframework.beans.factory.annotation.Autowired;
9 +import org.springframework.stereotype.Component;
10 +
11 +import java.util.Objects;
12 +
13 +/**
14 + * @Author mt
15 + * @Description 运单数据查询处理
16 + * @Date 2024/12/24
17 + */
18 +@Slf4j
19 +@Component
20 +public class ConsignmentQueryUtil {
21 + @Autowired
22 + protected IUserConsignmentMappingRepository userConsignmentMappingRepository;
23 + /**
24 + * @Author mt
25 + * @Description 运单查询数据筛选
26 + * @Date 2024/12/24
27 + * @param userConsignmentInfoQuery
28 + * @param consignment
29 + * @return com.fedex.connect.common.model.biz.Consignment
30 + */
31 + public Consignment findConsignment(UserConsignmentInfoQuery userConsignmentInfoQuery,Consignment consignment){
32 + /**
33 + * 查询mapping表
34 + */
35 + UserConsignmentMapping byUserIdAndConsignmentCode = userConsignmentMappingRepository.findByUserIdAndConsignmentCode(userConsignmentInfoQuery.getUserId(), consignment.getConsignmentCode());
36 + Consignment resultConsignment = null;
37 + if(Objects.nonNull(consignment)){
38 + //uuid相同，则将运单所有信息返回给到前端
39 + if(Objects.equals(userConsignmentInfoQuery.getUserUuid(),consignment.getUserUuid()) || (byUserIdAndConsignmentCode.getCeFlag() == null || byUserIdAndConsignmentCode.getCeFlag() == 1L)){
40 + //1：如果运单UUID与登录账号UUID相同或者用户shipperAccount与运单shipperAccount相同，则显示运单、收发件人信息，以及501信息
41 + resultConsignment = consignment;
42 + }else {
43 + //如果运单UUID与登录账号UUID不同，用户shipperAccount与运单录入的shipperAccount一致，则只显示用户录入的运单号、shipperAccount、始发国
44 + resultConsignment = new Consignment();
45 + resultConsignment.setId(consignment.getId());
46 + resultConsignment.setConsignmentCode(consignment.getConsignmentCode());
47 + resultConsignment.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
48 + resultConsignment.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
49 + resultConsignment.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
50 + resultConsignment.setDestinationCountry(consignment.getDestinationCountry());
51 + resultConsignment.setDestinationCountryCode(consignment.getDestinationCountryCode());
52 + }
53 + }
54 + return resultConsignment;
55 + }
56 +}
...@@ -2,23 +2,49 @@ package com.fedex.connect.customer.util.service.biz; ...@@ -2,23 +2,49 @@ package com.fedex.connect.customer.util.service.biz;
2 2
3 import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum; 3 import com.fedex.connect.common.dependencies.enums.biz.EmailStatusEnum;
4 import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum; 4 import com.fedex.connect.common.dependencies.enums.biz.EmailTypeEnum;
5 +import com.fedex.connect.common.dependencies.template.clearanceEmail.DuplicateEmailTemplate;
5 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils; 6 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
6 import com.fedex.connect.common.model.biz.Consignment; 7 import com.fedex.connect.common.model.biz.Consignment;
7 import com.fedex.connect.common.model.biz.Email; 8 import com.fedex.connect.common.model.biz.Email;
9 +import com.fedex.connect.common.model.biz.UploadRecord;
10 +import com.fedex.connect.customer.repository.repo.IUserRepository;
11 +import org.apache.commons.lang3.StringUtils;
12 +import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 13 import org.springframework.stereotype.Component;
9 14
15 +import java.util.Optional;
16 +
10 @Component 17 @Component
11 public class EmailUtil { 18 public class EmailUtil {
19 + @Autowired
20 + private IUserRepository iUserRepository;
21 + @Autowired
22 + private DuplicateEmailTemplate duplicateEmailTemplate;
23 +
12 public void initNotificationEmail(Email email, Consignment consignment) throws Exception{ 24 public void initNotificationEmail(Email email, Consignment consignment) throws Exception{
13 email.setBizId(consignment.getId()); 25 email.setBizId(consignment.getId());
14 email.setBizCode(consignment.getConsignmentCode()); 26 email.setBizCode(consignment.getConsignmentCode());
15 - email.setToAddress(consignment.getShipperEmail()); 27 + String emailAddress = Optional.ofNullable(consignment.getUserUuid())
16 - email.setSubject(""); 28 + .map(iUserRepository::findUserByUuid)
17 - email.setSubject(""); 29 + .map(user -> StringUtils.defaultIfEmpty(user.getEmail(), consignment.getShipperEmail()))
30 + .orElse(consignment.getShipperEmail());
31 + email.setToAddress(emailAddress);
32 + email.setSubject(duplicateEmailTemplate.getTitle(email.getBizCode()));
18 email.setTypeName(EmailTypeEnum.NOTIFICATION_SENDER.getMsg()); 33 email.setTypeName(EmailTypeEnum.NOTIFICATION_SENDER.getMsg());
19 email.setTypeCode(EmailTypeEnum.NOTIFICATION_SENDER.getCode()); 34 email.setTypeCode(EmailTypeEnum.NOTIFICATION_SENDER.getCode());
20 email.setStatusName(EmailStatusEnum.PENDING.getMsg()); 35 email.setStatusName(EmailStatusEnum.PENDING.getMsg());
21 email.setStatusCode(EmailStatusEnum.PENDING.getCode()); 36 email.setStatusCode(EmailStatusEnum.PENDING.getCode());
22 AssignmentFieldUtils.assignmentTableBaseField(email); 37 AssignmentFieldUtils.assignmentTableBaseField(email);
23 } 38 }
39 +
40 + public void initPushConsignmentFileEmail(Email email, Consignment consignment,UploadRecord uploadRecord) throws Exception{
41 + email.setBizId(uploadRecord.getId());
42 + email.setBizCode(consignment.getConsignmentCode());
43 + email.setSubject("");
44 + email.setTypeName(EmailTypeEnum.PUSH_CON_FILE.getMsg());
45 + email.setTypeCode(EmailTypeEnum.PUSH_CON_FILE.getCode());
46 + email.setStatusName(EmailStatusEnum.PENDING.getMsg());
47 + email.setStatusCode(EmailStatusEnum.PENDING.getCode());
48 + AssignmentFieldUtils.assignmentTableBaseField(email);
49 + }
24 } 50 }
......
...@@ -7,6 +7,7 @@ import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils; ...@@ -7,6 +7,7 @@ import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
7 import com.fedex.connect.common.model.bi.DictionaryEntries; 7 import com.fedex.connect.common.model.bi.DictionaryEntries;
8 import com.fedex.connect.common.model.biz.Consignment; 8 import com.fedex.connect.common.model.biz.Consignment;
9 import com.fedex.connect.common.model.biz.PushOb; 9 import com.fedex.connect.common.model.biz.PushOb;
10 +import com.fedex.connect.common.model.biz.UploadRecord;
10 import com.fedex.connect.common.model.sys.User; 11 import com.fedex.connect.common.model.sys.User;
11 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
12 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
...@@ -29,14 +30,15 @@ public class PushObUtil { ...@@ -29,14 +30,15 @@ public class PushObUtil {
29 * @param 30 * @param
30 * @return com.fedex.connect.common.model.biz.PushOb 31 * @return com.fedex.connect.common.model.biz.PushOb
31 */ 32 */
32 - public PushOb initPushOb(Consignment consignment, User user) throws Exception{ 33 + public PushOb initPushOb(Consignment consignment, UploadRecord uploadRecord, User user) throws Exception{
33 DictionaryEntries pushObStatus = cacheSystem.getDicPushObStatus(PushObStatusEnum.TO_BE_SENT.getCode()); 34 DictionaryEntries pushObStatus = cacheSystem.getDicPushObStatus(PushObStatusEnum.TO_BE_SENT.getCode());
34 PushOb pushOb = new PushOb(); 35 PushOb pushOb = new PushOb();
35 pushOb.setConsignmentId(consignment.getId()); 36 pushOb.setConsignmentId(consignment.getId());
36 pushOb.setConsignmentCode(consignment.getConsignmentCode()); 37 pushOb.setConsignmentCode(consignment.getConsignmentCode());
37 pushOb.setPushNum(DigitConstants.DIGIT_ZERO_LONG); 38 pushOb.setPushNum(DigitConstants.DIGIT_ZERO_LONG);
38 pushOb.setStatusCode(pushObStatus.getCode()); 39 pushOb.setStatusCode(pushObStatus.getCode());
39 - pushOb.setStatusName(pushObStatus.getEnglishName()); 40 + pushOb.setStatusName(pushObStatus.getDescription());
41 + pushOb.setUploadRecordId(uploadRecord.getId());
40 pushOb.setCreateUserId(user.getId()); 42 pushOb.setCreateUserId(user.getId());
41 pushOb.setCreateUserName(user.getUserName()); 43 pushOb.setCreateUserName(user.getUserName());
42 pushOb.setModifyUserId(user.getId()); 44 pushOb.setModifyUserId(user.getId());
......
...@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum; ...@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
6 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils; 6 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
7 import com.fedex.connect.common.model.bi.DictionaryEntries; 7 import com.fedex.connect.common.model.bi.DictionaryEntries;
8 import com.fedex.connect.common.model.biz.UploadRecord; 8 import com.fedex.connect.common.model.biz.UploadRecord;
9 +import com.fedex.connect.common.model.sys.User;
9 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
10 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 12 import org.springframework.stereotype.Component;
...@@ -28,7 +29,7 @@ public class UploadRecordUtil { ...@@ -28,7 +29,7 @@ public class UploadRecordUtil {
28 * @param consignmentCode 29 * @param consignmentCode
29 * @return com.fedex.connect.common.model.biz.UploadRecord 30 * @return com.fedex.connect.common.model.biz.UploadRecord
30 */ 31 */
31 - public UploadRecord initUploadRecord(String consignmentCode) throws Exception{ 32 + public UploadRecord initUploadRecord(String consignmentCode, User user) throws Exception{
32 DictionaryEntries consignmentStatusDic = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode()); 33 DictionaryEntries consignmentStatusDic = cacheSystem.getDicConsignmentStatus(ConsignmentStatusEnum.CONSIGNMENT_STATUS_01.getCode());
33 UploadRecord uploadRecord = new UploadRecord(); 34 UploadRecord uploadRecord = new UploadRecord();
34 //记录当前运单号 35 //记录当前运单号
...@@ -36,6 +37,10 @@ public class UploadRecordUtil { ...@@ -36,6 +37,10 @@ public class UploadRecordUtil {
36 //记录当前运单状态 37 //记录当前运单状态
37 uploadRecord.setStatusCode(consignmentStatusDic.getCode()); 38 uploadRecord.setStatusCode(consignmentStatusDic.getCode());
38 uploadRecord.setStatusName(consignmentStatusDic.getEnglishName()); 39 uploadRecord.setStatusName(consignmentStatusDic.getEnglishName());
40 + uploadRecord.setCreateUserId(user.getId());
41 + uploadRecord.setCreateUserName(user.getUserName());
42 + uploadRecord.setModifyUserId(user.getId());
43 + uploadRecord.setModifyUserName(user.getUserName());
39 /** 44 /**
40 * 初始化基础字段 45 * 初始化基础字段
41 */ 46 */
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.util.service.biz; ...@@ -2,6 +2,7 @@ package com.fedex.connect.customer.util.service.biz;
2 2
3 import com.fedex.connect.common.dependencies.enums.base.StatusEnum; 3 import com.fedex.connect.common.dependencies.enums.base.StatusEnum;
4 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils; 4 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
5 +import com.fedex.connect.common.model.biz.Consignment;
5 import com.fedex.connect.common.model.biz.UserConsignmentMapping; 6 import com.fedex.connect.common.model.biz.UserConsignmentMapping;
6 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
7 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
...@@ -22,10 +23,11 @@ public class UserConsignmentMappingUtil { ...@@ -22,10 +23,11 @@ public class UserConsignmentMappingUtil {
22 * @param 23 * @param
23 * @return com.fedex.connect.common.model.biz.PushOb 24 * @return com.fedex.connect.common.model.biz.PushOb
24 */ 25 */
25 - public UserConsignmentMapping initUserConsignmentMapping(Long userId,Long consignmentId) throws Exception{ 26 + public UserConsignmentMapping initUserConsignmentMapping(Long userId, Consignment consignment) throws Exception{
26 UserConsignmentMapping userConsignmentMapping = new UserConsignmentMapping(); 27 UserConsignmentMapping userConsignmentMapping = new UserConsignmentMapping();
27 userConsignmentMapping.setUserId(userId); 28 userConsignmentMapping.setUserId(userId);
28 - userConsignmentMapping.setConsignmentId(consignmentId); 29 + userConsignmentMapping.setConsignmentId(consignment.getId());
30 + userConsignmentMapping.setConsignmentCode(consignment.getConsignmentCode());
29 userConsignmentMapping.setStatus(StatusEnum.YES.getCode()); 31 userConsignmentMapping.setStatus(StatusEnum.YES.getCode());
30 AssignmentFieldUtils.assignmentTableBaseField(userConsignmentMapping); 32 AssignmentFieldUtils.assignmentTableBaseField(userConsignmentMapping);
31 return userConsignmentMapping; 33 return userConsignmentMapping;
......
1 package com.fedex.connect.customer.validate.controller.biz; 1 package com.fedex.connect.customer.validate.controller.biz;
2 2
3 -import com.fedex.connect.common.dependencies.contants.DigitConstants;
4 import com.fedex.connect.common.dependencies.util.ResponseUtils; 3 import com.fedex.connect.common.dependencies.util.ResponseUtils;
5 import com.fedex.connect.common.dependencies.util.Utils; 4 import com.fedex.connect.common.dependencies.util.Utils;
5 +import com.fedex.connect.common.model.biz.Attachment;
6 import com.fedex.connect.customer.constants.CustomerConstant; 6 import com.fedex.connect.customer.constants.CustomerConstant;
7 import com.fedex.connect.customer.data.bo.ConsignmentBo; 7 import com.fedex.connect.customer.data.bo.ConsignmentBo;
8 import com.fedex.connect.customer.enums.ResponseCode; 8 import com.fedex.connect.customer.enums.ResponseCode;
...@@ -34,21 +34,53 @@ public class AttachmentValidate { ...@@ -34,21 +34,53 @@ public class AttachmentValidate {
34 */ 34 */
35 public void validateFile(MultipartFile[] files, ConsignmentBo consignmentBo){ 35 public void validateFile(MultipartFile[] files, ConsignmentBo consignmentBo){
36 //文件为空 36 //文件为空
37 - if(Objects.isNull(files) 37 + if(Objects.isNull(consignmentBo)
38 - || files.length == DigitConstants.DIGIT_MINUS_ONE
39 - || Objects.isNull(consignmentBo)
40 || Objects.isNull(consignmentBo.getAttachmentBizTypeList())){ 38 || Objects.isNull(consignmentBo.getAttachmentBizTypeList())){
41 responseUtils.fail(ResponseCode.MESSAGE_CODE_30006); 39 responseUtils.fail(ResponseCode.MESSAGE_CODE_30006);
42 } 40 }
43 //上传最大文件个数限制 41 //上传最大文件个数限制
44 - if(files.length > CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_TOTAL){ 42 + if(Objects.nonNull(files) && files.length > CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_TOTAL){
45 responseUtils.fail(ResponseCode.MESSAGE_CODE_30007,CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_TOTAL); 43 responseUtils.fail(ResponseCode.MESSAGE_CODE_30007,CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_TOTAL);
46 } 44 }
47 //上传总文件大小限制 45 //上传总文件大小限制
48 List<Long> fileSizeList = new ArrayList<>(); 46 List<Long> fileSizeList = new ArrayList<>();
49 - for(MultipartFile file : files){ 47 + if(Objects.nonNull(files)) {
48 + for (MultipartFile file : files) {
50 fileSizeList.add(file.getSize()); 49 fileSizeList.add(file.getSize());
51 } 50 }
51 + }
52 + //总文件大小
53 + Long totalSize = Utils.listOf(fileSizeList).stream().filter(Objects::nonNull)
54 + .mapToLong(f -> Optional.ofNullable(f).orElse(0L)).sum();
55 + //最大上传总文件大小超过95M
56 + if(totalSize > CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_SIZE){
57 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30008,CustomerConstant.VALIDATE_KEYS.FILE_MAX_SIZE);
58 + }
59 + }
60 +
61 + /**
62 + * @Author mt
63 + * @Description 附件信息校验
64 + * @Date 2024/11/12
65 + * @param files
66 + * @return void
67 + */
68 + public void validateAttachment(List<Attachment> files){
69 + //文件为空
70 + if(Objects.isNull(files)){
71 + return;
72 + }
73 + //上传最大文件个数限制
74 + if(Objects.nonNull(files) && files.size() > CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_TOTAL){
75 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30007,CustomerConstant.VALIDATE_KEYS.UPLOAD_FILE_MAX_TOTAL);
76 + }
77 + //上传总文件大小限制
78 + List<Long> fileSizeList = new ArrayList<>();
79 + if(Objects.nonNull(files)) {
80 + for (Attachment file : files) {
81 + fileSizeList.add(file.getFileSize());
82 + }
83 + }
52 //总文件大小 84 //总文件大小
53 Long totalSize = Utils.listOf(fileSizeList).stream().filter(Objects::nonNull) 85 Long totalSize = Utils.listOf(fileSizeList).stream().filter(Objects::nonNull)
54 .mapToLong(f -> Optional.ofNullable(f).orElse(0L)).sum(); 86 .mapToLong(f -> Optional.ofNullable(f).orElse(0L)).sum();
......
1 package com.fedex.connect.customer.validate.controller.biz; 1 package com.fedex.connect.customer.validate.controller.biz;
2 2
3 -import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
4 import com.fedex.connect.common.dependencies.util.ResponseUtils; 3 import com.fedex.connect.common.dependencies.util.ResponseUtils;
5 import com.fedex.connect.customer.enums.ResponseCode; 4 import com.fedex.connect.customer.enums.ResponseCode;
6 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -8,23 +8,7 @@ spring: ...@@ -8,23 +8,7 @@ spring:
8 #系统环境 8 #系统环境
9 env: dev 9 env: dev
10 10
11 -
12 export: 11 export:
13 - jwt:
14 - securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
15 - urlWhiteList:
16 - - /icleartw/auth
17 - - /icleartw/monitor/ok
18 - - /icleartw/sysUser/logout
19 - - /icleartw/swagger-resources
20 - - /icleartw/webjars
21 - uriWhiteList:
22 - - /icleartw/swagger-ui.html
23 - - /icleartw/swagger-ui/*
24 - - /icleartw/v2/api-docs
25 - - /icleartw/login.html
26 - expire_1H: 7200
27 - expire_1D: 604800
28 mail: 12 mail:
29 smtp: 13 smtp:
30 host: smtp.qiye.aliyun.com 14 host: smtp.qiye.aliyun.com
......
1 spring: 1 spring:
2 datasource: 2 datasource:
3 - jndi-name: jdbc/iclearConnectDS 3 + jndi-name: jdbc/iclconnectDS
4 profiles: 4 profiles:
5 #系统环境 5 #系统环境
6 env: prod 6 env: prod
7 7
8 export: 8 export:
9 - jwt:
10 - securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
11 - urlWhiteList:
12 - - /icleartw/auth
13 - - /icleartw/monitor/ok
14 - - /icleartw/sysUser/logout
15 - - /icleartw/swagger-resources
16 - - /icleartw/webjars
17 - uriWhiteList:
18 - - /icleartw/swagger-ui.html
19 - - /icleartw/swagger-ui/*
20 - - /icleartw/v2/api-docs
21 - - /icleartw/login.html
22 - expire_1H: 7200
23 - expire_1D: 604800
24 mail: 9 mail:
25 smtp: 10 smtp:
26 host: mapper.gslb.fedex.com 11 host: mapper.gslb.fedex.com
...@@ -38,4 +23,4 @@ export: ...@@ -38,4 +23,4 @@ export:
38 23
39 upload: 24 upload:
40 path: 25 path:
41 - attachment: /app/Oracle/Middleware/user_projects/domains/base_domain/iclearConnect/upload/attachment
...\ No newline at end of file ...\ No newline at end of file
26 + attachment: /var/share/iClearPreCLR/upload/attachment
...\ No newline at end of file ...\ No newline at end of file
......
1 spring: 1 spring:
2 datasource: 2 datasource:
3 - jndi-name: jdbc/iclearConnectDS 3 + jndi-name: jdbc/iclconnectDS
4 profiles: 4 profiles:
5 #系统环境 5 #系统环境
6 env: test 6 env: test
7 7
8 export: 8 export:
9 - jwt:
10 - securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
11 - urlWhiteList:
12 - - /icleartw/auth
13 - - /icleartw/monitor/ok
14 - - /icleartw/sysUser/logout
15 - - /icleartw/swagger-resources
16 - - /icleartw/webjars
17 - uriWhiteList:
18 - - /icleartw/swagger-ui.html
19 - - /icleartw/swagger-ui/*
20 - - /icleartw/v2/api-docs
21 - - /icleartw/login.html
22 - expire_1H: 7200
23 - expire_1D: 604800
24 mail: 9 mail:
25 smtp: 10 smtp:
26 host: smtp.qiye.aliyun.com 11 host: smtp.qiye.aliyun.com
......
1 spring: 1 spring:
2 datasource: 2 datasource:
3 - jndi-name: jdbc/iclearConnectDS 3 + jndi-name: jdbc/iclconnectDS
4 profiles: 4 profiles:
5 #系统环境 5 #系统环境
6 env: uat 6 env: uat
7 7
8 export: 8 export:
9 - jwt:
10 - securityKey: C*F-JaNdRgUkXn2r5u8x/A?D(G+KbPeShVmYq3s6v9y$B&E)H@McQfTjWnZr4u7w
11 - urlWhiteList:
12 - - /icleartw/auth
13 - - /icleartw/monitor/ok
14 - - /icleartw/sysUser/logout
15 - - /icleartw/swagger-resources
16 - - /icleartw/webjars
17 - uriWhiteList:
18 - - /icleartw/swagger-ui.html
19 - - /icleartw/swagger-ui/*
20 - - /icleartw/v2/api-docs
21 - - /icleartw/login.html
22 - expire_1H: 7200
23 - expire_1D: 604800
24 mail: 9 mail:
25 smtp: 10 smtp:
26 host: mapper.gslb.fedex.com 11 host: mapper.gslb.fedex.com
...@@ -38,4 +23,4 @@ export: ...@@ -38,4 +23,4 @@ export:
38 23
39 upload: 24 upload:
40 path: 25 path:
41 - attachment: /var/share/iclearConnect/upload/attachment
...\ No newline at end of file ...\ No newline at end of file
26 + attachment: /var/share/iClearPreCLR/upload/attachment
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -29,6 +29,7 @@ import: ...@@ -29,6 +29,7 @@ import:
29 - /biz-customer/user/logout 29 - /biz-customer/user/logout
30 - /biz-customer/swagger-resources 30 - /biz-customer/swagger-resources
31 - /biz-customer/webjars 31 - /biz-customer/webjars
32 + - /biz-customer/csrf
32 uriWhiteList: 33 uriWhiteList:
33 - /biz-customer/swagger-ui.html 34 - /biz-customer/swagger-ui.html
34 - /biz-customer/swagger-ui/* 35 - /biz-customer/swagger-ui/*
...@@ -44,3 +45,7 @@ mybatis: ...@@ -44,3 +45,7 @@ mybatis:
44 #开启驼峰与下划线转换 45 #开启驼峰与下划线转换
45 map-underscore-to-camel-case: true 46 map-underscore-to-camel-case: true
46 call-setters-on-nulls: true 47 call-setters-on-nulls: true
48 +#全局异常拦截是否生效
49 +common:
50 + exception-advice-webconfig:
51 + enable: true
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <configuration> 2 <configuration>
3 <springProfile name="dev,uat,prod"> 3 <springProfile name="dev,uat,prod">
4 <!-- 日志存放路径 --> 4 <!-- 日志存放路径 -->
5 - <property name="log.path" value="/var/fedex/iclearConnect/weblogic/iclearConnect/biz-customer" /> 5 + <property name="log.path" value="/var/fedex/iclconnect/weblogic/biz-customer" />
6 </springProfile> 6 </springProfile>
7 <springProfile name="test"> 7 <springProfile name="test">
8 <!-- 日志存放路径 --> 8 <!-- 日志存放路径 -->
......
1 +#******************系统操作日志记录，中文展示******************
2 +business_log_20001=添加运单
3 +business_log_20002=提交运单
4 +business_log_20003=运单查询
5 +business_log_20004=运单详细信息查询
6 +business_log_20005=根据运单ID查询用户上传记录
7 +business_log_20006=运单历史上传记录查询
8 +business_log_20007=上传历史附件记录
9 +business_log_20008=下载附件
10 +system_exception_20003=提示信息过长，未保存成功
11 +
12 +#******************鉴权相关提示，需要做国际化******************
13 +#authentication包
14 +#没有访问权限
15 +system_exception_10001=No access rights.
16 +#没有通过权限认证
17 +system_exception_10002=Failed to pass the authentication.
18 +#登录身份异常
19 +system_exception_10003=Login identity is abnormal.
20 +#登录超过8小时，请重新登录
21 +system_exception_10004=Login has exceeded 8 hours, please log in again.
22 +#登录已过期，请重新登录
23 +system_exception_10005=Login has expired, please log in again.
24 +
25 +#******************业务相关、需要做国际化******************
26 +#*********用于字段描述使用，不单独使用**********
27 +#发货人计费账号
28 +business_field_31001=shipper account
29 +#运单ID
30 +business_field_31002=tracking number ID
31 +#运单号
32 +business_field_31003=tracking number
33 +#始发国编码
34 +business_field_31004=origin country ID
35 +#始发国名称
36 +business_field_31005=origin country
37 +#目的国编码
38 +business_field_31006=destination country ID
39 +#目的国全称
40 +business_field_31007=destination country
41 +#文件业务类型
42 +business_field_31008=upload file type
43 +
44 +#*********具体响应到前端**********
45 +#{0}必填字段未填写
46 +business_exception_30001=Required fields not filled in.
47 +#单次最多可查询1000个运单号码
48 +business_exception_30002=A maximum of 1,000 waybill numbers can be queried at a time.
49 +#暂时没用，预留
50 +business_exception_30003={0}不正确，请重新输入
51 +business_exception_30004=The waybill you entered is generated by another user, whether continue uploading?
52 +business_exception_30005=The waybill you entered is generated by another account, whether continue uploading?
53 +#附件未上传
54 +business_exception_30006=Attachment not uploaded.
55 +#所有上传文件数量不超过{0}个文件
56 +business_exception_30007=The total number of uploaded files should not exceed 100 files.
57 +#所有上传文件总大小不超过{0}M
58 +business_exception_30008=The total size of all uploaded files should not exceed {0}MB.
59 +#暂时没用，预留
60 +business_exception_30009=运单或发票未上传
61 +#暂时没用，预留
62 +business_exception_30010=文件类型不在：运单、发票、箱单、其他
63 +#该运单已被其他人创建，不可以重复创建
64 +business_exception_30011=This waybill has been created by someone else and cannot be created again.
65 +#暂时没用，预留
66 +business_exception_30012=UUID不一致
67 +#文件名为：{0}，上传失败，请检查后重试
68 +business_exception_30013=File name: {0}, upload failed, please check and try again
69 +#运单信息加载失败，请稍后重试
70 +business_exception_30014=Air waybill information loading failed, please try again later
71 +#提交成功
72 +business_success_30015=Submission successful
73 +#提交失败，请稍后重试!
74 +business_exception_30016=Submission failed, please try again later!
75 +#运单号填写错误，请检查!
76 +business_exception_30017=Air waybill number is incorrect, please check!
77 +#运单提交失败，该运单正在被其他用户操作，请稍后重试
78 +business_exception_30018=Air waybill submission failed, the waybill is being operated by other users, please try again later.
79 +#Shipper Account填写错误（Shipper Account是由9位数字组成）
80 +business_exception_30019=Incorrect Shipper Account(Shipper Account is composed of 9 digits).
81 +#您当前登录账号的shipper Account与您正在录入的shipperAccount不一致，请确认是否继续？
82 +business_exception_30020=The Shipper Account you are entering is inconsistent with your login Shipper Account. Please confirm whether to continue?
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -6,42 +6,77 @@ business_log_20004=运单详细信息查询 ...@@ -6,42 +6,77 @@ business_log_20004=运单详细信息查询
6 business_log_20005=根据运单ID查询用户上传记录 6 business_log_20005=根据运单ID查询用户上传记录
7 business_log_20006=运单历史上传记录查询 7 business_log_20006=运单历史上传记录查询
8 business_log_20007=上传历史附件记录 8 business_log_20007=上传历史附件记录
9 +business_log_20008=下载附件
9 system_exception_20003=提示信息过长，未保存成功 10 system_exception_20003=提示信息过长，未保存成功
10 11
11 #******************鉴权相关提示，需要做国际化****************** 12 #******************鉴权相关提示，需要做国际化******************
12 #authentication包 13 #authentication包
13 -system_exception_10001=没有访问权限 14 +#没有访问权限
14 -system_exception_10002=没有通过权限认证 15 +system_exception_10001=No access rights.
15 -system_exception_10003=登录身份异常 16 +#没有通过权限认证
16 -system_exception_10004=登录超过8小时，请重新登录 17 +system_exception_10002=Failed to pass the authentication.
17 -system_exception_10005=登录已过期 18 +#登录身份异常
18 -system_exception_10006=登录已过期，请重新登录 19 +system_exception_10003=Login identity is abnormal.
20 +#登录超过8小时，请重新登录
21 +system_exception_10004=Login has exceeded 8 hours, please log in again.
22 +#登录已过期，请重新登录
23 +system_exception_10005=Login has expired, please log in again.
19 24
20 #******************业务相关、需要做国际化****************** 25 #******************业务相关、需要做国际化******************
21 #*********用于字段描述使用，不单独使用********** 26 #*********用于字段描述使用，不单独使用**********
22 -business_field_31001=发货人计费账号 27 +#发货人计费账号
23 -business_field_31002=运单ID 28 +business_field_31001=shipper account
24 -business_field_31003=运单号 29 +#运单ID
25 -business_field_31004=原产国编码 30 +business_field_31002=tracking number ID
26 -business_field_31005=原产国名称 31 +#运单号
27 -business_field_31006=目的国编码 32 +business_field_31003=tracking number
28 -business_field_31007=目的国全称 33 +#始发国编码
29 -business_field_31008=文件业务类型 34 +business_field_31004=origin country ID
35 +#始发国名称
36 +business_field_31005=origin country
37 +#目的国编码
38 +business_field_31006=destination country ID
39 +#目的国全称
40 +business_field_31007=destination country
41 +#文件业务类型
42 +business_field_31008=upload file type
30 43
31 #*********具体响应到前端********** 44 #*********具体响应到前端**********
32 -business_exception_30001=#{0}必填字段未填写 45 +#{0}必填字段未填写
33 -business_exception_30002=单次最多可查询1000个运单号码 46 +business_exception_30001=Required fields not filled in.
34 -business_exception_30003=#{0}不正确，请重新输入 47 +#单次最多可查询1000个运单号码
35 -business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 48 +business_exception_30002=A maximum of 1,000 waybill numbers can be queried at a time.
36 -business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation. 49 +#暂时没用，预留
37 -business_exception_30006=附件上传不符合标准 50 +business_exception_30003={0}不正确，请重新输入
38 -business_exception_30007=所有上传文件数量不超过#{0}个文件 51 +business_exception_30004=The waybill you entered is generated by another user, whether continue uploading?
39 -business_exception_30008=所有上传文件总大小不超过#{0}M 52 +business_exception_30005=The waybill you entered is generated by another account, whether continue uploading?
53 +#附件未上传
54 +business_exception_30006=Attachment not uploaded.
55 +#所有上传文件数量不超过{0}个文件
56 +business_exception_30007=The total number of uploaded files should not exceed 100 files.
57 +#所有上传文件总大小不超过{0}M
58 +business_exception_30008=The total size of all uploaded files should not exceed {0}MB.
59 +#暂时没用，预留
40 business_exception_30009=运单或发票未上传 60 business_exception_30009=运单或发票未上传
61 +#暂时没用，预留
41 business_exception_30010=文件类型不在：运单、发票、箱单、其他 62 business_exception_30010=文件类型不在：运单、发票、箱单、其他
42 -business_exception_30011=该运单已被其他人创建，不可以重复创建 63 +#该运单已被其他人创建，不可以重复创建
64 +business_exception_30011=This waybill has been created by someone else and cannot be created again.
65 +#暂时没用，预留
43 business_exception_30012=UUID不一致 66 business_exception_30012=UUID不一致
44 -business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
45 -business_exception_30014=运单信息加载失败，请稍后重试
46 -business_success_30015=提交成功
47 -business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
67 +#文件名为：{0}，上传失败，请检查后重试
68 +business_exception_30013=File name: {0}, upload failed, please check and try again
69 +#运单信息加载失败，请稍后重试
70 +business_exception_30014=Air waybill information loading failed, please try again later
71 +#提交成功
72 +business_success_30015=Submission successful
73 +#提交失败，请稍后重试!
74 +business_exception_30016=Submission failed, please try again later!
75 +#运单号填写错误，请检查!
76 +business_exception_30017=Air waybill number is incorrect, please check!
77 +#运单提交失败，该运单正在被其他用户操作，请稍后重试
78 +business_exception_30018=Air waybill submission failed, the waybill is being operated by other users, please try again later.
79 +#Shipper Account填写错误（Shipper Account是由9位数字组成）
80 +business_exception_30019=Incorrect Shipper Account(Shipper Account is composed of 9 digits).
81 +#您当前登录账号的shipper Account与您正在录入的shipperAccount不一致，请确认是否继续？
82 +business_exception_30020=The Shipper Account you are entering is inconsistent with your login Shipper Account. Please confirm whether to continue?
...\ No newline at end of file ...\ No newline at end of file
......
1 -#******************系统操作日志记录，中文展示******************
2 -business_log_20001=添加运单
3 -business_log_20002=提交运单
4 -business_log_20003=运单查询
5 -business_log_20004=运单详细信息查询
6 -business_log_20005=根据运单ID查询用户上传记录
7 -business_log_20006=运单历史上传记录查询
8 -business_log_20007=上传历史附件记录
9 -system_exception_20003=提示信息过长，未保存成功
10 -
11 -#******************鉴权相关提示，需要做国际化******************
12 -#authentication包
13 -system_exception_10001=没有访问权限
14 -system_exception_10002=没有通过权限认证
15 -system_exception_10003=登录身份异常
16 -system_exception_10004=登录超过8小时，请重新登录
17 -system_exception_10005=登录已过期
18 -system_exception_10006=登录已过期，请重新登录
19 -
20 -#******************业务相关、需要做国际化******************
21 -#*********用于字段描述使用，不单独使用**********
22 -business_field_31001=发货人计费账号
23 -business_field_31002=运单ID
24 -business_field_31003=运单号
25 -business_field_31004=原产国编码
26 -business_field_31005=原产国名称
27 -business_field_31006=目的国编码
28 -business_field_31007=目的国全称
29 -business_field_31008=文件业务类型
30 -
31 -#*********具体响应到前端**********
32 -business_exception_30001=${0}必填字段未填写
33 -business_exception_30002=单次最多可查询1000个运单号码
34 -business_exception_30003=${0}不正确，请重新输入
35 -business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
36 -business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
37 -business_exception_30006=附件上传不符合标准
38 -business_exception_30007=所有上传文件数量不超过50个文件
39 -business_exception_30008=所有上传文件总大小不超过50M
40 -business_exception_30009=运单或发票未上传
41 -business_exception_30010=文件类型不在：运单、发票、箱单、其他
42 -business_exception_30011=该运单已被其他人创建，不可以重复创建
43 -business_exception_30012=UUID不一致
44 -business_exception_30013=文件名为：#{0}，上传失败，请检查后重试
45 -business_exception_30014=运单信息加载失败，请稍后重试
46 -business_success_30015=提交成功
47 -business_exception_30016=运单提交失败
...\ No newline at end of file ...\ No newline at end of file
1 +##******************系统操作日志记录，中文展示******************
2 +#business_log_20001=添加运单
3 +#business_log_20002=提交运单
4 +#business_log_20003=运单查询
5 +#business_log_20004=运单详细信息查询
6 +#business_log_20005=根据运单ID查询用户上传记录
7 +#business_log_20006=运单历史上传记录查询
8 +#business_log_20007=上传历史附件记录
9 +#business_log_20008=下载附件
10 +#system_exception_20003=提示信息过长，未保存成功
11 +#
12 +##******************鉴权相关提示，需要做国际化******************
13 +##authentication包
14 +#system_exception_10001=没有访问权限
15 +#system_exception_10002=没有通过权限认证
16 +#system_exception_10003=登录身份异常
17 +#system_exception_10004=登录超过8小时，请重新登录
18 +#system_exception_10005=登录已过期，请重新登录
19 +#
20 +##******************业务相关、需要做国际化******************
21 +##*********用于字段描述使用，不单独使用**********
22 +##business_field_31001=发货人计费账号
23 +#business_field_31001=shipper account
24 +##business_field_31002=运单ID
25 +#business_field_31002=tracking number ID
26 +##business_field_31003=运单号
27 +#business_field_31003=tracking number
28 +##business_field_31004=始发国编码
29 +#business_field_31004=origin country ID
30 +##business_field_31005=始发国名称
31 +#business_field_31005=origin country
32 +##business_field_31006=目的国编码
33 +#business_field_31006=destination country ID
34 +##business_field_31007=目的国全称
35 +#business_field_31007=destination country
36 +##business_field_31008=文件业务类型
37 +#business_field_31008=upload file type
38 +#
39 +##*********具体响应到前端**********
40 +#business_exception_30001={0}必填字段未填写
41 +#business_exception_30002=单次最多可查询1000个运单号码
42 +#business_exception_30003={0}不正确，请重新输入
43 +#business_exception_30004=The waybill you entered is generated by another user, whether continue uploading?
44 +#business_exception_30005=The waybill you entered is generated by another account, whether continue uploading?
45 +#business_exception_30006=附件未上传
46 +#business_exception_30007=所有上传文件数量不超过{0}个文件
47 +#business_exception_30008=所有上传文件总大小不超过{0}M
48 +#business_exception_30009=运单或发票未上传
49 +#business_exception_30010=文件类型不在：运单、发票、箱单、其他
50 +#business_exception_30011=该运单已被其他人创建，不可以重复创建
51 +#business_exception_30012=UUID不一致
52 +#business_exception_30013=文件名为：{0}，上传失败，请检查后重试
53 +#business_exception_30014=运单信息加载失败，请稍后重试
54 +#business_success_30015=提交成功
55 +#business_exception_30016=提交失败，请稍后重试!
56 +#business_exception_30017=运单号填写错误，请检查!
57 +#business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试
58 +#business_exception_30019=Shipper Account填写错误（Shipper Account是由9位数字组成）
59 +#business_exception_30020=您当前登录账号的shipper Account与您正在录入的shipperAccount不一致，请确认是否继续？
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.common.dao.log; ...@@ -2,6 +2,7 @@ package com.fedex.connect.common.dao.log;
2 2
3 import com.fedex.connect.common.model.log.Operation; 3 import com.fedex.connect.common.model.log.Operation;
4 import com.fedex.connect.common.model.log.OperationExample; 4 import com.fedex.connect.common.model.log.OperationExample;
5 +import com.fedex.connect.common.model.log.OperationWithBLOBs;
5 import java.util.List; 6 import java.util.List;
6 import org.apache.ibatis.annotations.Param; 7 import org.apache.ibatis.annotations.Param;
7 8
...@@ -12,25 +13,25 @@ public interface OperationMapper { ...@@ -12,25 +13,25 @@ public interface OperationMapper {
12 13
13 int deleteByPrimaryKey(Long id); 14 int deleteByPrimaryKey(Long id);
14 15
15 - int insert(Operation record); 16 + int insert(OperationWithBLOBs record);
16 17
17 - int insertSelective(Operation record); 18 + int insertSelective(OperationWithBLOBs record);
18 19
19 - List<Operation> selectByExampleWithBLOBs(OperationExample example); 20 + List<OperationWithBLOBs> selectByExampleWithBLOBs(OperationExample example);
20 21
21 List<Operation> selectByExample(OperationExample example); 22 List<Operation> selectByExample(OperationExample example);
22 23
23 - Operation selectByPrimaryKey(Long id); 24 + OperationWithBLOBs selectByPrimaryKey(Long id);
24 25
25 - int updateByExampleSelective(@Param("record") Operation record, @Param("example") OperationExample example); 26 + int updateByExampleSelective(@Param("record") OperationWithBLOBs record, @Param("example") OperationExample example);
26 27
27 - int updateByExampleWithBLOBs(@Param("record") Operation record, @Param("example") OperationExample example); 28 + int updateByExampleWithBLOBs(@Param("record") OperationWithBLOBs record, @Param("example") OperationExample example);
28 29
29 int updateByExample(@Param("record") Operation record, @Param("example") OperationExample example); 30 int updateByExample(@Param("record") Operation record, @Param("example") OperationExample example);
30 31
31 - int updateByPrimaryKeySelective(Operation record); 32 + int updateByPrimaryKeySelective(OperationWithBLOBs record);
32 33
33 - int updateByPrimaryKeyWithBLOBs(Operation record); 34 + int updateByPrimaryKeyWithBLOBs(OperationWithBLOBs record);
34 35
35 int updateByPrimaryKey(Operation record); 36 int updateByPrimaryKey(Operation record);
36 } 37 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 </if> 118 </if>
119 'true' as QUERYID, 119 'true' as QUERYID,
120 <include refid="Base_Column_List" /> 120 <include refid="Base_Column_List" />
121 - from ICLEARIMP.T_BIZ_CE_INFO 121 + from iclconnect.T_BIZ_CE_INFO
122 <if test="_parameter != null"> 122 <if test="_parameter != null">
123 <include refid="Example_Where_Clause" /> 123 <include refid="Example_Where_Clause" />
124 </if> 124 </if>
...@@ -130,15 +130,15 @@ ...@@ -130,15 +130,15 @@
130 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> 130 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
131 select 131 select
132 <include refid="Base_Column_List" /> 132 <include refid="Base_Column_List" />
133 - from ICLEARIMP.T_BIZ_CE_INFO 133 + from iclconnect.T_BIZ_CE_INFO
134 where ID = #{id,jdbcType=NUMERIC} 134 where ID = #{id,jdbcType=NUMERIC}
135 </select> 135 </select>
136 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 136 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
137 - delete from ICLEARIMP.T_BIZ_CE_INFO 137 + delete from iclconnect.T_BIZ_CE_INFO
138 where ID = #{id,jdbcType=NUMERIC} 138 where ID = #{id,jdbcType=NUMERIC}
139 </delete> 139 </delete>
140 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample"> 140 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample">
141 - delete from ICLEARIMP.T_BIZ_CE_INFO 141 + delete from iclconnect.T_BIZ_CE_INFO
142 <if test="_parameter != null"> 142 <if test="_parameter != null">
143 <include refid="Example_Where_Clause" /> 143 <include refid="Example_Where_Clause" />
144 </if> 144 </if>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 147 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
148 SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL 148 SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL
149 </selectKey> 149 </selectKey>
150 - insert into ICLEARIMP.T_BIZ_CE_INFO (ID, CONSIGNMENT_CODE, SEND_TIME, 150 + insert into iclconnect.T_BIZ_CE_INFO (ID, CONSIGNMENT_CODE, SEND_TIME,
151 SHIP_DATE, DEST_IATA_CODE, CREATE_TIME, 151 SHIP_DATE, DEST_IATA_CODE, CREATE_TIME,
152 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 152 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
153 MODIFY_USER_ID, MODIFY_USER_NAME, CUSTOMS_CURRENCY, 153 MODIFY_USER_ID, MODIFY_USER_NAME, CUSTOMS_CURRENCY,
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
180 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 180 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
181 SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL 181 SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL
182 </selectKey> 182 </selectKey>
183 - insert into ICLEARIMP.T_BIZ_CE_INFO 183 + insert into iclconnect.T_BIZ_CE_INFO
184 <trim prefix="(" suffix=")" suffixOverrides=","> 184 <trim prefix="(" suffix=")" suffixOverrides=",">
185 ID, 185 ID,
186 <if test="consignmentCode != null"> 186 <if test="consignmentCode != null">
...@@ -417,13 +417,13 @@ ...@@ -417,13 +417,13 @@
417 </trim> 417 </trim>
418 </insert> 418 </insert>
419 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long"> 419 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long">
420 - select count(*) from ICLEARIMP.T_BIZ_CE_INFO 420 + select count(*) from iclconnect.T_BIZ_CE_INFO
421 <if test="_parameter != null"> 421 <if test="_parameter != null">
422 <include refid="Example_Where_Clause" /> 422 <include refid="Example_Where_Clause" />
423 </if> 423 </if>
424 </select> 424 </select>
425 <update id="updateByExampleSelective" parameterType="map"> 425 <update id="updateByExampleSelective" parameterType="map">
426 - update ICLEARIMP.T_BIZ_CE_INFO 426 + update iclconnect.T_BIZ_CE_INFO
427 <set> 427 <set>
428 <if test="record.id != null"> 428 <if test="record.id != null">
429 ID = #{record.id,jdbcType=NUMERIC}, 429 ID = #{record.id,jdbcType=NUMERIC},
...@@ -548,7 +548,7 @@ ...@@ -548,7 +548,7 @@
548 </if> 548 </if>
549 </update> 549 </update>
550 <update id="updateByExample" parameterType="map"> 550 <update id="updateByExample" parameterType="map">
551 - update ICLEARIMP.T_BIZ_CE_INFO 551 + update iclconnect.T_BIZ_CE_INFO
552 set ID = #{record.id,jdbcType=NUMERIC}, 552 set ID = #{record.id,jdbcType=NUMERIC},
553 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 553 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
554 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP}, 554 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
...@@ -593,7 +593,7 @@ ...@@ -593,7 +593,7 @@
593 </if> 593 </if>
594 </update> 594 </update>
595 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.biz.CeInfo"> 595 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.biz.CeInfo">
596 - update ICLEARIMP.T_BIZ_CE_INFO 596 + update iclconnect.T_BIZ_CE_INFO
597 <set> 597 <set>
598 <if test="consignmentCode != null"> 598 <if test="consignmentCode != null">
599 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 599 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
...@@ -713,7 +713,7 @@ ...@@ -713,7 +713,7 @@
713 where ID = #{id,jdbcType=NUMERIC} 713 where ID = #{id,jdbcType=NUMERIC}
714 </update> 714 </update>
715 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.CeInfo"> 715 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.CeInfo">
716 - update ICLEARIMP.T_BIZ_CE_INFO 716 + update iclconnect.T_BIZ_CE_INFO
717 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 717 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
718 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP}, 718 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
719 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP}, 719 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 19 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
20 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 20 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
21 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 21 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
22 + <result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" />
22 </resultMap> 23 </resultMap>
23 <sql id="Example_Where_Clause"> 24 <sql id="Example_Where_Clause">
24 <where> 25 <where>
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
81 <sql id="Base_Column_List"> 82 <sql id="Base_Column_List">
82 ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, PUSH_TIME, STATUS_CODE, STATUS_NAME, PUSH_NUM, 83 ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, PUSH_TIME, STATUS_CODE, STATUS_NAME, PUSH_NUM,
83 FILE_PATH, FILE_BACK_PATH, FILE_NAME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 84 FILE_PATH, FILE_BACK_PATH, FILE_NAME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
84 - MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 85 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID
85 </sql> 86 </sql>
86 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.PushObExample" resultMap="BaseResultMap"> 87 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.PushObExample" resultMap="BaseResultMap">
87 <include refid="OracleDialectPrefix" /> 88 <include refid="OracleDialectPrefix" />
...@@ -125,13 +126,15 @@ ...@@ -125,13 +126,15 @@
125 PUSH_NUM, FILE_PATH, FILE_BACK_PATH, 126 PUSH_NUM, FILE_PATH, FILE_BACK_PATH,
126 FILE_NAME, REMARK, CREATE_TIME, 127 FILE_NAME, REMARK, CREATE_TIME,
127 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 128 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
128 - MODIFY_USER_ID, MODIFY_USER_NAME) 129 + MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID
130 + )
129 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC}, 131 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC},
130 #{pushTime,jdbcType=TIMESTAMP}, #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, 132 #{pushTime,jdbcType=TIMESTAMP}, #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR},
131 #{pushNum,jdbcType=NUMERIC}, #{filePath,jdbcType=VARCHAR}, #{fileBackPath,jdbcType=VARCHAR}, 133 #{pushNum,jdbcType=NUMERIC}, #{filePath,jdbcType=VARCHAR}, #{fileBackPath,jdbcType=VARCHAR},
132 #{fileName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 134 #{fileName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
133 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 135 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
134 - #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}) 136 + #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC}
137 + )
135 </insert> 138 </insert>
136 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.PushOb"> 139 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.PushOb">
137 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 140 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -188,6 +191,9 @@ ...@@ -188,6 +191,9 @@
188 <if test="modifyUserName != null"> 191 <if test="modifyUserName != null">
189 MODIFY_USER_NAME, 192 MODIFY_USER_NAME,
190 </if> 193 </if>
194 + <if test="uploadRecordId != null">
195 + UPLOAD_RECORD_ID,
196 + </if>
191 </trim> 197 </trim>
192 <trim prefix="values (" suffix=")" suffixOverrides=","> 198 <trim prefix="values (" suffix=")" suffixOverrides=",">
193 #{id,jdbcType=NUMERIC}, 199 #{id,jdbcType=NUMERIC},
...@@ -239,6 +245,9 @@ ...@@ -239,6 +245,9 @@
239 <if test="modifyUserName != null"> 245 <if test="modifyUserName != null">
240 #{modifyUserName,jdbcType=VARCHAR}, 246 #{modifyUserName,jdbcType=VARCHAR},
241 </if> 247 </if>
248 + <if test="uploadRecordId != null">
249 + #{uploadRecordId,jdbcType=NUMERIC},
250 + </if>
242 </trim> 251 </trim>
243 </insert> 252 </insert>
244 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.PushObExample" resultType="java.lang.Long"> 253 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.PushObExample" resultType="java.lang.Long">
...@@ -301,6 +310,9 @@ ...@@ -301,6 +310,9 @@
301 <if test="record.modifyUserName != null"> 310 <if test="record.modifyUserName != null">
302 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 311 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
303 </if> 312 </if>
313 + <if test="record.uploadRecordId != null">
314 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
315 + </if>
304 </set> 316 </set>
305 <if test="_parameter != null"> 317 <if test="_parameter != null">
306 <include refid="Update_By_Example_Where_Clause" /> 318 <include refid="Update_By_Example_Where_Clause" />
...@@ -324,7 +336,8 @@ ...@@ -324,7 +336,8 @@
324 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR}, 336 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
325 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 337 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
326 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 338 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
327 - MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR} 339 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
340 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC}
328 <if test="_parameter != null"> 341 <if test="_parameter != null">
329 <include refid="Update_By_Example_Where_Clause" /> 342 <include refid="Update_By_Example_Where_Clause" />
330 </if> 343 </if>
...@@ -380,6 +393,9 @@ ...@@ -380,6 +393,9 @@
380 <if test="modifyUserName != null"> 393 <if test="modifyUserName != null">
381 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 394 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
382 </if> 395 </if>
396 + <if test="uploadRecordId != null">
397 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
398 + </if>
383 </set> 399 </set>
384 where ID = #{id,jdbcType=NUMERIC} 400 where ID = #{id,jdbcType=NUMERIC}
385 </update> 401 </update>
...@@ -400,7 +416,8 @@ ...@@ -400,7 +416,8 @@
400 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR}, 416 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
401 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 417 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
402 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 418 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
403 - MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR} 419 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
420 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC}
404 where ID = #{id,jdbcType=NUMERIC} 421 where ID = #{id,jdbcType=NUMERIC}
405 </update> 422 </update>
406 <sql id="OracleDialectPrefix"> 423 <sql id="OracleDialectPrefix">
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
15 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 15 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
16 + <result column="CE_FLAG" jdbcType="NUMERIC" property="ceFlag" />
16 </resultMap> 17 </resultMap>
17 <sql id="Example_Where_Clause"> 18 <sql id="Example_Where_Clause">
18 <where> 19 <where>
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
74 </sql> 75 </sql>
75 <sql id="Base_Column_List"> 76 <sql id="Base_Column_List">
76 ID, USER_ID, CONSIGNMENT_ID, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 77 ID, USER_ID, CONSIGNMENT_ID, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
77 - MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE 78 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE, CE_FLAG
78 </sql> 79 </sql>
79 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultMap="BaseResultMap"> 80 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultMap="BaseResultMap">
80 <include refid="OracleDialectPrefix" /> 81 <include refid="OracleDialectPrefix" />
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
84 </if> 85 </if>
85 'true' as QUERYID, 86 'true' as QUERYID,
86 <include refid="Base_Column_List" /> 87 <include refid="Base_Column_List" />
87 - from ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 88 + from iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
88 <if test="_parameter != null"> 89 <if test="_parameter != null">
89 <include refid="Example_Where_Clause" /> 90 <include refid="Example_Where_Clause" />
90 </if> 91 </if>
...@@ -96,15 +97,15 @@ ...@@ -96,15 +97,15 @@
96 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> 97 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
97 select 98 select
98 <include refid="Base_Column_List" /> 99 <include refid="Base_Column_List" />
99 - from ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 100 + from iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
100 where ID = #{id,jdbcType=NUMERIC} 101 where ID = #{id,jdbcType=NUMERIC}
101 </select> 102 </select>
102 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 103 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
103 - delete from ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 104 + delete from iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
104 where ID = #{id,jdbcType=NUMERIC} 105 where ID = #{id,jdbcType=NUMERIC}
105 </delete> 106 </delete>
106 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample"> 107 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample">
107 - delete from ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 108 + delete from iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
108 <if test="_parameter != null"> 109 <if test="_parameter != null">
109 <include refid="Example_Where_Clause" /> 110 <include refid="Example_Where_Clause" />
110 </if> 111 </if>
...@@ -113,20 +114,20 @@ ...@@ -113,20 +114,20 @@
113 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 114 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
114 SELECT SEQ_T_BIZ_USER_CONSIGNMENT_MAPPING.NEXTVAL FROM DUAL 115 SELECT SEQ_T_BIZ_USER_CONSIGNMENT_MAPPING.NEXTVAL FROM DUAL
115 </selectKey> 116 </selectKey>
116 - insert into ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING (ID, USER_ID, CONSIGNMENT_ID, 117 + insert into iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING (ID, USER_ID, CONSIGNMENT_ID,
117 STATUS, CREATE_TIME, CREATE_USER_ID, 118 STATUS, CREATE_TIME, CREATE_USER_ID,
118 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 119 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
119 - MODIFY_USER_NAME, CONSIGNMENT_CODE) 120 + MODIFY_USER_NAME, CONSIGNMENT_CODE, CE_FLAG)
120 values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, 121 values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC},
121 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 122 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
122 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 123 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
123 - #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR}) 124 + #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR}, #{ceFlag,jdbcType=NUMERIC})
124 </insert> 125 </insert>
125 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping"> 126 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping">
126 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 127 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
127 SELECT SEQ_T_BIZ_USER_CONSIGNMENT_MAPPING.NEXTVAL FROM DUAL 128 SELECT SEQ_T_BIZ_USER_CONSIGNMENT_MAPPING.NEXTVAL FROM DUAL
128 </selectKey> 129 </selectKey>
129 - insert into ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 130 + insert into iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
130 <trim prefix="(" suffix=")" suffixOverrides=","> 131 <trim prefix="(" suffix=")" suffixOverrides=",">
131 ID, 132 ID,
132 <if test="userId != null"> 133 <if test="userId != null">
...@@ -159,6 +160,9 @@ ...@@ -159,6 +160,9 @@
159 <if test="consignmentCode != null"> 160 <if test="consignmentCode != null">
160 CONSIGNMENT_CODE, 161 CONSIGNMENT_CODE,
161 </if> 162 </if>
163 + <if test="ceFlag != null">
164 + CE_FLAG,
165 + </if>
162 </trim> 166 </trim>
163 <trim prefix="values (" suffix=")" suffixOverrides=","> 167 <trim prefix="values (" suffix=")" suffixOverrides=",">
164 #{id,jdbcType=NUMERIC}, 168 #{id,jdbcType=NUMERIC},
...@@ -192,16 +196,19 @@ ...@@ -192,16 +196,19 @@
192 <if test="consignmentCode != null"> 196 <if test="consignmentCode != null">
193 #{consignmentCode,jdbcType=VARCHAR}, 197 #{consignmentCode,jdbcType=VARCHAR},
194 </if> 198 </if>
199 + <if test="ceFlag != null">
200 + #{ceFlag,jdbcType=NUMERIC},
201 + </if>
195 </trim> 202 </trim>
196 </insert> 203 </insert>
197 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultType="java.lang.Long"> 204 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultType="java.lang.Long">
198 - select count(*) from ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 205 + select count(*) from iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
199 <if test="_parameter != null"> 206 <if test="_parameter != null">
200 <include refid="Example_Where_Clause" /> 207 <include refid="Example_Where_Clause" />
201 </if> 208 </if>
202 </select> 209 </select>
203 <update id="updateByExampleSelective" parameterType="map"> 210 <update id="updateByExampleSelective" parameterType="map">
204 - update ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 211 + update iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
205 <set> 212 <set>
206 <if test="record.id != null"> 213 <if test="record.id != null">
207 ID = #{record.id,jdbcType=NUMERIC}, 214 ID = #{record.id,jdbcType=NUMERIC},
...@@ -236,13 +243,16 @@ ...@@ -236,13 +243,16 @@
236 <if test="record.consignmentCode != null"> 243 <if test="record.consignmentCode != null">
237 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 244 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
238 </if> 245 </if>
246 + <if test="record.ceFlag != null">
247 + CE_FLAG = #{record.ceFlag,jdbcType=NUMERIC},
248 + </if>
239 </set> 249 </set>
240 <if test="_parameter != null"> 250 <if test="_parameter != null">
241 <include refid="Update_By_Example_Where_Clause" /> 251 <include refid="Update_By_Example_Where_Clause" />
242 </if> 252 </if>
243 </update> 253 </update>
244 <update id="updateByExample" parameterType="map"> 254 <update id="updateByExample" parameterType="map">
245 - update ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 255 + update iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
246 set ID = #{record.id,jdbcType=NUMERIC}, 256 set ID = #{record.id,jdbcType=NUMERIC},
247 USER_ID = #{record.userId,jdbcType=NUMERIC}, 257 USER_ID = #{record.userId,jdbcType=NUMERIC},
248 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC}, 258 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
...@@ -254,12 +264,13 @@ ...@@ -254,12 +264,13 @@
254 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 264 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
255 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 265 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
256 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR} 266 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}
267 + CE_FLAG = #{record.ceFlag,jdbcType=NUMERIC}
257 <if test="_parameter != null"> 268 <if test="_parameter != null">
258 <include refid="Update_By_Example_Where_Clause" /> 269 <include refid="Update_By_Example_Where_Clause" />
259 </if> 270 </if>
260 </update> 271 </update>
261 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping"> 272 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping">
262 - update ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 273 + update iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
263 <set> 274 <set>
264 <if test="userId != null"> 275 <if test="userId != null">
265 USER_ID = #{userId,jdbcType=NUMERIC}, 276 USER_ID = #{userId,jdbcType=NUMERIC},
...@@ -291,11 +302,14 @@ ...@@ -291,11 +302,14 @@
291 <if test="consignmentCode != null"> 302 <if test="consignmentCode != null">
292 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 303 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
293 </if> 304 </if>
305 + <if test="ceFlag != null">
306 + CE_FLAG = #{ceFlag,jdbcType=NUMERIC},
307 + </if>
294 </set> 308 </set>
295 where ID = #{id,jdbcType=NUMERIC} 309 where ID = #{id,jdbcType=NUMERIC}
296 </update> 310 </update>
297 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping"> 311 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping">
298 - update ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 312 + update iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
299 set USER_ID = #{userId,jdbcType=NUMERIC}, 313 set USER_ID = #{userId,jdbcType=NUMERIC},
300 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC}, 314 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
301 STATUS = #{status,jdbcType=NUMERIC}, 315 STATUS = #{status,jdbcType=NUMERIC},
...@@ -306,6 +320,7 @@ ...@@ -306,6 +320,7 @@
306 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 320 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
307 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 321 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
308 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR} 322 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}
323 + CE_FLAG = #{ceFlag,jdbcType=NUMERIC}
309 where ID = #{id,jdbcType=NUMERIC} 324 where ID = #{id,jdbcType=NUMERIC}
310 </update> 325 </update>
311 <sql id="OracleDialectPrefix"> 326 <sql id="OracleDialectPrefix">
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
98 <include refid="Base_Column_List" /> 98 <include refid="Base_Column_List" />
99 , 99 ,
100 <include refid="Blob_Column_List" /> 100 <include refid="Blob_Column_List" />
101 - from ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 101 + from iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
102 <if test="_parameter != null"> 102 <if test="_parameter != null">
103 <include refid="Example_Where_Clause" /> 103 <include refid="Example_Where_Clause" />
104 </if> 104 </if>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 </if> 114 </if>
115 'true' as QUERYID, 115 'true' as QUERYID,
116 <include refid="Base_Column_List" /> 116 <include refid="Base_Column_List" />
117 - from ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 117 + from iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
118 <if test="_parameter != null"> 118 <if test="_parameter != null">
119 <include refid="Example_Where_Clause" /> 119 <include refid="Example_Where_Clause" />
120 </if> 120 </if>
...@@ -128,15 +128,15 @@ ...@@ -128,15 +128,15 @@
128 <include refid="Base_Column_List" /> 128 <include refid="Base_Column_List" />
129 , 129 ,
130 <include refid="Blob_Column_List" /> 130 <include refid="Blob_Column_List" />
131 - from ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 131 + from iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
132 where ID = #{id,jdbcType=NUMERIC} 132 where ID = #{id,jdbcType=NUMERIC}
133 </select> 133 </select>
134 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 134 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
135 - delete from ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 135 + delete from iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
136 where ID = #{id,jdbcType=NUMERIC} 136 where ID = #{id,jdbcType=NUMERIC}
137 </delete> 137 </delete>
138 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistoryExample"> 138 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistoryExample">
139 - delete from ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 139 + delete from iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
140 <if test="_parameter != null"> 140 <if test="_parameter != null">
141 <include refid="Example_Where_Clause" /> 141 <include refid="Example_Where_Clause" />
142 </if> 142 </if>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 145 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
146 SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL 146 SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL
147 </selectKey> 147 </selectKey>
148 - insert into ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY (ID, MESSAGE_ID, MESSAGE_CODE, 148 + insert into iclconnect.T_SYS_KAFKA_STORAGE_HISTORY (ID, MESSAGE_ID, MESSAGE_CODE,
149 SENDER_ID, RECEIVER_ID, SEND_TIME, 149 SENDER_ID, RECEIVER_ID, SEND_TIME,
150 CONSIGNMENT_CODE, FREQUENCY, STATUS, 150 CONSIGNMENT_CODE, FREQUENCY, STATUS,
151 STATUS_NAME, REMARK, CREATE_TIME, 151 STATUS_NAME, REMARK, CREATE_TIME,
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 164 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
165 SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL 165 SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL
166 </selectKey> 166 </selectKey>
167 - insert into ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 167 + insert into iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
168 <trim prefix="(" suffix=")" suffixOverrides=","> 168 <trim prefix="(" suffix=")" suffixOverrides=",">
169 ID, 169 ID,
170 <if test="messageId != null"> 170 <if test="messageId != null">
...@@ -275,13 +275,13 @@ ...@@ -275,13 +275,13 @@
275 </trim> 275 </trim>
276 </insert> 276 </insert>
277 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistoryExample" resultType="java.lang.Long"> 277 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistoryExample" resultType="java.lang.Long">
278 - select count(*) from ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 278 + select count(*) from iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
279 <if test="_parameter != null"> 279 <if test="_parameter != null">
280 <include refid="Example_Where_Clause" /> 280 <include refid="Example_Where_Clause" />
281 </if> 281 </if>
282 </select> 282 </select>
283 <update id="updateByExampleSelective" parameterType="map"> 283 <update id="updateByExampleSelective" parameterType="map">
284 - update ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 284 + update iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
285 <set> 285 <set>
286 <if test="record.id != null"> 286 <if test="record.id != null">
287 ID = #{record.id,jdbcType=NUMERIC}, 287 ID = #{record.id,jdbcType=NUMERIC},
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
343 </if> 343 </if>
344 </update> 344 </update>
345 <update id="updateByExampleWithBLOBs" parameterType="map"> 345 <update id="updateByExampleWithBLOBs" parameterType="map">
346 - update ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 346 + update iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
347 set ID = #{record.id,jdbcType=NUMERIC}, 347 set ID = #{record.id,jdbcType=NUMERIC},
348 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR}, 348 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
349 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR}, 349 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
367 </if> 367 </if>
368 </update> 368 </update>
369 <update id="updateByExample" parameterType="map"> 369 <update id="updateByExample" parameterType="map">
370 - update ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 370 + update iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
371 set ID = #{record.id,jdbcType=NUMERIC}, 371 set ID = #{record.id,jdbcType=NUMERIC},
372 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR}, 372 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
373 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR}, 373 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
390 </if> 390 </if>
391 </update> 391 </update>
392 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistory"> 392 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistory">
393 - update ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 393 + update iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
394 <set> 394 <set>
395 <if test="messageId != null"> 395 <if test="messageId != null">
396 MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 396 MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
447 where ID = #{id,jdbcType=NUMERIC} 447 where ID = #{id,jdbcType=NUMERIC}
448 </update> 448 </update>
449 <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistory"> 449 <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistory">
450 - update ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 450 + update iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
451 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 451 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
452 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR}, 452 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
453 SENDER_ID = #{senderId,jdbcType=VARCHAR}, 453 SENDER_ID = #{senderId,jdbcType=VARCHAR},
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
468 where ID = #{id,jdbcType=NUMERIC} 468 where ID = #{id,jdbcType=NUMERIC}
469 </update> 469 </update>
470 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistory"> 470 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaStorageHistory">
471 - update ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 471 + update iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
472 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 472 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
473 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR}, 473 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
474 SENDER_ID = #{senderId,jdbcType=VARCHAR}, 474 SENDER_ID = #{senderId,jdbcType=VARCHAR},
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
98 <include refid="Base_Column_List" /> 98 <include refid="Base_Column_List" />
99 , 99 ,
100 <include refid="Blob_Column_List" /> 100 <include refid="Blob_Column_List" />
101 - from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 101 + from iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
102 <if test="_parameter != null"> 102 <if test="_parameter != null">
103 <include refid="Example_Where_Clause" /> 103 <include refid="Example_Where_Clause" />
104 </if> 104 </if>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 </if> 114 </if>
115 'true' as QUERYID, 115 'true' as QUERYID,
116 <include refid="Base_Column_List" /> 116 <include refid="Base_Column_List" />
117 - from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 117 + from iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
118 <if test="_parameter != null"> 118 <if test="_parameter != null">
119 <include refid="Example_Where_Clause" /> 119 <include refid="Example_Where_Clause" />
120 </if> 120 </if>
...@@ -128,15 +128,15 @@ ...@@ -128,15 +128,15 @@
128 <include refid="Base_Column_List" /> 128 <include refid="Base_Column_List" />
129 , 129 ,
130 <include refid="Blob_Column_List" /> 130 <include refid="Blob_Column_List" />
131 - from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 131 + from iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
132 where ID = #{id,jdbcType=NUMERIC} 132 where ID = #{id,jdbcType=NUMERIC}
133 </select> 133 </select>
134 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 134 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
135 - delete from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 135 + delete from iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
136 where ID = #{id,jdbcType=NUMERIC} 136 where ID = #{id,jdbcType=NUMERIC}
137 </delete> 137 </delete>
138 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample"> 138 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample">
139 - delete from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 139 + delete from iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
140 <if test="_parameter != null"> 140 <if test="_parameter != null">
141 <include refid="Example_Where_Clause" /> 141 <include refid="Example_Where_Clause" />
142 </if> 142 </if>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 145 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
146 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL 146 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL
147 </selectKey> 147 </selectKey>
148 - insert into ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE (ID, MESSAGE_ID, MESSAGE_CODE, 148 + insert into iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE (ID, MESSAGE_ID, MESSAGE_CODE,
149 SENDER_ID, RECEIVER_ID, SEND_TIME, 149 SENDER_ID, RECEIVER_ID, SEND_TIME,
150 CONSIGNMENT_CODE, FREQUENCY, STATUS, 150 CONSIGNMENT_CODE, FREQUENCY, STATUS,
151 STATUS_NAME, REMARK, CREATE_TIME, 151 STATUS_NAME, REMARK, CREATE_TIME,
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 164 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
165 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL 165 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL
166 </selectKey> 166 </selectKey>
167 - insert into ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 167 + insert into iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
168 <trim prefix="(" suffix=")" suffixOverrides=","> 168 <trim prefix="(" suffix=")" suffixOverrides=",">
169 ID, 169 ID,
170 <if test="messageId != null"> 170 <if test="messageId != null">
...@@ -275,13 +275,13 @@ ...@@ -275,13 +275,13 @@
275 </trim> 275 </trim>
276 </insert> 276 </insert>
277 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample" resultType="java.lang.Long"> 277 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample" resultType="java.lang.Long">
278 - select count(*) from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 278 + select count(*) from iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
279 <if test="_parameter != null"> 279 <if test="_parameter != null">
280 <include refid="Example_Where_Clause" /> 280 <include refid="Example_Where_Clause" />
281 </if> 281 </if>
282 </select> 282 </select>
283 <update id="updateByExampleSelective" parameterType="map"> 283 <update id="updateByExampleSelective" parameterType="map">
284 - update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 284 + update iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
285 <set> 285 <set>
286 <if test="record.id != null"> 286 <if test="record.id != null">
287 ID = #{record.id,jdbcType=NUMERIC}, 287 ID = #{record.id,jdbcType=NUMERIC},
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
343 </if> 343 </if>
344 </update> 344 </update>
345 <update id="updateByExampleWithBLOBs" parameterType="map"> 345 <update id="updateByExampleWithBLOBs" parameterType="map">
346 - update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 346 + update iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
347 set ID = #{record.id,jdbcType=NUMERIC}, 347 set ID = #{record.id,jdbcType=NUMERIC},
348 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR}, 348 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
349 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR}, 349 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
367 </if> 367 </if>
368 </update> 368 </update>
369 <update id="updateByExample" parameterType="map"> 369 <update id="updateByExample" parameterType="map">
370 - update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 370 + update iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
371 set ID = #{record.id,jdbcType=NUMERIC}, 371 set ID = #{record.id,jdbcType=NUMERIC},
372 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR}, 372 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
373 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR}, 373 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
390 </if> 390 </if>
391 </update> 391 </update>
392 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage"> 392 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
393 - update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 393 + update iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
394 <set> 394 <set>
395 <if test="messageId != null"> 395 <if test="messageId != null">
396 MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 396 MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
447 where ID = #{id,jdbcType=NUMERIC} 447 where ID = #{id,jdbcType=NUMERIC}
448 </update> 448 </update>
449 <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage"> 449 <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
450 - update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 450 + update iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
451 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 451 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
452 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR}, 452 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
453 SENDER_ID = #{senderId,jdbcType=VARCHAR}, 453 SENDER_ID = #{senderId,jdbcType=VARCHAR},
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
468 where ID = #{id,jdbcType=NUMERIC} 468 where ID = #{id,jdbcType=NUMERIC}
469 </update> 469 </update>
470 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage"> 470 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
471 - update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 471 + update iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
472 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 472 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
473 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR}, 473 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
474 SENDER_ID = #{senderId,jdbcType=VARCHAR}, 474 SENDER_ID = #{senderId,jdbcType=VARCHAR},
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
90 </if> 90 </if>
91 'true' as QUERYID, 91 'true' as QUERYID,
92 <include refid="Base_Column_List" /> 92 <include refid="Base_Column_List" />
93 - from ICLEARIMP.T_SYS_PARAM_CONFIG 93 + from iclconnect.T_SYS_PARAM_CONFIG
94 <if test="_parameter != null"> 94 <if test="_parameter != null">
95 <include refid="Example_Where_Clause" /> 95 <include refid="Example_Where_Clause" />
96 </if> 96 </if>
...@@ -102,15 +102,15 @@ ...@@ -102,15 +102,15 @@
102 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> 102 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
103 select 103 select
104 <include refid="Base_Column_List" /> 104 <include refid="Base_Column_List" />
105 - from ICLEARIMP.T_SYS_PARAM_CONFIG 105 + from iclconnect.T_SYS_PARAM_CONFIG
106 where ID = #{id,jdbcType=NUMERIC} 106 where ID = #{id,jdbcType=NUMERIC}
107 </select> 107 </select>
108 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 108 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
109 - delete from ICLEARIMP.T_SYS_PARAM_CONFIG 109 + delete from iclconnect.T_SYS_PARAM_CONFIG
110 where ID = #{id,jdbcType=NUMERIC} 110 where ID = #{id,jdbcType=NUMERIC}
111 </delete> 111 </delete>
112 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample"> 112 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample">
113 - delete from ICLEARIMP.T_SYS_PARAM_CONFIG 113 + delete from iclconnect.T_SYS_PARAM_CONFIG
114 <if test="_parameter != null"> 114 <if test="_parameter != null">
115 <include refid="Example_Where_Clause" /> 115 <include refid="Example_Where_Clause" />
116 </if> 116 </if>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 119 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
120 SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL 120 SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL
121 </selectKey> 121 </selectKey>
122 - insert into ICLEARIMP.T_SYS_PARAM_CONFIG (ID, CODE, NAME, 122 + insert into iclconnect.T_SYS_PARAM_CONFIG (ID, CODE, NAME,
123 VALUE, TYPE_CODE, TYPE_NAME, 123 VALUE, TYPE_CODE, TYPE_NAME,
124 STATUS, DESCRIPTION, CREATE_TIME, 124 STATUS, DESCRIPTION, CREATE_TIME,
125 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 125 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 136 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
137 SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL 137 SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL
138 </selectKey> 138 </selectKey>
139 - insert into ICLEARIMP.T_SYS_PARAM_CONFIG 139 + insert into iclconnect.T_SYS_PARAM_CONFIG
140 <trim prefix="(" suffix=")" suffixOverrides=","> 140 <trim prefix="(" suffix=")" suffixOverrides=",">
141 ID, 141 ID,
142 <if test="code != null"> 142 <if test="code != null">
...@@ -241,13 +241,13 @@ ...@@ -241,13 +241,13 @@
241 </trim> 241 </trim>
242 </insert> 242 </insert>
243 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultType="java.lang.Long"> 243 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultType="java.lang.Long">
244 - select count(*) from ICLEARIMP.T_SYS_PARAM_CONFIG 244 + select count(*) from iclconnect.T_SYS_PARAM_CONFIG
245 <if test="_parameter != null"> 245 <if test="_parameter != null">
246 <include refid="Example_Where_Clause" /> 246 <include refid="Example_Where_Clause" />
247 </if> 247 </if>
248 </select> 248 </select>
249 <update id="updateByExampleSelective" parameterType="map"> 249 <update id="updateByExampleSelective" parameterType="map">
250 - update ICLEARIMP.T_SYS_PARAM_CONFIG 250 + update iclconnect.T_SYS_PARAM_CONFIG
251 <set> 251 <set>
252 <if test="record.id != null"> 252 <if test="record.id != null">
253 ID = #{record.id,jdbcType=NUMERIC}, 253 ID = #{record.id,jdbcType=NUMERIC},
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
306 </if> 306 </if>
307 </update> 307 </update>
308 <update id="updateByExample" parameterType="map"> 308 <update id="updateByExample" parameterType="map">
309 - update ICLEARIMP.T_SYS_PARAM_CONFIG 309 + update iclconnect.T_SYS_PARAM_CONFIG
310 set ID = #{record.id,jdbcType=NUMERIC}, 310 set ID = #{record.id,jdbcType=NUMERIC},
311 CODE = #{record.code,jdbcType=VARCHAR}, 311 CODE = #{record.code,jdbcType=VARCHAR},
312 NAME = #{record.name,jdbcType=VARCHAR}, 312 NAME = #{record.name,jdbcType=VARCHAR},
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
329 </if> 329 </if>
330 </update> 330 </update>
331 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.ParamConfig"> 331 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.ParamConfig">
332 - update ICLEARIMP.T_SYS_PARAM_CONFIG 332 + update iclconnect.T_SYS_PARAM_CONFIG
333 <set> 333 <set>
334 <if test="code != null"> 334 <if test="code != null">
335 CODE = #{code,jdbcType=VARCHAR}, 335 CODE = #{code,jdbcType=VARCHAR},
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
383 where ID = #{id,jdbcType=NUMERIC} 383 where ID = #{id,jdbcType=NUMERIC}
384 </update> 384 </update>
385 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.ParamConfig"> 385 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.ParamConfig">
386 - update ICLEARIMP.T_SYS_PARAM_CONFIG 386 + update iclconnect.T_SYS_PARAM_CONFIG
387 set CODE = #{code,jdbcType=VARCHAR}, 387 set CODE = #{code,jdbcType=VARCHAR},
388 NAME = #{name,jdbcType=VARCHAR}, 388 NAME = #{name,jdbcType=VARCHAR},
389 VALUE = #{value,jdbcType=VARCHAR}, 389 VALUE = #{value,jdbcType=VARCHAR},
......
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 </if> 99 </if>
100 'true' as QUERYID, 100 'true' as QUERYID,
101 <include refid="Base_Column_List" /> 101 <include refid="Base_Column_List" />
102 - from ICLEARIMP.T_SYS_USER 102 + from iclconnect.T_SYS_USER
103 <if test="_parameter != null"> 103 <if test="_parameter != null">
104 <include refid="Example_Where_Clause" /> 104 <include refid="Example_Where_Clause" />
105 </if> 105 </if>
...@@ -111,15 +111,15 @@ ...@@ -111,15 +111,15 @@
111 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> 111 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
112 select 112 select
113 <include refid="Base_Column_List" /> 113 <include refid="Base_Column_List" />
114 - from ICLEARIMP.T_SYS_USER 114 + from iclconnect.T_SYS_USER
115 where ID = #{id,jdbcType=NUMERIC} 115 where ID = #{id,jdbcType=NUMERIC}
116 </select> 116 </select>
117 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 117 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
118 - delete from ICLEARIMP.T_SYS_USER 118 + delete from iclconnect.T_SYS_USER
119 where ID = #{id,jdbcType=NUMERIC} 119 where ID = #{id,jdbcType=NUMERIC}
120 </delete> 120 </delete>
121 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.UserExample"> 121 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.UserExample">
122 - delete from ICLEARIMP.T_SYS_USER 122 + delete from iclconnect.T_SYS_USER
123 <if test="_parameter != null"> 123 <if test="_parameter != null">
124 <include refid="Example_Where_Clause" /> 124 <include refid="Example_Where_Clause" />
125 </if> 125 </if>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
128 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 128 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
129 SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL 129 SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL
130 </selectKey> 130 </selectKey>
131 - insert into ICLEARIMP.T_SYS_USER (ID, LOGIN_NAME, USER_NAME, 131 + insert into iclconnect.T_SYS_USER (ID, LOGIN_NAME, USER_NAME,
132 PASSWORD, USER_UUID, EMAIL, 132 PASSWORD, USER_UUID, EMAIL,
133 PHONE, COMPANY_NAME, ACCOUNT_NO, 133 PHONE, COMPANY_NAME, ACCOUNT_NO,
134 UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, 134 UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE,
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
151 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 151 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
152 SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL 152 SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL
153 </selectKey> 153 </selectKey>
154 - insert into ICLEARIMP.T_SYS_USER 154 + insert into iclconnect.T_SYS_USER
155 <trim prefix="(" suffix=")" suffixOverrides=","> 155 <trim prefix="(" suffix=")" suffixOverrides=",">
156 ID, 156 ID,
157 <if test="loginName != null"> 157 <if test="loginName != null">
...@@ -298,13 +298,13 @@ ...@@ -298,13 +298,13 @@
298 </trim> 298 </trim>
299 </insert> 299 </insert>
300 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long"> 300 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserExample" resultType="java.lang.Long">
301 - select count(*) from ICLEARIMP.T_SYS_USER 301 + select count(*) from iclconnect.T_SYS_USER
302 <if test="_parameter != null"> 302 <if test="_parameter != null">
303 <include refid="Example_Where_Clause" /> 303 <include refid="Example_Where_Clause" />
304 </if> 304 </if>
305 </select> 305 </select>
306 <update id="updateByExampleSelective" parameterType="map"> 306 <update id="updateByExampleSelective" parameterType="map">
307 - update ICLEARIMP.T_SYS_USER 307 + update iclconnect.T_SYS_USER
308 <set> 308 <set>
309 <if test="record.id != null"> 309 <if test="record.id != null">
310 ID = #{record.id,jdbcType=NUMERIC}, 310 ID = #{record.id,jdbcType=NUMERIC},
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
384 </if> 384 </if>
385 </update> 385 </update>
386 <update id="updateByExample" parameterType="map"> 386 <update id="updateByExample" parameterType="map">
387 - update ICLEARIMP.T_SYS_USER 387 + update iclconnect.T_SYS_USER
388 set ID = #{record.id,jdbcType=NUMERIC}, 388 set ID = #{record.id,jdbcType=NUMERIC},
389 LOGIN_NAME = #{record.loginName,jdbcType=VARCHAR}, 389 LOGIN_NAME = #{record.loginName,jdbcType=VARCHAR},
390 USER_NAME = #{record.userName,jdbcType=VARCHAR}, 390 USER_NAME = #{record.userName,jdbcType=VARCHAR},
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
414 </if> 414 </if>
415 </update> 415 </update>
416 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.User"> 416 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.User">
417 - update ICLEARIMP.T_SYS_USER 417 + update iclconnect.T_SYS_USER
418 <set> 418 <set>
419 <if test="loginName != null"> 419 <if test="loginName != null">
420 LOGIN_NAME = #{loginName,jdbcType=VARCHAR}, 420 LOGIN_NAME = #{loginName,jdbcType=VARCHAR},
...@@ -489,7 +489,7 @@ ...@@ -489,7 +489,7 @@
489 where ID = #{id,jdbcType=NUMERIC} 489 where ID = #{id,jdbcType=NUMERIC}
490 </update> 490 </update>
491 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.User"> 491 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.User">
492 - update ICLEARIMP.T_SYS_USER 492 + update iclconnect.T_SYS_USER
493 set LOGIN_NAME = #{loginName,jdbcType=VARCHAR}, 493 set LOGIN_NAME = #{loginName,jdbcType=VARCHAR},
494 USER_NAME = #{userName,jdbcType=VARCHAR}, 494 USER_NAME = #{userName,jdbcType=VARCHAR},
495 PASSWORD = #{password,jdbcType=VARCHAR}, 495 PASSWORD = #{password,jdbcType=VARCHAR},
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 </if> 83 </if>
84 'true' as QUERYID, 84 'true' as QUERYID,
85 <include refid="Base_Column_List" /> 85 <include refid="Base_Column_List" />
86 - from ICLEARIMP.T_SYS_USER_ROLE 86 + from iclconnect.T_SYS_USER_ROLE
87 <if test="_parameter != null"> 87 <if test="_parameter != null">
88 <include refid="Example_Where_Clause" /> 88 <include refid="Example_Where_Clause" />
89 </if> 89 </if>
...@@ -95,15 +95,15 @@ ...@@ -95,15 +95,15 @@
95 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> 95 <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
96 select 96 select
97 <include refid="Base_Column_List" /> 97 <include refid="Base_Column_List" />
98 - from ICLEARIMP.T_SYS_USER_ROLE 98 + from iclconnect.T_SYS_USER_ROLE
99 where ID = #{id,jdbcType=NUMERIC} 99 where ID = #{id,jdbcType=NUMERIC}
100 </select> 100 </select>
101 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 101 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
102 - delete from ICLEARIMP.T_SYS_USER_ROLE 102 + delete from iclconnect.T_SYS_USER_ROLE
103 where ID = #{id,jdbcType=NUMERIC} 103 where ID = #{id,jdbcType=NUMERIC}
104 </delete> 104 </delete>
105 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.UserRoleExample"> 105 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.UserRoleExample">
106 - delete from ICLEARIMP.T_SYS_USER_ROLE 106 + delete from iclconnect.T_SYS_USER_ROLE
107 <if test="_parameter != null"> 107 <if test="_parameter != null">
108 <include refid="Example_Where_Clause" /> 108 <include refid="Example_Where_Clause" />
109 </if> 109 </if>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 112 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
113 SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL 113 SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL
114 </selectKey> 114 </selectKey>
115 - insert into ICLEARIMP.T_SYS_USER_ROLE (ID, USER_ID, ROLE_ID, 115 + insert into iclconnect.T_SYS_USER_ROLE (ID, USER_ID, ROLE_ID,
116 STATUS, CREATE_TIME, CREATE_USER_ID, 116 STATUS, CREATE_TIME, CREATE_USER_ID,
117 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 117 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
118 MODIFY_USER_NAME) 118 MODIFY_USER_NAME)
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 125 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
126 SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL 126 SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL
127 </selectKey> 127 </selectKey>
128 - insert into ICLEARIMP.T_SYS_USER_ROLE 128 + insert into iclconnect.T_SYS_USER_ROLE
129 <trim prefix="(" suffix=")" suffixOverrides=","> 129 <trim prefix="(" suffix=")" suffixOverrides=",">
130 ID, 130 ID,
131 <if test="userId != null"> 131 <if test="userId != null">
...@@ -188,13 +188,13 @@ ...@@ -188,13 +188,13 @@
188 </trim> 188 </trim>
189 </insert> 189 </insert>
190 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserRoleExample" resultType="java.lang.Long"> 190 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.UserRoleExample" resultType="java.lang.Long">
191 - select count(*) from ICLEARIMP.T_SYS_USER_ROLE 191 + select count(*) from iclconnect.T_SYS_USER_ROLE
192 <if test="_parameter != null"> 192 <if test="_parameter != null">
193 <include refid="Example_Where_Clause" /> 193 <include refid="Example_Where_Clause" />
194 </if> 194 </if>
195 </select> 195 </select>
196 <update id="updateByExampleSelective" parameterType="map"> 196 <update id="updateByExampleSelective" parameterType="map">
197 - update ICLEARIMP.T_SYS_USER_ROLE 197 + update iclconnect.T_SYS_USER_ROLE
198 <set> 198 <set>
199 <if test="record.id != null"> 199 <if test="record.id != null">
200 ID = #{record.id,jdbcType=NUMERIC}, 200 ID = #{record.id,jdbcType=NUMERIC},
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
232 </if> 232 </if>
233 </update> 233 </update>
234 <update id="updateByExample" parameterType="map"> 234 <update id="updateByExample" parameterType="map">
235 - update ICLEARIMP.T_SYS_USER_ROLE 235 + update iclconnect.T_SYS_USER_ROLE
236 set ID = #{record.id,jdbcType=NUMERIC}, 236 set ID = #{record.id,jdbcType=NUMERIC},
237 USER_ID = #{record.userId,jdbcType=NUMERIC}, 237 USER_ID = #{record.userId,jdbcType=NUMERIC},
238 ROLE_ID = #{record.roleId,jdbcType=NUMERIC}, 238 ROLE_ID = #{record.roleId,jdbcType=NUMERIC},
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
248 </if> 248 </if>
249 </update> 249 </update>
250 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.UserRole"> 250 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.UserRole">
251 - update ICLEARIMP.T_SYS_USER_ROLE 251 + update iclconnect.T_SYS_USER_ROLE
252 <set> 252 <set>
253 <if test="userId != null"> 253 <if test="userId != null">
254 USER_ID = #{userId,jdbcType=NUMERIC}, 254 USER_ID = #{userId,jdbcType=NUMERIC},
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
281 where ID = #{id,jdbcType=NUMERIC} 281 where ID = #{id,jdbcType=NUMERIC}
282 </update> 282 </update>
283 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.UserRole"> 283 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.UserRole">
284 - update ICLEARIMP.T_SYS_USER_ROLE 284 + update iclconnect.T_SYS_USER_ROLE
285 set USER_ID = #{userId,jdbcType=NUMERIC}, 285 set USER_ID = #{userId,jdbcType=NUMERIC},
286 ROLE_ID = #{roleId,jdbcType=NUMERIC}, 286 ROLE_ID = #{roleId,jdbcType=NUMERIC},
287 STATUS = #{status,jdbcType=NUMERIC}, 287 STATUS = #{status,jdbcType=NUMERIC},
......
...@@ -9,7 +9,7 @@ import java.util.Date; ...@@ -9,7 +9,7 @@ import java.util.Date;
9 9
10 /** 10 /**
11 * DESC: CE501报文业务表，增加需要加密标志 11 * DESC: CE501报文业务表，增加需要加密标志
12 - * TABLE: ICLEARIMP.T_BIZ_CE_INFO 12 + * TABLE: iclconnect.T_BIZ_CE_INFO
13 */ 13 */
14 @SensitiveEntity 14 @SensitiveEntity
15 public class CeInfo implements Serializable { 15 public class CeInfo implements Serializable {
......
...@@ -94,6 +94,11 @@ public class PushOb implements Serializable { ...@@ -94,6 +94,11 @@ public class PushOb implements Serializable {
94 */ 94 */
95 private String modifyUserName; 95 private String modifyUserName;
96 96
97 + /**
98 + * 用户上传记录表ID
99 + */
100 + private Long uploadRecordId;
101 +
97 private static final long serialVersionUID = 1L; 102 private static final long serialVersionUID = 1L;
98 103
99 public Long getId() { 104 public Long getId() {
...@@ -232,6 +237,14 @@ public class PushOb implements Serializable { ...@@ -232,6 +237,14 @@ public class PushOb implements Serializable {
232 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 237 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
233 } 238 }
234 239
240 + public Long getUploadRecordId() {
241 + return uploadRecordId;
242 + }
243 +
244 + public void setUploadRecordId(Long uploadRecordId) {
245 + this.uploadRecordId = uploadRecordId;
246 + }
247 +
235 @Override 248 @Override
236 public String toString() { 249 public String toString() {
237 StringBuilder sb = new StringBuilder(); 250 StringBuilder sb = new StringBuilder();
...@@ -255,6 +268,7 @@ public class PushOb implements Serializable { ...@@ -255,6 +268,7 @@ public class PushOb implements Serializable {
255 sb.append(", modifyTime=").append(modifyTime); 268 sb.append(", modifyTime=").append(modifyTime);
256 sb.append(", modifyUserId=").append(modifyUserId); 269 sb.append(", modifyUserId=").append(modifyUserId);
257 sb.append(", modifyUserName=").append(modifyUserName); 270 sb.append(", modifyUserName=").append(modifyUserName);
271 + sb.append(", uploadRecordId=").append(uploadRecordId);
258 sb.append(", serialVersionUID=").append(serialVersionUID); 272 sb.append(", serialVersionUID=").append(serialVersionUID);
259 sb.append("]"); 273 sb.append("]");
260 return sb.toString(); 274 return sb.toString();
......
...@@ -35,12 +35,12 @@ public class PushObDetail implements Serializable { ...@@ -35,12 +35,12 @@ public class PushObDetail implements Serializable {
35 private String statusName; 35 private String statusName;
36 36
37 /** 37 /**
38 - * 推送文件类型字典CODE，关联数据字典表。指定字典目录CODE：PUSH_OB_FILE_TYPE 38 + * 推送文件类型字典CODE，关联数据字典表。指定字典目录CODE：ATTACHMENT_BIZ_TYPE，取值Ext1 字段值
39 */ 39 */
40 private String fileTypeCode; 40 private String fileTypeCode;
41 41
42 /** 42 /**
43 - * 推送文件类型名称（XXX、XXX） 43 + * 推送文件类型名称（AWB、INV、PKL、OTH）
44 */ 44 */
45 private String fileType; 45 private String fileType;
46 46
......
...@@ -1234,6 +1234,66 @@ public class PushObExample { ...@@ -1234,6 +1234,66 @@ public class PushObExample {
1234 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName"); 1234 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
1235 return (Criteria) this; 1235 return (Criteria) this;
1236 } 1236 }
1237 +
1238 + public Criteria andUploadRecordIdIsNull() {
1239 + addCriterion("UPLOAD_RECORD_ID is null");
1240 + return (Criteria) this;
1241 + }
1242 +
1243 + public Criteria andUploadRecordIdIsNotNull() {
1244 + addCriterion("UPLOAD_RECORD_ID is not null");
1245 + return (Criteria) this;
1246 + }
1247 +
1248 + public Criteria andUploadRecordIdEqualTo(Long value) {
1249 + addCriterion("UPLOAD_RECORD_ID =", value, "uploadRecordId");
1250 + return (Criteria) this;
1251 + }
1252 +
1253 + public Criteria andUploadRecordIdNotEqualTo(Long value) {
1254 + addCriterion("UPLOAD_RECORD_ID <>", value, "uploadRecordId");
1255 + return (Criteria) this;
1256 + }
1257 +
1258 + public Criteria andUploadRecordIdGreaterThan(Long value) {
1259 + addCriterion("UPLOAD_RECORD_ID >", value, "uploadRecordId");
1260 + return (Criteria) this;
1261 + }
1262 +
1263 + public Criteria andUploadRecordIdGreaterThanOrEqualTo(Long value) {
1264 + addCriterion("UPLOAD_RECORD_ID >=", value, "uploadRecordId");
1265 + return (Criteria) this;
1266 + }
1267 +
1268 + public Criteria andUploadRecordIdLessThan(Long value) {
1269 + addCriterion("UPLOAD_RECORD_ID <", value, "uploadRecordId");
1270 + return (Criteria) this;
1271 + }
1272 +
1273 + public Criteria andUploadRecordIdLessThanOrEqualTo(Long value) {
1274 + addCriterion("UPLOAD_RECORD_ID <=", value, "uploadRecordId");
1275 + return (Criteria) this;
1276 + }
1277 +
1278 + public Criteria andUploadRecordIdIn(List<Long> values) {
1279 + addCriterion("UPLOAD_RECORD_ID in", values, "uploadRecordId");
1280 + return (Criteria) this;
1281 + }
1282 +
1283 + public Criteria andUploadRecordIdNotIn(List<Long> values) {
1284 + addCriterion("UPLOAD_RECORD_ID not in", values, "uploadRecordId");
1285 + return (Criteria) this;
1286 + }
1287 +
1288 + public Criteria andUploadRecordIdBetween(Long value1, Long value2) {
1289 + addCriterion("UPLOAD_RECORD_ID between", value1, value2, "uploadRecordId");
1290 + return (Criteria) this;
1291 + }
1292 +
1293 + public Criteria andUploadRecordIdNotBetween(Long value1, Long value2) {
1294 + addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId");
1295 + return (Criteria) this;
1296 + }
1237 } 1297 }
1238 1298
1239 public static class Criteria extends GeneratedCriteria { 1299 public static class Criteria extends GeneratedCriteria {
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 用户运单关系映射表 7 * DESC: 用户运单关系映射表
8 - * TABLE: ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING 8 + * TABLE: iclconnect.T_BIZ_USER_CONSIGNMENT_MAPPING
9 */ 9 */
10 public class UserConsignmentMapping implements Serializable { 10 public class UserConsignmentMapping implements Serializable {
11 /** 11 /**
...@@ -63,6 +63,11 @@ public class UserConsignmentMapping implements Serializable { ...@@ -63,6 +63,11 @@ public class UserConsignmentMapping implements Serializable {
63 */ 63 */
64 private String consignmentCode; 64 private String consignmentCode;
65 65
66 + /**
67 + * 是否使用CE数据标志(0“非501数据，1：501数据)
68 + */
69 + private Long ceFlag;
70 +
66 private static final long serialVersionUID = 1L; 71 private static final long serialVersionUID = 1L;
67 72
68 public Long getId() { 73 public Long getId() {
...@@ -153,6 +158,18 @@ public class UserConsignmentMapping implements Serializable { ...@@ -153,6 +158,18 @@ public class UserConsignmentMapping implements Serializable {
153 this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim(); 158 this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim();
154 } 159 }
155 160
161 + public Long getCeFlag() {
162 + return ceFlag;
163 + }
164 +
165 + public void setCeFlag(Long ceFlag) {
166 + this.ceFlag = ceFlag;
167 + }
168 +
169 + public static long getSerialVersionUID() {
170 + return serialVersionUID;
171 + }
172 +
156 @Override 173 @Override
157 public String toString() { 174 public String toString() {
158 StringBuilder sb = new StringBuilder(); 175 StringBuilder sb = new StringBuilder();
......
...@@ -61,7 +61,7 @@ public class EmailHistory implements Serializable { ...@@ -61,7 +61,7 @@ public class EmailHistory implements Serializable {
61 /** 61 /**
62 * 发送次数（0-3次） 62 * 发送次数（0-3次）
63 */ 63 */
64 - private Long sendNum; 64 + private int sendNum;
65 65
66 /** 66 /**
67 * 邮件发送时间 67 * 邮件发送时间
...@@ -190,11 +190,11 @@ public class EmailHistory implements Serializable { ...@@ -190,11 +190,11 @@ public class EmailHistory implements Serializable {
190 this.statusName = statusName == null ? null : statusName.trim(); 190 this.statusName = statusName == null ? null : statusName.trim();
191 } 191 }
192 192
193 - public Long getSendNum() { 193 + public int getSendNum() {
194 return sendNum; 194 return sendNum;
195 } 195 }
196 196
197 - public void setSendNum(Long sendNum) { 197 + public void setSendNum(int sendNum) {
198 this.sendNum = sendNum; 198 this.sendNum = sendNum;
199 } 199 }
200 200
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 操作日志 7 * DESC: 操作日志
8 - * TABLE: ICLEARIMP.T_LOG_OPERATION 8 + * TABLE: iclconnect.T_LOG_OPERATION
9 */ 9 */
10 public class Operation implements Serializable { 10 public class Operation implements Serializable {
11 /** 11 /**
...@@ -44,21 +44,6 @@ public class Operation implements Serializable { ...@@ -44,21 +44,6 @@ public class Operation implements Serializable {
44 private String url; 44 private String url;
45 45
46 /** 46 /**
47 - * 请求参数
48 - */
49 - private String requestParameters;
50 -
51 - /**
52 - * 操作结果
53 - */
54 - private String result;
55 -
56 - /**
57 - * 状态(0：展示、1：不展示)
58 - */
59 - private Long status;
60 -
61 - /**
62 * 创建时间 47 * 创建时间
63 */ 48 */
64 private Date createTime; 49 private Date createTime;
...@@ -104,9 +89,9 @@ public class Operation implements Serializable { ...@@ -104,9 +89,9 @@ public class Operation implements Serializable {
104 private Long exceuteConsume; 89 private Long exceuteConsume;
105 90
106 /** 91 /**
107 - * 备注 92 + * 状态(0：展示、1：不展示)
108 */ 93 */
109 - private String remark; 94 + private Long status;
110 95
111 private static final long serialVersionUID = 1L; 96 private static final long serialVersionUID = 1L;
112 97
...@@ -166,30 +151,6 @@ public class Operation implements Serializable { ...@@ -166,30 +151,6 @@ public class Operation implements Serializable {
166 this.url = url == null ? null : url.trim(); 151 this.url = url == null ? null : url.trim();
167 } 152 }
168 153
169 - public String getRequestParameters() {
170 - return requestParameters;
171 - }
172 -
173 - public void setRequestParameters(String requestParameters) {
174 - this.requestParameters = requestParameters == null ? null : requestParameters.trim();
175 - }
176 -
177 - public String getResult() {
178 - return result;
179 - }
180 -
181 - public void setResult(String result) {
182 - this.result = result == null ? null : result.trim();
183 - }
184 -
185 - public Long getStatus() {
186 - return status;
187 - }
188 -
189 - public void setStatus(Long status) {
190 - this.status = status;
191 - }
192 -
193 public Date getCreateTime() { 154 public Date getCreateTime() {
194 return createTime; 155 return createTime;
195 } 156 }
...@@ -262,12 +223,12 @@ public class Operation implements Serializable { ...@@ -262,12 +223,12 @@ public class Operation implements Serializable {
262 this.exceuteConsume = exceuteConsume; 223 this.exceuteConsume = exceuteConsume;
263 } 224 }
264 225
265 - public String getRemark() { 226 + public Long getStatus() {
266 - return remark; 227 + return status;
267 } 228 }
268 229
269 - public void setRemark(String remark) { 230 + public void setStatus(Long status) {
270 - this.remark = remark == null ? null : remark.trim(); 231 + this.status = status;
271 } 232 }
272 233
273 @Override 234 @Override
...@@ -283,9 +244,6 @@ public class Operation implements Serializable { ...@@ -283,9 +244,6 @@ public class Operation implements Serializable {
283 sb.append(", module=").append(module); 244 sb.append(", module=").append(module);
284 sb.append(", describe=").append(describe); 245 sb.append(", describe=").append(describe);
285 sb.append(", url=").append(url); 246 sb.append(", url=").append(url);
286 - sb.append(", requestParameters=").append(requestParameters);
287 - sb.append(", result=").append(result);
288 - sb.append(", status=").append(status);
289 sb.append(", createTime=").append(createTime); 247 sb.append(", createTime=").append(createTime);
290 sb.append(", createUserId=").append(createUserId); 248 sb.append(", createUserId=").append(createUserId);
291 sb.append(", createUserName=").append(createUserName); 249 sb.append(", createUserName=").append(createUserName);
...@@ -295,7 +253,7 @@ public class Operation implements Serializable { ...@@ -295,7 +253,7 @@ public class Operation implements Serializable {
295 sb.append(", requestTime=").append(requestTime); 253 sb.append(", requestTime=").append(requestTime);
296 sb.append(", responseTime=").append(responseTime); 254 sb.append(", responseTime=").append(responseTime);
297 sb.append(", exceuteConsume=").append(exceuteConsume); 255 sb.append(", exceuteConsume=").append(exceuteConsume);
298 - sb.append(", remark=").append(remark); 256 + sb.append(", status=").append(status);
299 sb.append(", serialVersionUID=").append(serialVersionUID); 257 sb.append(", serialVersionUID=").append(serialVersionUID);
300 sb.append("]"); 258 sb.append("]");
301 return sb.toString(); 259 return sb.toString();
......
...@@ -595,206 +595,6 @@ public class OperationExample { ...@@ -595,206 +595,6 @@ public class OperationExample {
595 return (Criteria) this; 595 return (Criteria) this;
596 } 596 }
597 597
598 - public Criteria andRequestParametersIsNull() {
599 - addCriterion("REQUEST_PARAMETERS is null");
600 - return (Criteria) this;
601 - }
602 -
603 - public Criteria andRequestParametersIsNotNull() {
604 - addCriterion("REQUEST_PARAMETERS is not null");
605 - return (Criteria) this;
606 - }
607 -
608 - public Criteria andRequestParametersEqualTo(String value) {
609 - addCriterion("REQUEST_PARAMETERS =", value, "requestParameters");
610 - return (Criteria) this;
611 - }
612 -
613 - public Criteria andRequestParametersNotEqualTo(String value) {
614 - addCriterion("REQUEST_PARAMETERS <>", value, "requestParameters");
615 - return (Criteria) this;
616 - }
617 -
618 - public Criteria andRequestParametersGreaterThan(String value) {
619 - addCriterion("REQUEST_PARAMETERS >", value, "requestParameters");
620 - return (Criteria) this;
621 - }
622 -
623 - public Criteria andRequestParametersGreaterThanOrEqualTo(String value) {
624 - addCriterion("REQUEST_PARAMETERS >=", value, "requestParameters");
625 - return (Criteria) this;
626 - }
627 -
628 - public Criteria andRequestParametersLessThan(String value) {
629 - addCriterion("REQUEST_PARAMETERS <", value, "requestParameters");
630 - return (Criteria) this;
631 - }
632 -
633 - public Criteria andRequestParametersLessThanOrEqualTo(String value) {
634 - addCriterion("REQUEST_PARAMETERS <=", value, "requestParameters");
635 - return (Criteria) this;
636 - }
637 -
638 - public Criteria andRequestParametersLike(String value) {
639 - addCriterion("REQUEST_PARAMETERS like", value, "requestParameters");
640 - return (Criteria) this;
641 - }
642 -
643 - public Criteria andRequestParametersNotLike(String value) {
644 - addCriterion("REQUEST_PARAMETERS not like", value, "requestParameters");
645 - return (Criteria) this;
646 - }
647 -
648 - public Criteria andRequestParametersIn(List<String> values) {
649 - addCriterion("REQUEST_PARAMETERS in", values, "requestParameters");
650 - return (Criteria) this;
651 - }
652 -
653 - public Criteria andRequestParametersNotIn(List<String> values) {
654 - addCriterion("REQUEST_PARAMETERS not in", values, "requestParameters");
655 - return (Criteria) this;
656 - }
657 -
658 - public Criteria andRequestParametersBetween(String value1, String value2) {
659 - addCriterion("REQUEST_PARAMETERS between", value1, value2, "requestParameters");
660 - return (Criteria) this;
661 - }
662 -
663 - public Criteria andRequestParametersNotBetween(String value1, String value2) {
664 - addCriterion("REQUEST_PARAMETERS not between", value1, value2, "requestParameters");
665 - return (Criteria) this;
666 - }
667 -
668 - public Criteria andResultIsNull() {
669 - addCriterion("RESULT is null");
670 - return (Criteria) this;
671 - }
672 -
673 - public Criteria andResultIsNotNull() {
674 - addCriterion("RESULT is not null");
675 - return (Criteria) this;
676 - }
677 -
678 - public Criteria andResultEqualTo(String value) {
679 - addCriterion("RESULT =", value, "result");
680 - return (Criteria) this;
681 - }
682 -
683 - public Criteria andResultNotEqualTo(String value) {
684 - addCriterion("RESULT <>", value, "result");
685 - return (Criteria) this;
686 - }
687 -
688 - public Criteria andResultGreaterThan(String value) {
689 - addCriterion("RESULT >", value, "result");
690 - return (Criteria) this;
691 - }
692 -
693 - public Criteria andResultGreaterThanOrEqualTo(String value) {
694 - addCriterion("RESULT >=", value, "result");
695 - return (Criteria) this;
696 - }
697 -
698 - public Criteria andResultLessThan(String value) {
699 - addCriterion("RESULT <", value, "result");
700 - return (Criteria) this;
701 - }
702 -
703 - public Criteria andResultLessThanOrEqualTo(String value) {
704 - addCriterion("RESULT <=", value, "result");
705 - return (Criteria) this;
706 - }
707 -
708 - public Criteria andResultLike(String value) {
709 - addCriterion("RESULT like", value, "result");
710 - return (Criteria) this;
711 - }
712 -
713 - public Criteria andResultNotLike(String value) {
714 - addCriterion("RESULT not like", value, "result");
715 - return (Criteria) this;
716 - }
717 -
718 - public Criteria andResultIn(List<String> values) {
719 - addCriterion("RESULT in", values, "result");
720 - return (Criteria) this;
721 - }
722 -
723 - public Criteria andResultNotIn(List<String> values) {
724 - addCriterion("RESULT not in", values, "result");
725 - return (Criteria) this;
726 - }
727 -
728 - public Criteria andResultBetween(String value1, String value2) {
729 - addCriterion("RESULT between", value1, value2, "result");
730 - return (Criteria) this;
731 - }
732 -
733 - public Criteria andResultNotBetween(String value1, String value2) {
734 - addCriterion("RESULT not between", value1, value2, "result");
735 - return (Criteria) this;
736 - }
737 -
738 - public Criteria andStatusIsNull() {
739 - addCriterion("STATUS is null");
740 - return (Criteria) this;
741 - }
742 -
743 - public Criteria andStatusIsNotNull() {
744 - addCriterion("STATUS is not null");
745 - return (Criteria) this;
746 - }
747 -
748 - public Criteria andStatusEqualTo(Long value) {
749 - addCriterion("STATUS =", value, "status");
750 - return (Criteria) this;
751 - }
752 -
753 - public Criteria andStatusNotEqualTo(Long value) {
754 - addCriterion("STATUS <>", value, "status");
755 - return (Criteria) this;
756 - }
757 -
758 - public Criteria andStatusGreaterThan(Long value) {
759 - addCriterion("STATUS >", value, "status");
760 - return (Criteria) this;
761 - }
762 -
763 - public Criteria andStatusGreaterThanOrEqualTo(Long value) {
764 - addCriterion("STATUS >=", value, "status");
765 - return (Criteria) this;
766 - }
767 -
768 - public Criteria andStatusLessThan(Long value) {
769 - addCriterion("STATUS <", value, "status");
770 - return (Criteria) this;
771 - }
772 -
773 - public Criteria andStatusLessThanOrEqualTo(Long value) {
774 - addCriterion("STATUS <=", value, "status");
775 - return (Criteria) this;
776 - }
777 -
778 - public Criteria andStatusIn(List<Long> values) {
779 - addCriterion("STATUS in", values, "status");
780 - return (Criteria) this;
781 - }
782 -
783 - public Criteria andStatusNotIn(List<Long> values) {
784 - addCriterion("STATUS not in", values, "status");
785 - return (Criteria) this;
786 - }
787 -
788 - public Criteria andStatusBetween(Long value1, Long value2) {
789 - addCriterion("STATUS between", value1, value2, "status");
790 - return (Criteria) this;
791 - }
792 -
793 - public Criteria andStatusNotBetween(Long value1, Long value2) {
794 - addCriterion("STATUS not between", value1, value2, "status");
795 - return (Criteria) this;
796 - }
797 -
798 public Criteria andCreateTimeIsNull() { 598 public Criteria andCreateTimeIsNull() {
799 addCriterion("CREATE_TIME is null"); 599 addCriterion("CREATE_TIME is null");
800 return (Criteria) this; 600 return (Criteria) this;
...@@ -1354,6 +1154,66 @@ public class OperationExample { ...@@ -1354,6 +1154,66 @@ public class OperationExample {
1354 addCriterion("EXCEUTE_CONSUME not between", value1, value2, "exceuteConsume"); 1154 addCriterion("EXCEUTE_CONSUME not between", value1, value2, "exceuteConsume");
1355 return (Criteria) this; 1155 return (Criteria) this;
1356 } 1156 }
1157 +
1158 + public Criteria andStatusIsNull() {
1159 + addCriterion("STATUS is null");
1160 + return (Criteria) this;
1161 + }
1162 +
1163 + public Criteria andStatusIsNotNull() {
1164 + addCriterion("STATUS is not null");
1165 + return (Criteria) this;
1166 + }
1167 +
1168 + public Criteria andStatusEqualTo(Long value) {
1169 + addCriterion("STATUS =", value, "status");
1170 + return (Criteria) this;
1171 + }
1172 +
1173 + public Criteria andStatusNotEqualTo(Long value) {
1174 + addCriterion("STATUS <>", value, "status");
1175 + return (Criteria) this;
1176 + }
1177 +
1178 + public Criteria andStatusGreaterThan(Long value) {
1179 + addCriterion("STATUS >", value, "status");
1180 + return (Criteria) this;
1181 + }
1182 +
1183 + public Criteria andStatusGreaterThanOrEqualTo(Long value) {
1184 + addCriterion("STATUS >=", value, "status");
1185 + return (Criteria) this;
1186 + }
1187 +
1188 + public Criteria andStatusLessThan(Long value) {
1189 + addCriterion("STATUS <", value, "status");
1190 + return (Criteria) this;
1191 + }
1192 +
1193 + public Criteria andStatusLessThanOrEqualTo(Long value) {
1194 + addCriterion("STATUS <=", value, "status");
1195 + return (Criteria) this;
1196 + }
1197 +
1198 + public Criteria andStatusIn(List<Long> values) {
1199 + addCriterion("STATUS in", values, "status");
1200 + return (Criteria) this;
1201 + }
1202 +
1203 + public Criteria andStatusNotIn(List<Long> values) {
1204 + addCriterion("STATUS not in", values, "status");
1205 + return (Criteria) this;
1206 + }
1207 +
1208 + public Criteria andStatusBetween(Long value1, Long value2) {
1209 + addCriterion("STATUS between", value1, value2, "status");
1210 + return (Criteria) this;
1211 + }
1212 +
1213 + public Criteria andStatusNotBetween(Long value1, Long value2) {
1214 + addCriterion("STATUS not between", value1, value2, "status");
1215 + return (Criteria) this;
1216 + }
1357 } 1217 }
1358 1218
1359 public static class Criteria extends GeneratedCriteria { 1219 public static class Criteria extends GeneratedCriteria {
......
1 +package com.fedex.connect.common.model.log;
2 +
3 +import java.io.Serializable;
4 +
5 +/**
6 + * DESC: 操作日志
7 + * TABLE: iclconnect.T_LOG_OPERATION
8 + */
9 +public class OperationWithBLOBs extends Operation implements Serializable {
10 + /**
11 + * 备注
12 + */
13 + private String remark;
14 +
15 + /**
16 + * 请求参数
17 + */
18 + private String requestParameters;
19 +
20 + /**
21 + * 请求结果
22 + */
23 + private String result;
24 +
25 + private static final long serialVersionUID = 1L;
26 +
27 + public String getRemark() {
28 + return remark;
29 + }
30 +
31 + public void setRemark(String remark) {
32 + this.remark = remark == null ? null : remark.trim();
33 + }
34 +
35 + public String getRequestParameters() {
36 + return requestParameters;
37 + }
38 +
39 + public void setRequestParameters(String requestParameters) {
40 + this.requestParameters = requestParameters == null ? null : requestParameters.trim();
41 + }
42 +
43 + public String getResult() {
44 + return result;
45 + }
46 +
47 + public void setResult(String result) {
48 + this.result = result == null ? null : result.trim();
49 + }
50 +
51 + @Override
52 + public String toString() {
53 + StringBuilder sb = new StringBuilder();
54 + sb.append(getClass().getSimpleName());
55 + sb.append(" [");
56 + sb.append("Hash = ").append(hashCode());
57 + sb.append(", remark=").append(remark);
58 + sb.append(", requestParameters=").append(requestParameters);
59 + sb.append(", result=").append(result);
60 + sb.append(", serialVersionUID=").append(serialVersionUID);
61 + sb.append("]");
62 + return sb.toString();
63 + }
64 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: KAFKA数据历史表 7 * DESC: KAFKA数据历史表
8 - * TABLE: ICLEARIMP.T_SYS_KAFKA_STORAGE_HISTORY 8 + * TABLE: iclconnect.T_SYS_KAFKA_STORAGE_HISTORY
9 */ 9 */
10 public class KafkaStorageHistory implements Serializable { 10 public class KafkaStorageHistory implements Serializable {
11 /** 11 /**
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: KAFKA临时表 7 * DESC: KAFKA临时表
8 - * TABLE: ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE 8 + * TABLE: iclconnect.T_SYS_KAFKA_TEMPORARY_STORAGE
9 */ 9 */
10 public class KafkaTemporaryStorage implements Serializable { 10 public class KafkaTemporaryStorage implements Serializable {
11 /** 11 /**
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 系统参数配置表 7 * DESC: 系统参数配置表
8 - * TABLE: ICLEARIMP.T_SYS_PARAM_CONFIG 8 + * TABLE: iclconnect.T_SYS_PARAM_CONFIG
9 */ 9 */
10 public class ParamConfig implements Serializable { 10 public class ParamConfig implements Serializable {
11 /** 11 /**
......
...@@ -8,7 +8,7 @@ import java.util.Date; ...@@ -8,7 +8,7 @@ import java.util.Date;
8 8
9 /** 9 /**
10 * DESC: 用户表 10 * DESC: 用户表
11 - * TABLE: ICLEARIMP.T_SYS_USER 11 + * TABLE: iclconnect.T_SYS_USER
12 */ 12 */
13 @SensitiveEntity 13 @SensitiveEntity
14 public class User implements Serializable { 14 public class User implements Serializable {
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: 用户角色表 7 * DESC: 用户角色表
8 - * TABLE: ICLEARIMP.T_SYS_USER_ROLE 8 + * TABLE: iclconnect.T_SYS_USER_ROLE
9 */ 9 */
10 public class UserRole implements Serializable { 10 public class UserRole implements Serializable {
11 /** 11 /**
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 sys：系统 系统相关表，例如kafka表 40 sys：系统 系统相关表，例如kafka表
41 log: 日志 日志记录表，例如邮件发送日志表 41 log: 日志 日志记录表，例如邮件发送日志表
42 --> 42 -->
43 - <javaModelGenerator targetPackage="com.fedex.connect.common.model.sys" targetProject="src/main/java"> 43 + <javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java">
44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性--> 44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
45 <property name="enableSubPackages" value="false"/> 45 <property name="enableSubPackages" value="false"/>
46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false--> 46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
52 </javaModelGenerator> 52 </javaModelGenerator>
53 53
54 <!-- 生成映射文件*.xml的位置--> 54 <!-- 生成映射文件*.xml的位置-->
55 - <sqlMapGenerator targetPackage="mapper.sys" targetProject="src/main/java/com/fedex/connect/common"> 55 + <sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common">
56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
57 <property name="enableSubPackages" value="false"/> 57 <property name="enableSubPackages" value="false"/>
58 </sqlMapGenerator> 58 </sqlMapGenerator>
59 59
60 <!-- 生成DAO的包名和位置 --> 60 <!-- 生成DAO的包名和位置 -->
61 - <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.sys" targetProject="src/main/java"> 61 + <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java">
62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
63 <property name="enableSubPackages" value="false"/> 63 <property name="enableSubPackages" value="false"/>
64 </javaClientGenerator> 64 </javaClientGenerator>
...@@ -135,14 +135,12 @@ ...@@ -135,14 +135,12 @@
135 <!-- selectByExampleQueryId="true">--> 135 <!-- selectByExampleQueryId="true">-->
136 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL" />--> 136 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL" />-->
137 <!-- </table>--> 137 <!-- </table>-->
138 -<!-- <table tableName="T_BIZ_PUSH_OB_DETAIL" domainObjectName="PushObDetail"--> 138 + <table tableName="T_BIZ_PUSH_OB_DETAIL" domainObjectName="PushObDetail"
139 -<!-- enableCountByExample="true" enableUpdateByExample="true"--> 139 + enableCountByExample="true" enableUpdateByExample="true"
140 -<!-- enableDeleteByExample="true" enableSelectByExample="true"--> 140 + enableDeleteByExample="true" enableSelectByExample="true"
141 -<!-- selectByExampleQueryId="true">--> 141 + selectByExampleQueryId="true">
142 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL" />--> 142 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL" />
143 -<!-- </table>--> 143 + </table>
144 -
145 -
146 144
147 <!-- <table tableName="T_BI_PORTCLEAR_EMAIL_MAPPING" domainObjectName="PortclearEmailMapping"--> 145 <!-- <table tableName="T_BI_PORTCLEAR_EMAIL_MAPPING" domainObjectName="PortclearEmailMapping"-->
148 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 146 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
...@@ -169,12 +167,12 @@ ...@@ -169,12 +167,12 @@
169 <!-- selectByExampleQueryId="true">--> 167 <!-- selectByExampleQueryId="true">-->
170 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />--> 168 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
171 <!-- </table>--> 169 <!-- </table>-->
172 - <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig" 170 +<!-- <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"-->
173 - enableCountByExample="true" enableUpdateByExample="true" 171 +<!-- enableCountByExample="true" enableUpdateByExample="true"-->
174 - enableDeleteByExample="true" enableSelectByExample="true" 172 +<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
175 - selectByExampleQueryId="true"> 173 +<!-- selectByExampleQueryId="true">-->
176 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" /> 174 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />-->
177 - </table> 175 +<!-- </table>-->
178 <!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"--> 176 <!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
179 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 177 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
180 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 178 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
...@@ -193,12 +191,12 @@ ...@@ -193,12 +191,12 @@
193 <!-- selectByExampleQueryId="true">--> 191 <!-- selectByExampleQueryId="true">-->
194 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />--> 192 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
195 <!-- </table>--> 193 <!-- </table>-->
196 - <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User" 194 +<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"-->
197 - enableCountByExample="true" enableUpdateByExample="true" 195 +<!-- enableCountByExample="true" enableUpdateByExample="true"-->
198 - enableDeleteByExample="true" enableSelectByExample="true" 196 +<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
199 - selectByExampleQueryId="true"> 197 +<!-- selectByExampleQueryId="true">-->
200 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" /> 198 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />-->
201 - </table> 199 +<!-- </table>-->
202 <!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"--> 200 <!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
203 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 201 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
204 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 202 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
......
...@@ -2,6 +2,8 @@ package com.fedex.connect.common.dependencies.aspect; ...@@ -2,6 +2,8 @@ package com.fedex.connect.common.dependencies.aspect;
2 2
3 import com.fedex.connect.common.dependencies.annotation.OperationMethodLog; 3 import com.fedex.connect.common.dependencies.annotation.OperationMethodLog;
4 import com.fedex.connect.common.dependencies.contants.AnnotationConstants; 4 import com.fedex.connect.common.dependencies.contants.AnnotationConstants;
5 +import com.fedex.connect.common.dependencies.contants.BaseConstants;
6 +import com.fedex.connect.common.dependencies.contants.SystemDefaultUserConstants;
5 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 7 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
6 import com.fedex.connect.common.dependencies.enums.BaseResponseCode; 8 import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
7 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 9 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
...@@ -10,6 +12,7 @@ import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils; ...@@ -10,6 +12,7 @@ import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
10 import com.fedex.connect.common.dependencies.util.CurrentUserInfo; 12 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
11 import com.fedex.connect.common.dependencies.util.JsonUtils; 13 import com.fedex.connect.common.dependencies.util.JsonUtils;
12 import com.fedex.connect.common.model.log.Operation; 14 import com.fedex.connect.common.model.log.Operation;
15 +import com.fedex.connect.common.model.log.OperationWithBLOBs;
13 import com.fedex.connect.common.model.sys.User; 16 import com.fedex.connect.common.model.sys.User;
14 import org.aspectj.lang.JoinPoint; 17 import org.aspectj.lang.JoinPoint;
15 import org.aspectj.lang.ProceedingJoinPoint; 18 import org.aspectj.lang.ProceedingJoinPoint;
...@@ -119,7 +122,7 @@ public class OperationLogAspect { ...@@ -119,7 +122,7 @@ public class OperationLogAspect {
119 String describe = localeMessageUtil.getMessage(operationMethodLog.describe()); 122 String describe = localeMessageUtil.getMessage(operationMethodLog.describe());
120 String method = request.getMethod(); 123 String method = request.getMethod();
121 124
122 - Operation log = new Operation(); 125 + OperationWithBLOBs log = new OperationWithBLOBs();
123 log.setRequestParameters(requestParameters); 126 log.setRequestParameters(requestParameters);
124 log.setUrl(url); 127 log.setUrl(url);
125 log.setDescribe(describe); 128 log.setDescribe(describe);
...@@ -128,6 +131,7 @@ public class OperationLogAspect { ...@@ -128,6 +131,7 @@ public class OperationLogAspect {
128 131
129 //获取用户信息。 login,logout,oss登录特殊处理 132 //获取用户信息。 login,logout,oss登录特殊处理
130 User user = CurrentUserInfo.getUser(); 133 User user = CurrentUserInfo.getUser();
134 + log.setLoginName(user.getLoginName());
131 log.setUserId(user.getId()); 135 log.setUserId(user.getId());
132 log.setUserName(user.getUserName()); 136 log.setUserName(user.getUserName());
133 //请求时间 137 //请求时间
...@@ -172,7 +176,12 @@ public class OperationLogAspect { ...@@ -172,7 +176,12 @@ public class OperationLogAspect {
172 log.setResult(resultJson); 176 log.setResult(resultJson);
173 } 177 }
174 //基础字段赋值 178 //基础字段赋值
175 - AssignmentFieldUtils.assignmentTableBaseField(log); 179 + log.setCreateTime(new Date());
180 + log.setCreateUserId(SystemDefaultUserConstants.SYSTEM_USER_KEYS.ID);
181 + log.setCreateUserName(SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME);
182 + log.setModifyTime(new Date());
183 + log.setModifyUserId(SystemDefaultUserConstants.SYSTEM_USER_KEYS.ID);
184 + log.setModifyUserName(SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME);
176 // 日志插入数据库 185 // 日志插入数据库
177 logger.info("插入日志：" + JsonUtils.objectToJson(log)); 186 logger.info("插入日志：" + JsonUtils.objectToJson(log));
178 operationRepository.insert(log); 187 operationRepository.insert(log);
......
...@@ -129,7 +129,7 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter { ...@@ -129,7 +129,7 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
129 response.setHeader("Token", newToken);*/ 129 response.setHeader("Token", newToken);*/
130 } catch (ExpiredJwtException ee) { 130 } catch (ExpiredJwtException ee) {
131 //已经过期了,直接踢 131 //已经过期了,直接踢
132 - logger.error("CODE : {} requestURL:{},reason:{}",BaseResponseCode.MESSAGE_CODE_10004.getCode() , request.getRequestURL(),"ExpiredJwtException ",ee); 132 + logger.error("CODE : {} requestURL:{},reason:{}",BaseResponseCode.MESSAGE_CODE_10005.getCode() , request.getRequestURL(),"ExpiredJwtException ",ee);
133 Claims claims = ee.getClaims(); 133 Claims claims = ee.getClaims();
134 String id = claims.getId(); 134 String id = claims.getId();
135 Map<String, Object> result = new HashMap<>(); 135 Map<String, Object> result = new HashMap<>();
......
...@@ -20,7 +20,7 @@ public class BasicController { ...@@ -20,7 +20,7 @@ public class BasicController {
20 throw new OpErrorException(BaseResponseCode.MESSAGE_CODE_10003.getCode(),localeMessageUtil.getMessage(BaseResponseCode.MESSAGE_CODE_10003.getMsg()),e); 20 throw new OpErrorException(BaseResponseCode.MESSAGE_CODE_10003.getCode(),localeMessageUtil.getMessage(BaseResponseCode.MESSAGE_CODE_10003.getMsg()),e);
21 } 21 }
22 if (user == null) { 22 if (user == null) {
23 - throw new OpErrorException(BaseResponseCode.MESSAGE_CODE_10006.getCode(),localeMessageUtil.getMessage(BaseResponseCode.MESSAGE_CODE_10006.getMsg())); 23 + throw new OpErrorException(BaseResponseCode.MESSAGE_CODE_10005.getCode(),localeMessageUtil.getMessage(BaseResponseCode.MESSAGE_CODE_10005.getMsg()));
24 } 24 }
25 return user; 25 return user;
26 } 26 }
......
...@@ -3,16 +3,19 @@ package com.fedex.connect.common.dependencies.config; ...@@ -3,16 +3,19 @@ package com.fedex.connect.common.dependencies.config;
3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
4 import com.fedex.connect.common.dependencies.exception.BaseException; 4 import com.fedex.connect.common.dependencies.exception.BaseException;
5 import com.fedex.connect.common.dependencies.exception.OpErrorException; 5 import com.fedex.connect.common.dependencies.exception.OpErrorException;
6 +import lombok.extern.slf4j.Slf4j;
6 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 7 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
7 import org.springframework.web.bind.annotation.ExceptionHandler; 8 import org.springframework.web.bind.annotation.ExceptionHandler;
8 import org.springframework.web.bind.annotation.RestControllerAdvice; 9 import org.springframework.web.bind.annotation.RestControllerAdvice;
9 10
11 +@Slf4j
10 @ConditionalOnProperty(prefix = "common.exception-advice-webconfig", name = "enable", havingValue = "true") 12 @ConditionalOnProperty(prefix = "common.exception-advice-webconfig", name = "enable", havingValue = "true")
11 @RestControllerAdvice 13 @RestControllerAdvice
12 public class ControllerExceptionAdvice { 14 public class ControllerExceptionAdvice {
13 15
14 @ExceptionHandler(Exception.class) 16 @ExceptionHandler(Exception.class)
15 public ResponseVo exceptionHandler(Exception ex) { 17 public ResponseVo exceptionHandler(Exception ex) {
18 + log.error(ex.getMessage(),ex);
16 ResponseVo res = new ResponseVo(); 19 ResponseVo res = new ResponseVo();
17 res.setSuccess(false); 20 res.setSuccess(false);
18 res.setCode(599); 21 res.setCode(599);
...@@ -22,6 +25,7 @@ public class ControllerExceptionAdvice { ...@@ -22,6 +25,7 @@ public class ControllerExceptionAdvice {
22 25
23 @ExceptionHandler(BaseException.class) 26 @ExceptionHandler(BaseException.class)
24 public ResponseVo baseExceptionHandler(BaseException ex) { 27 public ResponseVo baseExceptionHandler(BaseException ex) {
28 + log.error(ex.getMessage(),ex);
25 ResponseVo res = new ResponseVo(); 29 ResponseVo res = new ResponseVo();
26 res.setSuccess(false); 30 res.setSuccess(false);
27 res.setCode(ex.getCode().intValue()); 31 res.setCode(ex.getCode().intValue());
...@@ -31,6 +35,7 @@ public class ControllerExceptionAdvice { ...@@ -31,6 +35,7 @@ public class ControllerExceptionAdvice {
31 35
32 @ExceptionHandler(OpErrorException.class) 36 @ExceptionHandler(OpErrorException.class)
33 public ResponseVo opErrorExceptionHandler(OpErrorException ex) { 37 public ResponseVo opErrorExceptionHandler(OpErrorException ex) {
38 + log.error(ex.getMessage(),ex);
34 ResponseVo res = new ResponseVo(); 39 ResponseVo res = new ResponseVo();
35 res.setSuccess(false); 40 res.setSuccess(false);
36 res.setCode(ex.getCode()); 41 res.setCode(ex.getCode());
......
...@@ -70,7 +70,7 @@ public interface BaseSeparatorConstants { ...@@ -70,7 +70,7 @@ public interface BaseSeparatorConstants {
70 String SEPARATOR_ASTERISK = "*"; 70 String SEPARATOR_ASTERISK = "*";
71 71
72 /** 72 /**
73 - * @Description 星号 73 + * @Description 反斜杠
74 * @Author mt 74 * @Author mt
75 * @Date 2024-11-11 75 * @Date 2024-11-11
76 */ 76 */
......
1 package com.fedex.connect.common.dependencies.data.bo; 1 package com.fedex.connect.common.dependencies.data.bo;
2 2
3 +import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
3 import com.fedex.connect.common.dependencies.util.DateUtil; 4 import com.fedex.connect.common.dependencies.util.DateUtil;
4 import com.fedex.connect.common.model.sys.RedisSlab; 5 import com.fedex.connect.common.model.sys.RedisSlab;
5 6
...@@ -13,11 +14,17 @@ public class RedisSlabBo { ...@@ -13,11 +14,17 @@ public class RedisSlabBo {
13 dao.setRedisMsg(value); 14 dao.setRedisMsg(value);
14 dao.setValidDuration(validDuration != 0 ? Long.valueOf(validDuration) : 0L); 15 dao.setValidDuration(validDuration != 0 ? Long.valueOf(validDuration) : 0L);
15 dao.setDisTime(DateUtil.getHoursAgoTime(validDuration)); 16 dao.setDisTime(DateUtil.getHoursAgoTime(validDuration));
16 - dao.setCreateTime(new Date()); 17 + try {
18 + /**
19 + * 初始化表基础字段
20 + */
21 + AssignmentFieldUtils.assignmentTableBaseField(dao);
22 + }catch(Exception ex){
23 + ex.printStackTrace();
24 + }
17 return dao; 25 return dao;
18 } 26 }
19 27
20 -
21 /** 28 /**
22 * ID自增 29 * ID自增
23 */ 30 */
......
...@@ -12,7 +12,6 @@ public enum BaseResponseCode { ...@@ -12,7 +12,6 @@ public enum BaseResponseCode {
12 MESSAGE_CODE_10003(10003,"system_exception_10003"), 12 MESSAGE_CODE_10003(10003,"system_exception_10003"),
13 MESSAGE_CODE_10004(10004,"system_exception_10004"), 13 MESSAGE_CODE_10004(10004,"system_exception_10004"),
14 MESSAGE_CODE_10005(10005,"system_exception_10005"), 14 MESSAGE_CODE_10005(10005,"system_exception_10005"),
15 - MESSAGE_CODE_10006(10006,"system_exception_10006"),
16 ; 15 ;
17 private Integer code; 16 private Integer code;
18 private String msg; 17 private String msg;
......
...@@ -65,4 +65,14 @@ public enum AttachmentBizTypeEnum { ...@@ -65,4 +65,14 @@ public enum AttachmentBizTypeEnum {
65 } 65 }
66 return null; // 如果没有找到匹配的 code，返回 null 66 return null; // 如果没有找到匹配的 code，返回 null
67 } 67 }
68 +
69 + public static String getCodeByExt1(String ext1) {
70 + for (AttachmentBizTypeEnum type : AttachmentBizTypeEnum.values()) {
71 + if (type.getExt1().equals(ext1)) {
72 + return type.getCode();
73 + }
74 + }
75 + return null; // 如果没有找到匹配的 ext1，返回 null
76 + }
77 +
68 } 78 }
......
...@@ -12,6 +12,7 @@ public enum EmailTypeEnum { ...@@ -12,6 +12,7 @@ public enum EmailTypeEnum {
12 PUSH_CON_FILE("emailType_01","Push Pre-Customs Clearance Files","推送预清关文件"), 12 PUSH_CON_FILE("emailType_01","Push Pre-Customs Clearance Files","推送预清关文件"),
13 NOTIFICATION_SENDER("emailType_02","Remind Sender","提醒发件人"), 13 NOTIFICATION_SENDER("emailType_02","Remind Sender","提醒发件人"),
14 SEND_FAILED_EMAIL("emailType_03", "Error Email Alert","错误邮件预警"), 14 SEND_FAILED_EMAIL("emailType_03", "Error Email Alert","错误邮件预警"),
15 + SEND_OB("ob", "ob","推送ob"),
15 16
16 ; 17 ;
17 18
...@@ -31,10 +32,10 @@ public enum EmailTypeEnum { ...@@ -31,10 +32,10 @@ public enum EmailTypeEnum {
31 } 32 }
32 33
33 // 获取 enMsg 根据 code 34 // 获取 enMsg 根据 code
34 - public static String getEnMsgByCode(String code) { 35 + public static String getMsgByCode(String code) {
35 for (EmailTypeEnum emailType : EmailTypeEnum.values()) { 36 for (EmailTypeEnum emailType : EmailTypeEnum.values()) {
36 if (emailType.code.equals(code)) { 37 if (emailType.code.equals(code)) {
37 - return emailType.enMsg; 38 + return emailType.msg;
38 } 39 }
39 } 40 }
40 return null; // 如果找不到对应的 code，返回 null 41 return null; // 如果找不到对应的 code，返回 null
......
...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.enums.sys; ...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.enums.sys;
2 2
3 public enum UserTypeEnum { 3 public enum UserTypeEnum {
4 LOCAL("userType_01","LOCAL","本地账号"), 4 LOCAL("userType_01","LOCAL","本地账号"),
5 - FCL("userType_02","FCL","FCL账号"); 5 + FCL("userType_02","fedex.com User Account","FCL账号");
6 6
7 private String code; 7 private String code;
8 private String enMsg; 8 private String enMsg;
......
...@@ -2,14 +2,13 @@ package com.fedex.connect.common.dependencies.repository.base; ...@@ -2,14 +2,13 @@ package com.fedex.connect.common.dependencies.repository.base;
2 2
3 import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper; 3 import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
4 import com.fedex.connect.common.dao.log.OperationMapper; 4 import com.fedex.connect.common.dao.log.OperationMapper;
5 -import com.fedex.connect.common.dao.sys.ParamConfigMapper;
6 import com.fedex.connect.common.dao.sys.RedisSlabMapper; 5 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
7 -import com.fedex.connect.common.dependencies.repository.dao.UserMapperExt; 6 +import com.fedex.connect.common.dependencies.repository.dao.UserBaseMapper;
8 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
9 8
10 public class BaseDao { 9 public class BaseDao {
11 @Autowired 10 @Autowired
12 - protected UserMapperExt userMapperExt; 11 + protected UserBaseMapper userBaseMapper;
13 @Autowired 12 @Autowired
14 protected RedisSlabMapper redisSlabMapper; 13 protected RedisSlabMapper redisSlabMapper;
15 @Autowired 14 @Autowired
......
...@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
6 import org.apache.ibatis.annotations.Select; 6 import org.apache.ibatis.annotations.Select;
7 7
8 @Mapper 8 @Mapper
9 -public interface UserMapperExt { 9 +public interface UserBaseMapper {
10 @Select( "<script>" + 10 @Select( "<script>" +
11 "select * from T_SYS_USER where ID = #{id} AND STATUS = 1 " + 11 "select * from T_SYS_USER where ID = #{id} AND STATUS = 1 " +
12 "</script>") 12 "</script>")
......
...@@ -5,6 +5,6 @@ import com.fedex.connect.common.model.bi.DictionaryEntriesExample; ...@@ -5,6 +5,6 @@ import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
8 -public interface IDictionaryEntriesRepository { 8 +public interface IDictionaryEntriesBaseRepository {
9 List<DictionaryEntries> findAll(DictionaryEntriesExample example); 9 List<DictionaryEntries> findAll(DictionaryEntriesExample example);
10 } 10 }
......
...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.bi.impl; ...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.bi.impl;
2 2
3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
4 import com.fedex.connect.common.dependencies.repository.base.BaseDao; 4 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
5 -import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesRepository; 5 +import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesBaseRepository;
6 import com.fedex.connect.common.model.bi.DictionaryEntries; 6 import com.fedex.connect.common.model.bi.DictionaryEntries;
7 import com.fedex.connect.common.model.bi.DictionaryEntriesExample; 7 import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
8 import org.springframework.stereotype.Repository; 8 import org.springframework.stereotype.Repository;
...@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; ...@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
10 import java.util.List; 10 import java.util.List;
11 11
12 @Repository 12 @Repository
13 -public class DictionaryEntriesImpl extends BaseDao implements IDictionaryEntriesRepository { 13 +public class DictionaryEntriesBaseImpl extends BaseDao implements IDictionaryEntriesBaseRepository {
14 14
15 @Override 15 @Override
16 public List<DictionaryEntries> findAll(DictionaryEntriesExample example) { 16 public List<DictionaryEntries> findAll(DictionaryEntriesExample example) {
......
1 package com.fedex.connect.common.dependencies.repository.repo.log; 1 package com.fedex.connect.common.dependencies.repository.repo.log;
2 2
3 -import com.fedex.connect.common.model.log.Operation; 3 +import com.fedex.connect.common.model.log.OperationWithBLOBs;
4 4
5 /** 5 /**
6 * @Author mt 6 * @Author mt
...@@ -8,5 +8,5 @@ import com.fedex.connect.common.model.log.Operation; ...@@ -8,5 +8,5 @@ import com.fedex.connect.common.model.log.Operation;
8 * @Date 2024/11/6 8 * @Date 2024/11/6
9 */ 9 */
10 public interface IOperationRepository { 10 public interface IOperationRepository {
11 - void insert(Operation record); 11 + void insert(OperationWithBLOBs record);
12 } 12 }
......
...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.log.impl; ...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.log.impl;
2 2
3 import com.fedex.connect.common.dependencies.repository.base.BaseDao; 3 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
4 import com.fedex.connect.common.dependencies.repository.repo.log.IOperationRepository; 4 import com.fedex.connect.common.dependencies.repository.repo.log.IOperationRepository;
5 -import com.fedex.connect.common.model.log.Operation; 5 +import com.fedex.connect.common.model.log.OperationWithBLOBs;
6 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
7 7
8 /** 8 /**
...@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; ...@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
12 */ 12 */
13 @Repository 13 @Repository
14 public class OperationRepositoryImpl extends BaseDao implements IOperationRepository { 14 public class OperationRepositoryImpl extends BaseDao implements IOperationRepository {
15 - public void insert(Operation record){ 15 + public void insert(OperationWithBLOBs record){
16 operationMapper.insert(record); 16 operationMapper.insert(record);
17 } 17 }
18 } 18 }
......
...@@ -5,7 +5,7 @@ import com.fedex.connect.common.model.sys.RedisSlabExample; ...@@ -5,7 +5,7 @@ import com.fedex.connect.common.model.sys.RedisSlabExample;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
8 -public interface IRedisSlabRepository { 8 +public interface IRedisSlabBaseRepository {
9 int insert(RedisSlab record); 9 int insert(RedisSlab record);
10 10
11 List<RedisSlab> selectByExample(RedisSlabExample example); 11 List<RedisSlab> selectByExample(RedisSlabExample example);
......
...@@ -2,6 +2,6 @@ package com.fedex.connect.common.dependencies.repository.repo.sys; ...@@ -2,6 +2,6 @@ package com.fedex.connect.common.dependencies.repository.repo.sys;
2 2
3 import com.fedex.connect.common.model.sys.User; 3 import com.fedex.connect.common.model.sys.User;
4 4
5 -public interface IUserRepository { 5 +public interface IUserBaseRepository {
6 User findOne(Long id); 6 User findOne(Long id);
7 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.fedex.connect.common.dependencies.repository.repo.sys.impl; 1 package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.repository.base.BaseDao; 3 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
4 -import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository; 4 +import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabBaseRepository;
5 import com.fedex.connect.common.model.sys.RedisSlab; 5 import com.fedex.connect.common.model.sys.RedisSlab;
6 import com.fedex.connect.common.model.sys.RedisSlabExample; 6 import com.fedex.connect.common.model.sys.RedisSlabExample;
7 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; ...@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
9 import java.util.List; 9 import java.util.List;
10 10
11 @Repository 11 @Repository
12 -public class RedisSlabRepositoryImpl extends BaseDao implements IRedisSlabRepository { 12 +public class RedisSlabBaseRepositoryImpl extends BaseDao implements IRedisSlabBaseRepository {
13 13
14 @Override 14 @Override
15 public int insert(RedisSlab record) { 15 public int insert(RedisSlab record) {
......
1 package com.fedex.connect.common.dependencies.repository.repo.sys.impl; 1 package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.repository.base.BaseDao; 3 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
4 -import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository; 4 +import com.fedex.connect.common.dependencies.repository.repo.sys.IUserBaseRepository;
5 import com.fedex.connect.common.model.sys.User; 5 import com.fedex.connect.common.model.sys.User;
6 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
7 7
8 @Repository 8 @Repository
9 -public class UserRepositoryImpl extends BaseDao implements IUserRepository { 9 +public class UserBaseRepositoryImpl extends BaseDao implements IUserBaseRepository {
10 10
11 @Override 11 @Override
12 public User findOne(Long id){ 12 public User findOne(Long id){
13 - return this.userMapperExt.findOne(id); 13 + return this.userBaseMapper.findOne(id);
14 } 14 }
15 } 15 }
......
1 package com.fedex.connect.common.dependencies.service.base; 1 package com.fedex.connect.common.dependencies.service.base;
2 2
3 -import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository; 3 +import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabBaseRepository;
4 -import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesRepository; 4 +import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesBaseRepository;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 6
7 /** 7 /**
...@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
11 */ 11 */
12 public class BaseService { 12 public class BaseService {
13 @Autowired 13 @Autowired
14 - protected IRedisSlabRepository redisSlabRepository; 14 + protected IRedisSlabBaseRepository redisSlabRepository;
15 @Autowired 15 @Autowired
16 - protected IDictionaryEntriesRepository dictionaryEntriesRepository; 16 + protected IDictionaryEntriesBaseRepository dictionaryEntriesRepository;
17 } 17 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -28,17 +28,18 @@ public class DuplicateEmailTemplate implements EmailTemplate { ...@@ -28,17 +28,18 @@ public class DuplicateEmailTemplate implements EmailTemplate {
28 } 28 }
29 29
30 interface CLEARANCE_TITLE{ 30 interface CLEARANCE_TITLE{
31 - String TITLE = "Sender Reminder:"; 31 + String TITLE = "Notification: declaration documents submitted ({0})";
32 } 32 }
33 33
34 interface CLEARANCE_BODY{ 34 interface CLEARANCE_BODY{
35 - String DESCRIPTION = "<p>Sender Reminder: The task will poll every {0} minutes after the system starts.</p>\n"; 35 + String DESCRIPTION = "<p>This email is a reminder email, please do not reply！</p>\n";
36 36
37 String BODY = "<div><div style='margin-left:4%;'>" + 37 String BODY = "<div><div style='margin-left:4%;'>" +
38 - "<p align='center'><img src='{0}'></p>" + 38 + "<p>FedEx iClear Connect System Notification:</p>" +
39 - "<p align='center'><img src='{1}'></p>" + 39 + "<p>&nbsp;&nbsp;&nbsp;&nbsp;Please note that the declaration documents of waybill with tracking number {0} has been submitted by someone else！</p>" +
40 - "<p>Import Pre-Clearance System Notification:</p>" + 40 + "</font><br/><br/>" +
41 - "<p>&nbsp;&nbsp;&nbsp;&nbsp;{2}The consignment has been created and uploaded by another user.</p>" + 41 + "<div style=color:#808080;font-style:Arial;font-size:14px;margin: auto;margin-bottom: 5px;>" +
42 - "</font><br/><br/>"; 42 + "{1}\n" +
43 + "</div>";
43 } 44 }
44 } 45 }
......
...@@ -32,28 +32,27 @@ public class SendFailedEmailTemplate implements EmailTemplate { ...@@ -32,28 +32,27 @@ public class SendFailedEmailTemplate implements EmailTemplate {
32 32
33 33
34 interface FAILED_EMAIL_TITLE{ 34 interface FAILED_EMAIL_TITLE{
35 - String TITLE = "Failure Alert"; 35 + String TITLE = "接口调用失败详情";
36 } 36 }
37 37
38 interface FAILED_EMAIL_BODY{ 38 interface FAILED_EMAIL_BODY{
39 - String DESCRIPTION = "<p>1.[File Push] Task: The system performs a polling every {0} minutes after startup.</p>\n" + 39 + String DESCRIPTION = "<p>1.【文件推送】任务，系统启动后每{0}分钟轮巡一次。</p>\n" +
40 - " <p>2.[Push Pre-Clearance File] Task: The system performs a polling every {1} minutes after startup.</p>\n" + 40 + " <p>2.【推送预清关文件】任务，系统启动后每{1}分钟轮巡一次。</p>\n" +
41 - " <p>3.[Remind Sender] Task: The system performs a polling every {2} minutes after startup.</p>\n" + 41 + " <p>3.【提醒发件人】任务，系统启动后每{2}分钟轮巡一次。</p>\n" +
42 - " <p>Note: Email Sending Mechanism:</p>\n" + 42 + " <p>备注：邮件发送机制:</p>\n" +
43 - " <p>This alert email task is executed every {3} minutes after the system starts. If any of the three scheduled tasks mentioned above have a final determination of failed records exceeding {4} for the day, an email notification will be automatically sent to FedEx IT. Each interface will display the latest {5} failed tracking numbers, the total number of calls made during the day, and the total number of failed calls for the day.</p>\n" + 43 + " <p>该预警邮件任务，系统启动后每30分钟执行一次，当日上述3个定时任务，有任何一个任务的最终判定为失败的记录数量大于5，则自动发送邮件通知FedEX IT，每个接口显示最新10条失败运单号、当日调用总次数、当日调用失败总次数。</p>\n" ;
44 - " <p style=\"font-size:10px;\">(Note: All task-related numbers can be adjusted in the system configuration interface.)</p>";
45 44
46 String TABLE = "<table style=\"width: 100%;table-layout: fixed;padding: 20px;width: 100%;border-collapse: collapse;\">\n" + 45 String TABLE = "<table style=\"width: 100%;table-layout: fixed;padding: 20px;width: 100%;border-collapse: collapse;\">\n" +
47 "<tr>\n" + 46 "<tr>\n" +
48 "<td style=\"border: 0px;text-align: left;padding: 8px;\">\n" + 47 "<td style=\"border: 0px;text-align: left;padding: 8px;\">\n" +
49 "<div style=\"margin: auto;padding: 20px;\">\n" + 48 "<div style=\"margin: auto;padding: 20px;\">\n" +
50 - "<h2 style=\"text-align: center;\">Task Push Failure Details</h2>\n" + 49 + "<h2 style=\"text-align: center;\">接口调用失败详情</h2>\n" +
51 "<table style=\"width: 100%;border-collapse: collapse;\">\n" + 50 "<table style=\"width: 100%;border-collapse: collapse;\">\n" +
52 "<tr>\n" + 51 "<tr>\n" +
53 - "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">Task Name</th>\n" + 52 + "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">任务名称</th>\n" +
54 - "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">Failed Tracking Number</th>\n" + 53 + "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">失败的运单号</th>\n" +
55 - "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">Total Number</th>\n" + 54 + "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">总数</th>\n" +
56 - "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">Failure Count</th>\n" + 55 + "<th style=\"border: 1px solid #dddddd;text-align: left;padding: 8px;background-color: #593BB7;color: white;\">失败数量</th>\n" +
57 "</tr>\n" + 56 "</tr>\n" +
58 "{0}\n" + 57 "{0}\n" +
59 "</table>\n" + 58 "</table>\n" +
......
1 package com.fedex.connect.common.dependencies.util; 1 package com.fedex.connect.common.dependencies.util;
2 2
3 import com.fedex.connect.common.dependencies.annotation.BaseNotBlank; 3 import com.fedex.connect.common.dependencies.annotation.BaseNotBlank;
4 +import com.fedex.connect.common.dependencies.exception.OpErrorException;
4 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 5 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
5 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
...@@ -54,8 +55,10 @@ public class BaseValidateUtils { ...@@ -54,8 +55,10 @@ public class BaseValidateUtils {
54 if(errorList.size() > 0){ 55 if(errorList.size() > 0){
55 responseUtils.fail(codeEnum,errorList); 56 responseUtils.fail(codeEnum,errorList);
56 } 57 }
58 + }catch(OpErrorException ex){
59 + throw ex;
57 }catch(Exception ex){ 60 }catch(Exception ex){
58 - responseUtils.fail(codeEnum); 61 + responseUtils.fail(codeEnum,ex);
59 } 62 }
60 } 63 }
61 } 64 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -24,6 +24,7 @@ public class DateUtil { ...@@ -24,6 +24,7 @@ public class DateUtil {
24 public static final String PATTERN_DATE_TIME_ORACLE = "yyyy-MM-dd hh:mi:ss"; 24 public static final String PATTERN_DATE_TIME_ORACLE = "yyyy-MM-dd hh:mi:ss";
25 public static final String PATTERN_DATE_TIME_MS = "yyyy-mm-dd hh24:mi:ss"; 25 public static final String PATTERN_DATE_TIME_MS = "yyyy-mm-dd hh24:mi:ss";
26 public static final String PATTERN_yyyyMMddHHmmss = "yyyyMMddHHmmss"; 26 public static final String PATTERN_yyyyMMddHHmmss = "yyyyMMddHHmmss";
27 + public static final String YYYYMMDDHH24MMSSSSS = "yyyyMMddHHmmssSSS";
27 28
28 private static SimpleDateFormat dateFormat = new SimpleDateFormat(); 29 private static SimpleDateFormat dateFormat = new SimpleDateFormat();
29 30
...@@ -47,6 +48,19 @@ public class DateUtil { ...@@ -47,6 +48,19 @@ public class DateUtil {
47 dateFormat.applyPattern(PATTERN_DATE_TIME); 48 dateFormat.applyPattern(PATTERN_DATE_TIME);
48 return dateFormat.format(date); 49 return dateFormat.format(date);
49 } 50 }
51 +
52 + /**
53 + * 用默认格式格式化日期
54 + *
55 + * @param date
56 + * @return
57 + */
58 + public static String yyyyMMddHH24mmssSSS(Date date) {
59 + SimpleDateFormat dateFormat = new SimpleDateFormat();
60 + dateFormat.applyPattern(YYYYMMDDHH24MMSSSSS);
61 + return dateFormat.format(date);
62 + }
63 +
50 /** 64 /**
51 * 用指定格式格式化日期 65 * 用指定格式格式化日期
52 * 66 *
......
...@@ -85,7 +85,7 @@ public class JsonToJava { ...@@ -85,7 +85,7 @@ public class JsonToJava {
85 */ 85 */
86 public static boolean createJsonFile(String jsonString, String filePath, String fileName) { 86 public static boolean createJsonFile(String jsonString, String filePath, String fileName) {
87 boolean flag = true; 87 boolean flag = true;
88 - String fullPath = filePath + File.separator + fileName + ".json"; 88 + String fullPath = filePath + File.separator + fileName;
89 89
90 // 生成json格式文件 90 // 生成json格式文件
91 try { 91 try {
......
...@@ -3,7 +3,7 @@ package com.fedex.connect.common.dependencies.util; ...@@ -3,7 +3,7 @@ package com.fedex.connect.common.dependencies.util;
3 import com.fedex.connect.common.dependencies.authentication.SecurityConstants; 3 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
4 import com.fedex.connect.common.dependencies.contants.RedisConstants; 4 import com.fedex.connect.common.dependencies.contants.RedisConstants;
5 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails; 5 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
6 -import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository; 6 +import com.fedex.connect.common.dependencies.repository.repo.sys.IUserBaseRepository;
7 import com.fedex.connect.common.model.sys.User; 7 import com.fedex.connect.common.model.sys.User;
8 import io.jsonwebtoken.Claims; 8 import io.jsonwebtoken.Claims;
9 import io.jsonwebtoken.Jwts; 9 import io.jsonwebtoken.Jwts;
...@@ -26,7 +26,7 @@ import java.util.stream.Collectors; ...@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
26 */ 26 */
27 public class JwtTokenUtils { 27 public class JwtTokenUtils {
28 28
29 - private static final IUserRepository userRepository = SpringBeanUtil.getBean(IUserRepository.class); 29 + private static final IUserBaseRepository userRepository = SpringBeanUtil.getBean(IUserBaseRepository.class);
30 30
31 /** 31 /**
32 * 生成足够的安全随机密钥，以适合符合规范的签名 32 * 生成足够的安全随机密钥，以适合符合规范的签名
......
...@@ -262,4 +262,43 @@ public class NIOFileUtils { ...@@ -262,4 +262,43 @@ public class NIOFileUtils {
262 } 262 }
263 return false; 263 return false;
264 } 264 }
265 +
266 + /**
267 + * @Author mt
268 + * @Description 移动文件
269 + * @Date 2024/5/30
270 + * @param sourcePath
271 + * @param targetPath
272 + * @return void
273 + */
274 + public void moveFile(String sourcePath,String targetPath) throws Exception{
275 + //覆盖方式移动
276 + Files.move(Paths.get(sourcePath),Paths.get(targetPath),StandardCopyOption.REPLACE_EXISTING);
277 + }
278 +
279 + /**
280 + * @Author mt
281 + * @Description 判断文件是否存在
282 + * @Date 2024/9/10
283 + * @param filePath
284 + * @return boolean
285 + */
286 + public boolean fileExists(String filePath){
287 + return new File(filePath).exists();
288 + }
289 +
290 + /**
291 + * @Author mt
292 + * @Description 如果文件夹不存在则创建文件夹
293 + * @Date 2024/5/29
294 + * @param targetFolder
295 + * @return void
296 + */
297 + public void mkdirs(String targetFolder){
298 + File folder = new File(targetFolder);
299 + // 文件夹不存在，则创建文件夹
300 + if (!folder.exists()) {
301 + folder.mkdirs();
302 + }
303 + }
265 } 304 }
......
...@@ -82,12 +82,17 @@ public class ResponseUtils { ...@@ -82,12 +82,17 @@ public class ResponseUtils {
82 82
83 public <T> ResponseVo success(Object codeEnum,T data) { 83 public <T> ResponseVo success(Object codeEnum,T data) {
84 ResponseCodeBo responseCodeBo = this.ref(codeEnum); 84 ResponseCodeBo responseCodeBo = this.ref(codeEnum);
85 - return new ResponseVo<>(responseCodeBo.getCode(),responseCodeBo.getErrMsg(),data); 85 + return new ResponseVo<>(200,responseCodeBo.getErrMsg(),data);
86 } 86 }
87 87
88 public <T> ResponseVo success(T data) { 88 public <T> ResponseVo success(T data) {
89 + if (data instanceof Enum) {
90 + ResponseCodeBo responseCodeBo = this.ref(data);
91 + return new ResponseVo<>(200, responseCodeBo.getErrMsg(), null);
92 + } else {
89 return new ResponseVo<>(data); 93 return new ResponseVo<>(data);
90 } 94 }
95 + }
91 96
92 public String msg(String msg){ 97 public String msg(String msg){
93 String message = localeMessageUtil.getMessage(msg); 98 String message = localeMessageUtil.getMessage(msg);
......