common-dao、common-dependencies | 修改 | 国际化文件配置调整

mt 2024年11月11日19:13:36

common-dao、common-dependencies | 修改 | 国际化文件配置调整
mt 2024年11月11日19:13:36
tao.mo
Commit 01275652fdbf89f06a2b034685b16c3ecf1fb876 01275652 1 parent f7bfb99c
Showing 12 changed files with 759 additions and 86 deletions
server/common-dao/src/main/java/com/fedex/connect/common/mapper/biz/CeInfoMapper.xml
server/common-dao/src/main/java/com/fedex/connect/common/mapper/biz/ConsignmentMapper.xml
server/common-dao/src/main/java/com/fedex/connect/common/mapper/log/OperationMapper.xml
server/common-dao/src/main/java/com/fedex/connect/common/model/biz/CeInfo.java
server/common-dao/src/main/java/com/fedex/connect/common/model/biz/CeInfoExample.java
server/common-dao/src/main/java/com/fedex/connect/common/model/biz/Consignment.java
server/common-dao/src/main/java/com/fedex/connect/common/model/biz/ConsignmentExample.java
server/common-dao/src/main/java/com/fedex/connect/common/model/log/Operation.java
server/common-dao/src/main/java/com/fedex/connect/common/model/log/OperationExample.java
server/common-dao/src/main/resources/generatorConfig.xml
server/common-dependencies/src/main/java/com/fedex/connect/common/dependencies/aspect/OperationLogAspect.java
server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/util/Dm501Util.java
--- a/server/common-dao/src/main/java/com/fedex/connect/common/mapper/biz/CeInfoMapper.xml
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/mapper/biz/CeInfoMapper.xml
View file @0127565
@@ -39,6 +39,8 @@
     <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
     <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
     <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
+    <result column="SHIPPER_REFERENCE" jdbcType="VARCHAR" property="shipperReference" />
+    <result column="PIECES" jdbcType="NUMERIC" property="pieces" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -106,7 +108,7 @@
     SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 
     RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, 
     RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG, USER_UUID, SHIPPER_EMAIL, SHIPPER_COUNTRY, 
-    RECIPIENT_COUNTRY
+    RECIPIENT_COUNTRY, SHIPPER_REFERENCE, PIECES
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -157,7 +159,8 @@
       RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, 
       RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, 
       DOC_NONDOC_FLAG, USER_UUID, SHIPPER_EMAIL, 
-      SHIPPER_COUNTRY, RECIPIENT_COUNTRY)
+      SHIPPER_COUNTRY, RECIPIENT_COUNTRY, SHIPPER_REFERENCE, 
+      PIECES)
     values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}, 
       #{shipDate,jdbcType=TIMESTAMP}, #{destIataCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
@@ -170,7 +173,8 @@
       #{recipientAddrLine1,jdbcType=VARCHAR}, #{recipientAddrLine2,jdbcType=VARCHAR}, 
       #{recipientAddrLine3,jdbcType=VARCHAR}, #{recipientCity,jdbcType=VARCHAR}, #{recipientPostalCode,jdbcType=VARCHAR}, 
       #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{shipperEmail,jdbcType=VARCHAR}, 
-      #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR})
+      #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{shipperReference,jdbcType=VARCHAR}, 
+      #{pieces,jdbcType=NUMERIC})
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.CeInfo">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -287,6 +291,12 @@
       <if test="recipientCountry != null">
         RECIPIENT_COUNTRY,
       </if>
+      <if test="shipperReference != null">
+        SHIPPER_REFERENCE,
+      </if>
+      <if test="pieces != null">
+        PIECES,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       #{id,jdbcType=NUMERIC},
@@ -398,6 +408,12 @@
       <if test="recipientCountry != null">
         #{recipientCountry,jdbcType=VARCHAR},
       </if>
+      <if test="shipperReference != null">
+        #{shipperReference,jdbcType=VARCHAR},
+      </if>
+      <if test="pieces != null">
+        #{pieces,jdbcType=NUMERIC},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long">
@@ -520,6 +536,12 @@
       <if test="record.recipientCountry != null">
         RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
       </if>
+      <if test="record.shipperReference != null">
+        SHIPPER_REFERENCE = #{record.shipperReference,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pieces != null">
+        PIECES = #{record.pieces,jdbcType=NUMERIC},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -563,7 +585,9 @@
       USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
       SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
       SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
-      RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR}
+      RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
+      SHIPPER_REFERENCE = #{record.shipperReference,jdbcType=VARCHAR},
+      PIECES = #{record.pieces,jdbcType=NUMERIC}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -679,6 +703,12 @@
       <if test="recipientCountry != null">
         RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
       </if>
+      <if test="shipperReference != null">
+        SHIPPER_REFERENCE = #{shipperReference,jdbcType=VARCHAR},
+      </if>
+      <if test="pieces != null">
+        PIECES = #{pieces,jdbcType=NUMERIC},
+      </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
@@ -719,7 +749,9 @@
       USER_UUID = #{userUuid,jdbcType=VARCHAR},
       SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
       SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
-      RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR}
+      RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
+      SHIPPER_REFERENCE = #{shipperReference,jdbcType=VARCHAR},
+      PIECES = #{pieces,jdbcType=NUMERIC}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">
--- a/server/common-dao/src/main/java/com/fedex/connect/common/mapper/biz/ConsignmentMapper.xml
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/mapper/biz/ConsignmentMapper.xml
View file @0127565
@@ -52,6 +52,8 @@
     <result column="ORIGIN_COUNTRY_CODE" jdbcType="VARCHAR" property="originCountryCode" />
     <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
     <result column="DESTINATION_COUNTRY_CODE" jdbcType="VARCHAR" property="destinationCountryCode" />
+    <result column="SHIPPER_REFERENCE" jdbcType="VARCHAR" property="shipperReference" />
+    <result column="PIECES" jdbcType="NUMERIC" property="pieces" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -121,7 +123,8 @@
     SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
     MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG, 
     USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, USER_INPUT_ORIGIN_COUNTRY, 
-    ORIGIN_COUNTRY_CODE, SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE
+    ORIGIN_COUNTRY_CODE, SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE, SHIPPER_REFERENCE, 
+    PIECES
   </sql>
   <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
     <include refid="OracleDialectPrefix" />
@@ -177,7 +180,8 @@
       STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG, 
       USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, 
       USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_CODE, 
-      SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE)
+      SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE, SHIPPER_REFERENCE, 
+      PIECES)
     values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 
       #{destIataCode,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, 
       #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, 
@@ -195,7 +199,8 @@
       #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, #{docNondocFlag,jdbcType=VARCHAR}, 
       #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR}, #{userInputOriginCountryCode,jdbcType=VARCHAR}, 
       #{userInputOriginCountry,jdbcType=VARCHAR}, #{originCountryCode,jdbcType=VARCHAR}, 
-      #{shipperEmail,jdbcType=VARCHAR}, #{destinationCountryCode,jdbcType=VARCHAR})
+      #{shipperEmail,jdbcType=VARCHAR}, #{destinationCountryCode,jdbcType=VARCHAR}, #{shipperReference,jdbcType=VARCHAR}, 
+      #{pieces,jdbcType=NUMERIC})
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -351,6 +356,12 @@
       <if test="destinationCountryCode != null">
         DESTINATION_COUNTRY_CODE,
       </if>
+      <if test="shipperReference != null">
+        SHIPPER_REFERENCE,
+      </if>
+      <if test="pieces != null">
+        PIECES,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       #{id,jdbcType=NUMERIC},
@@ -501,6 +512,12 @@
       <if test="destinationCountryCode != null">
         #{destinationCountryCode,jdbcType=VARCHAR},
       </if>
+      <if test="shipperReference != null">
+        #{shipperReference,jdbcType=VARCHAR},
+      </if>
+      <if test="pieces != null">
+        #{pieces,jdbcType=NUMERIC},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultType="java.lang.Long">
@@ -662,6 +679,12 @@
       <if test="record.destinationCountryCode != null">
         DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.shipperReference != null">
+        SHIPPER_REFERENCE = #{record.shipperReference,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pieces != null">
+        PIECES = #{record.pieces,jdbcType=NUMERIC},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -718,7 +741,9 @@
       USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
       ORIGIN_COUNTRY_CODE = #{record.originCountryCode,jdbcType=VARCHAR},
       SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
-      DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR}
+      DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR},
+      SHIPPER_REFERENCE = #{record.shipperReference,jdbcType=VARCHAR},
+      PIECES = #{record.pieces,jdbcType=NUMERIC}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -873,6 +898,12 @@
       <if test="destinationCountryCode != null">
         DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR},
       </if>
+      <if test="shipperReference != null">
+        SHIPPER_REFERENCE = #{shipperReference,jdbcType=VARCHAR},
+      </if>
+      <if test="pieces != null">
+        PIECES = #{pieces,jdbcType=NUMERIC},
+      </if>
     </set>
     where ID = #{id,jdbcType=NUMERIC}
   </update>
@@ -926,7 +957,9 @@
       USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
       ORIGIN_COUNTRY_CODE = #{originCountryCode,jdbcType=VARCHAR},
       SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
-      DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR}
+      DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR},
+      SHIPPER_REFERENCE = #{shipperReference,jdbcType=VARCHAR},
+      PIECES = #{pieces,jdbcType=NUMERIC}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">
--- a/server/common-dao/src/main/java/com/fedex/connect/common/mapper/log/OperationMapper.xml
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/mapper/log/OperationMapper.xml
View file @0127565
@@ -18,6 +18,9 @@
     <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
     <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
+    <result column="REQUEST_TIME" jdbcType="TIMESTAMP" property="requestTime" />
+    <result column="RESPONSE_TIME" jdbcType="TIMESTAMP" property="responseTime" />
+    <result column="EXCEUTE_CONSUME" jdbcType="NUMERIC" property="exceuteConsume" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.fedex.connect.common.model.log.Operation">
     <result column="REMARK" jdbcType="CLOB" property="remark" />
@@ -83,7 +86,7 @@
   <sql id="Base_Column_List">
     ID, USER_ID, LOGIN_NAME, USER_NAME, MODULE, DESCRIBE, URL, REQUEST_PARAMETERS, RESULT, 
     STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
-    MODIFY_USER_NAME
+    MODIFY_USER_NAME, REQUEST_TIME, RESPONSE_TIME, EXCEUTE_CONSUME
   </sql>
   <sql id="Blob_Column_List">
     REMARK
@@ -149,13 +152,15 @@
       URL, REQUEST_PARAMETERS, RESULT, 
       STATUS, CREATE_TIME, CREATE_USER_ID, 
       CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 
-      MODIFY_USER_NAME, REMARK)
+      MODIFY_USER_NAME, REQUEST_TIME, RESPONSE_TIME, 
+      EXCEUTE_CONSUME, REMARK)
     values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, 
       #{userName,jdbcType=VARCHAR}, #{module,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR}, 
       #{url,jdbcType=VARCHAR}, #{requestParameters,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, 
       #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 
       #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 
-      #{modifyUserName,jdbcType=VARCHAR}, #{remark,jdbcType=CLOB})
+      #{modifyUserName,jdbcType=VARCHAR}, #{requestTime,jdbcType=TIMESTAMP}, #{responseTime,jdbcType=TIMESTAMP}, 
+      #{exceuteConsume,jdbcType=NUMERIC}, #{remark,jdbcType=CLOB})
   </insert>
   <insert id="insertSelective" parameterType="com.fedex.connect.common.model.log.Operation">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
@@ -209,6 +214,15 @@
       <if test="modifyUserName != null">
         MODIFY_USER_NAME,
       </if>
+      <if test="requestTime != null">
+        REQUEST_TIME,
+      </if>
+      <if test="responseTime != null">
+        RESPONSE_TIME,
+      </if>
+      <if test="exceuteConsume != null">
+        EXCEUTE_CONSUME,
+      </if>
       <if test="remark != null">
         REMARK,
       </if>
@@ -260,6 +274,15 @@
       <if test="modifyUserName != null">
         #{modifyUserName,jdbcType=VARCHAR},
       </if>
+      <if test="requestTime != null">
+        #{requestTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="responseTime != null">
+        #{responseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="exceuteConsume != null">
+        #{exceuteConsume,jdbcType=NUMERIC},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=CLOB},
       </if>
@@ -322,6 +345,15 @@
       <if test="record.modifyUserName != null">
         MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
       </if>
+      <if test="record.requestTime != null">
+        REQUEST_TIME = #{record.requestTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.responseTime != null">
+        RESPONSE_TIME = #{record.responseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.exceuteConsume != null">
+        EXCEUTE_CONSUME = #{record.exceuteConsume,jdbcType=NUMERIC},
+      </if>
       <if test="record.remark != null">
         REMARK = #{record.remark,jdbcType=CLOB},
       </if>
@@ -348,6 +380,9 @@
       MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
+      REQUEST_TIME = #{record.requestTime,jdbcType=TIMESTAMP},
+      RESPONSE_TIME = #{record.responseTime,jdbcType=TIMESTAMP},
+      EXCEUTE_CONSUME = #{record.exceuteConsume,jdbcType=NUMERIC},
       REMARK = #{record.remark,jdbcType=CLOB}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -370,7 +405,10 @@
       CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
       MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
-      MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}
+      MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
+      REQUEST_TIME = #{record.requestTime,jdbcType=TIMESTAMP},
+      RESPONSE_TIME = #{record.responseTime,jdbcType=TIMESTAMP},
+      EXCEUTE_CONSUME = #{record.exceuteConsume,jdbcType=NUMERIC}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -423,6 +461,15 @@
       <if test="modifyUserName != null">
         MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
       </if>
+      <if test="requestTime != null">
+        REQUEST_TIME = #{requestTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="responseTime != null">
+        RESPONSE_TIME = #{responseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="exceuteConsume != null">
+        EXCEUTE_CONSUME = #{exceuteConsume,jdbcType=NUMERIC},
+      </if>
       <if test="remark != null">
         REMARK = #{remark,jdbcType=CLOB},
       </if>
@@ -446,6 +493,9 @@
       MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
       MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
+      REQUEST_TIME = #{requestTime,jdbcType=TIMESTAMP},
+      RESPONSE_TIME = #{responseTime,jdbcType=TIMESTAMP},
+      EXCEUTE_CONSUME = #{exceuteConsume,jdbcType=NUMERIC},
       REMARK = #{remark,jdbcType=CLOB}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
@@ -465,7 +515,10 @@
       CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
       MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
       MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
-      MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}
+      MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
+      REQUEST_TIME = #{requestTime,jdbcType=TIMESTAMP},
+      RESPONSE_TIME = #{responseTime,jdbcType=TIMESTAMP},
+      EXCEUTE_CONSUME = #{exceuteConsume,jdbcType=NUMERIC}
     where ID = #{id,jdbcType=NUMERIC}
   </update>
   <sql id="OracleDialectPrefix">
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/CeInfo.java
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/CeInfo.java
View file @0127565
@@ -194,6 +194,16 @@ public class CeInfo implements Serializable {
      */
     private String recipientCountry;
+    /**
+     * 参考信息
+     */
+    private String shipperReference;
+
+    /**
+     * 件数
+     */
+    private Long pieces;
+
     private static final long serialVersionUID = 1L;
     public Long getId() {
@@ -492,6 +502,22 @@ public class CeInfo implements Serializable {
         this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
     }
+    public String getShipperReference() {
+        return shipperReference;
+    }
+
+    public void setShipperReference(String shipperReference) {
+        this.shipperReference = shipperReference == null ? null : shipperReference.trim();
+    }
+
+    public Long getPieces() {
+        return pieces;
+    }
+
+    public void setPieces(Long pieces) {
+        this.pieces = pieces;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -535,6 +561,8 @@ public class CeInfo implements Serializable {
         sb.append(", shipperEmail=").append(shipperEmail);
         sb.append(", shipperCountry=").append(shipperCountry);
         sb.append(", recipientCountry=").append(recipientCountry);
+        sb.append(", shipperReference=").append(shipperReference);
+        sb.append(", pieces=").append(pieces);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/CeInfoExample.java
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/CeInfoExample.java
View file @0127565
@@ -2615,6 +2615,136 @@ public class CeInfoExample {
             addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
             return (Criteria) this;
         }
+
+        public Criteria andShipperReferenceIsNull() {
+            addCriterion("SHIPPER_REFERENCE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceIsNotNull() {
+            addCriterion("SHIPPER_REFERENCE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE =", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE <>", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceGreaterThan(String value) {
+            addCriterion("SHIPPER_REFERENCE >", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceGreaterThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE >=", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceLessThan(String value) {
+            addCriterion("SHIPPER_REFERENCE <", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceLessThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE <=", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceLike(String value) {
+            addCriterion("SHIPPER_REFERENCE like", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotLike(String value) {
+            addCriterion("SHIPPER_REFERENCE not like", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceIn(List<String> values) {
+            addCriterion("SHIPPER_REFERENCE in", values, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotIn(List<String> values) {
+            addCriterion("SHIPPER_REFERENCE not in", values, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceBetween(String value1, String value2) {
+            addCriterion("SHIPPER_REFERENCE between", value1, value2, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotBetween(String value1, String value2) {
+            addCriterion("SHIPPER_REFERENCE not between", value1, value2, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesIsNull() {
+            addCriterion("PIECES is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesIsNotNull() {
+            addCriterion("PIECES is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesEqualTo(Long value) {
+            addCriterion("PIECES =", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesNotEqualTo(Long value) {
+            addCriterion("PIECES <>", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesGreaterThan(Long value) {
+            addCriterion("PIECES >", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesGreaterThanOrEqualTo(Long value) {
+            addCriterion("PIECES >=", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesLessThan(Long value) {
+            addCriterion("PIECES <", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesLessThanOrEqualTo(Long value) {
+            addCriterion("PIECES <=", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesIn(List<Long> values) {
+            addCriterion("PIECES in", values, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesNotIn(List<Long> values) {
+            addCriterion("PIECES not in", values, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesBetween(Long value1, Long value2) {
+            addCriterion("PIECES between", value1, value2, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesNotBetween(Long value1, Long value2) {
+            addCriterion("PIECES not between", value1, value2, "pieces");
+            return (Criteria) this;
+        }
     }
     public static class Criteria extends GeneratedCriteria {
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/Consignment.java
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/Consignment.java
View file @0127565
@@ -262,6 +262,16 @@ public class Consignment implements Serializable {
      */
     private String destinationCountryCode;
+    /**
+     * 参考信息
+     */
+    private String shipperReference;
+
+    /**
+     * 件数
+     */
+    private Long pieces;
+
     private static final long serialVersionUID = 1L;
     public Long getId() {
@@ -664,6 +674,22 @@ public class Consignment implements Serializable {
         this.destinationCountryCode = destinationCountryCode == null ? null : destinationCountryCode.trim();
     }
+    public String getShipperReference() {
+        return shipperReference;
+    }
+
+    public void setShipperReference(String shipperReference) {
+        this.shipperReference = shipperReference == null ? null : shipperReference.trim();
+    }
+
+    public Long getPieces() {
+        return pieces;
+    }
+
+    public void setPieces(Long pieces) {
+        this.pieces = pieces;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -720,6 +746,8 @@ public class Consignment implements Serializable {
         sb.append(", originCountryCode=").append(originCountryCode);
         sb.append(", shipperEmail=").append(shipperEmail);
         sb.append(", destinationCountryCode=").append(destinationCountryCode);
+        sb.append(", shipperReference=").append(shipperReference);
+        sb.append(", pieces=").append(pieces);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/ConsignmentExample.java
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/biz/ConsignmentExample.java
View file @0127565
@@ -3485,6 +3485,136 @@ public class ConsignmentExample {
             addCriterion("DESTINATION_COUNTRY_CODE not between", value1, value2, "destinationCountryCode");
             return (Criteria) this;
         }
+
+        public Criteria andShipperReferenceIsNull() {
+            addCriterion("SHIPPER_REFERENCE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceIsNotNull() {
+            addCriterion("SHIPPER_REFERENCE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE =", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE <>", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceGreaterThan(String value) {
+            addCriterion("SHIPPER_REFERENCE >", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceGreaterThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE >=", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceLessThan(String value) {
+            addCriterion("SHIPPER_REFERENCE <", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceLessThanOrEqualTo(String value) {
+            addCriterion("SHIPPER_REFERENCE <=", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceLike(String value) {
+            addCriterion("SHIPPER_REFERENCE like", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotLike(String value) {
+            addCriterion("SHIPPER_REFERENCE not like", value, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceIn(List<String> values) {
+            addCriterion("SHIPPER_REFERENCE in", values, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotIn(List<String> values) {
+            addCriterion("SHIPPER_REFERENCE not in", values, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceBetween(String value1, String value2) {
+            addCriterion("SHIPPER_REFERENCE between", value1, value2, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipperReferenceNotBetween(String value1, String value2) {
+            addCriterion("SHIPPER_REFERENCE not between", value1, value2, "shipperReference");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesIsNull() {
+            addCriterion("PIECES is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesIsNotNull() {
+            addCriterion("PIECES is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesEqualTo(Long value) {
+            addCriterion("PIECES =", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesNotEqualTo(Long value) {
+            addCriterion("PIECES <>", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesGreaterThan(Long value) {
+            addCriterion("PIECES >", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesGreaterThanOrEqualTo(Long value) {
+            addCriterion("PIECES >=", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesLessThan(Long value) {
+            addCriterion("PIECES <", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesLessThanOrEqualTo(Long value) {
+            addCriterion("PIECES <=", value, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesIn(List<Long> values) {
+            addCriterion("PIECES in", values, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesNotIn(List<Long> values) {
+            addCriterion("PIECES not in", values, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesBetween(Long value1, Long value2) {
+            addCriterion("PIECES between", value1, value2, "pieces");
+            return (Criteria) this;
+        }
+
+        public Criteria andPiecesNotBetween(Long value1, Long value2) {
+            addCriterion("PIECES not between", value1, value2, "pieces");
+            return (Criteria) this;
+        }
     }
     public static class Criteria extends GeneratedCriteria {
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/log/Operation.java
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/log/Operation.java
View file @0127565
@@ -89,6 +89,21 @@ public class Operation implements Serializable {
     private String modifyUserName;
     /**
+     * 请求时间
+     */
+    private Date requestTime;
+
+    /**
+     * 相应时间
+     */
+    private Date responseTime;
+
+    /**
+     * 执行耗时(毫秒)
+     */
+    private Long exceuteConsume;
+
+    /**
      * 备注
      */
     private String remark;
@@ -223,6 +238,30 @@ public class Operation implements Serializable {
         this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
     }
+    public Date getRequestTime() {
+        return requestTime;
+    }
+
+    public void setRequestTime(Date requestTime) {
+        this.requestTime = requestTime;
+    }
+
+    public Date getResponseTime() {
+        return responseTime;
+    }
+
+    public void setResponseTime(Date responseTime) {
+        this.responseTime = responseTime;
+    }
+
+    public Long getExceuteConsume() {
+        return exceuteConsume;
+    }
+
+    public void setExceuteConsume(Long exceuteConsume) {
+        this.exceuteConsume = exceuteConsume;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -253,6 +292,9 @@ public class Operation implements Serializable {
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", modifyUserId=").append(modifyUserId);
         sb.append(", modifyUserName=").append(modifyUserName);
+        sb.append(", requestTime=").append(requestTime);
+        sb.append(", responseTime=").append(responseTime);
+        sb.append(", exceuteConsume=").append(exceuteConsume);
         sb.append(", remark=").append(remark);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
--- a/server/common-dao/src/main/java/com/fedex/connect/common/model/log/OperationExample.java
View file @0127565
+++ b/server/common-dao/src/main/java/com/fedex/connect/common/model/log/OperationExample.java
View file @0127565
@@ -1174,6 +1174,186 @@ public class OperationExample {
             addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
             return (Criteria) this;
         }
+
+        public Criteria andRequestTimeIsNull() {
+            addCriterion("REQUEST_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeIsNotNull() {
+            addCriterion("REQUEST_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeEqualTo(Date value) {
+            addCriterion("REQUEST_TIME =", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeNotEqualTo(Date value) {
+            addCriterion("REQUEST_TIME <>", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeGreaterThan(Date value) {
+            addCriterion("REQUEST_TIME >", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("REQUEST_TIME >=", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeLessThan(Date value) {
+            addCriterion("REQUEST_TIME <", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeLessThanOrEqualTo(Date value) {
+            addCriterion("REQUEST_TIME <=", value, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeIn(List<Date> values) {
+            addCriterion("REQUEST_TIME in", values, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeNotIn(List<Date> values) {
+            addCriterion("REQUEST_TIME not in", values, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeBetween(Date value1, Date value2) {
+            addCriterion("REQUEST_TIME between", value1, value2, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestTimeNotBetween(Date value1, Date value2) {
+            addCriterion("REQUEST_TIME not between", value1, value2, "requestTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeIsNull() {
+            addCriterion("RESPONSE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeIsNotNull() {
+            addCriterion("RESPONSE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeEqualTo(Date value) {
+            addCriterion("RESPONSE_TIME =", value, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeNotEqualTo(Date value) {
+            addCriterion("RESPONSE_TIME <>", value, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeGreaterThan(Date value) {
+            addCriterion("RESPONSE_TIME >", value, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("RESPONSE_TIME >=", value, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeLessThan(Date value) {
+            addCriterion("RESPONSE_TIME <", value, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeLessThanOrEqualTo(Date value) {
+            addCriterion("RESPONSE_TIME <=", value, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeIn(List<Date> values) {
+            addCriterion("RESPONSE_TIME in", values, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeNotIn(List<Date> values) {
+            addCriterion("RESPONSE_TIME not in", values, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeBetween(Date value1, Date value2) {
+            addCriterion("RESPONSE_TIME between", value1, value2, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponseTimeNotBetween(Date value1, Date value2) {
+            addCriterion("RESPONSE_TIME not between", value1, value2, "responseTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeIsNull() {
+            addCriterion("EXCEUTE_CONSUME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeIsNotNull() {
+            addCriterion("EXCEUTE_CONSUME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeEqualTo(Long value) {
+            addCriterion("EXCEUTE_CONSUME =", value, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeNotEqualTo(Long value) {
+            addCriterion("EXCEUTE_CONSUME <>", value, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeGreaterThan(Long value) {
+            addCriterion("EXCEUTE_CONSUME >", value, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeGreaterThanOrEqualTo(Long value) {
+            addCriterion("EXCEUTE_CONSUME >=", value, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeLessThan(Long value) {
+            addCriterion("EXCEUTE_CONSUME <", value, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeLessThanOrEqualTo(Long value) {
+            addCriterion("EXCEUTE_CONSUME <=", value, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeIn(List<Long> values) {
+            addCriterion("EXCEUTE_CONSUME in", values, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeNotIn(List<Long> values) {
+            addCriterion("EXCEUTE_CONSUME not in", values, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeBetween(Long value1, Long value2) {
+            addCriterion("EXCEUTE_CONSUME between", value1, value2, "exceuteConsume");
+            return (Criteria) this;
+        }
+
+        public Criteria andExceuteConsumeNotBetween(Long value1, Long value2) {
+            addCriterion("EXCEUTE_CONSUME not between", value1, value2, "exceuteConsume");
+            return (Criteria) this;
+        }
     }
     public static class Criteria extends GeneratedCriteria {
--- a/server/common-dao/src/main/resources/generatorConfig.xml
View file @0127565
+++ b/server/common-dao/src/main/resources/generatorConfig.xml
View file @0127565
@@ -40,7 +40,7 @@
             sys：系统 系统相关表，例如kafka表
             log: 日志 日志记录表，例如邮件发送日志表
         -->
-        <javaModelGenerator targetPackage="com.fedex.connect.common.model.sys" targetProject="src/main/java">
+        <javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java">
             <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
             <property name="enableSubPackages" value="false"/>
             <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
@@ -52,13 +52,13 @@
         </javaModelGenerator>
         <!-- 生成映射文件*.xml的位置-->
-        <sqlMapGenerator targetPackage="mapper.sys" targetProject="src/main/java/com/fedex/connect/common">
+        <sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common">
             <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
             <property name="enableSubPackages" value="false"/>
         </sqlMapGenerator>
         <!-- 生成DAO的包名和位置 -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.sys" targetProject="src/main/java">
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java">
             <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
             <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
@@ -111,18 +111,18 @@
 <!--               selectByExampleQueryId="true">-->
 <!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-<!--        <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
+        <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
+               enableCountByExample="true" enableUpdateByExample="true"
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
+               enableDeleteByExample="true" enableSelectByExample="true"
-<!--               selectByExampleQueryId="true">-->
+               selectByExampleQueryId="true">
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />
-<!--        </table>-->
+        </table>
-<!--        <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
+        <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
-<!--               enableCountByExample="true" enableUpdateByExample="true"-->
+               enableCountByExample="true" enableUpdateByExample="true"
-<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
+               enableDeleteByExample="true" enableSelectByExample="true"
-<!--               selectByExampleQueryId="true">-->
+               selectByExampleQueryId="true">
-<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />-->
+            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
-<!--        </table>-->
+        </table>
 <!--        <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
 <!--               enableCountByExample="true" enableUpdateByExample="true"-->
 <!--               enableDeleteByExample="true" enableSelectByExample="true"-->
@@ -151,60 +151,60 @@
 <!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BI_PORTCLEAR_EMAIL_MAPPING.NEXTVAL FROM DUAL" />-->
 <!--        </table>-->
-               <table tableName="T_SYS_REDIS_SLAB" domainObjectName="redisSlab"
+<!--               <table tableName="T_SYS_REDIS_SLAB" domainObjectName="redisSlab"-->
-                      enableCountByExample="true" enableUpdateByExample="true"
+<!--                      enableCountByExample="true" enableUpdateByExample="true"-->
-                      enableDeleteByExample="true" enableSelectByExample="true"
+<!--                      enableDeleteByExample="true" enableSelectByExample="true"-->
-                      selectByExampleQueryId="true">
+<!--                      selectByExampleQueryId="true">-->
-                   <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />
+<!--                   <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />-->
-               </table>
+<!--               </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"
+<!--        <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PRIVILEGE.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PRIVILEGE.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table tableName="T_SYS_ROLE" domainObjectName="Role"
+<!--        <table tableName="T_SYS_ROLE" domainObjectName="Role"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table tableName="T_SYS_ROLE_PRIVILEGE" domainObjectName="RolePrivilege"
+<!--        <table tableName="T_SYS_ROLE_PRIVILEGE" domainObjectName="RolePrivilege"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
-        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"
+<!--        <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
-               enableCountByExample="true" enableUpdateByExample="true"
+<!--               enableCountByExample="true" enableUpdateByExample="true"-->
-               enableDeleteByExample="true" enableSelectByExample="true"
+<!--               enableDeleteByExample="true" enableSelectByExample="true"-->
-               selectByExampleQueryId="true">
+<!--               selectByExampleQueryId="true">-->
-            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />
+<!--            <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />-->
-        </table>
+<!--        </table>-->
 <!--        <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"-->
--- a/server/common-dependencies/src/main/java/com/fedex/connect/common/dependencies/aspect/OperationLogAspect.java
View file @0127565
+++ b/server/common-dependencies/src/main/java/com/fedex/connect/common/dependencies/aspect/OperationLogAspect.java
View file @0127565
@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.BaseResponseCode;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.repository.repo.log.IOperationRepository;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
 import com.fedex.connect.common.dependencies.util.JsonUtils;
 import com.fedex.connect.common.model.log.Operation;
@@ -122,13 +123,15 @@ public class OperationLogAspect {
         User user = CurrentUserInfo.getUser();
         log.setUserId(user.getId());
         log.setUserName(user.getUserName());
-
+        //请求时间
+        Date requestTime = new Date();
         Object res = pjp.proceed();
+        //响应时间
+        Date responseTime = new Date();
         if (Objects.isNull(log.getUserId())){
             //没获取到用户信息，直接return
             return res;
         }
-        log.setCreateTime(new Date());
         //模块描述可以写在类的RequestMapping 的 name中，或者写在OperationMethodLog 的module中，OperationMethodLog的级别更高
         String module = Objects.isNull(pjp.getTarget().getClass().getAnnotation(RequestMapping.class)) ?
                 "" :
@@ -137,6 +140,11 @@ public class OperationLogAspect {
             module = operationMethodLog.module();
         }
         log.setModule(module);
+        log.setRequestTime(requestTime);
+        log.setResponseTime(responseTime);
+        //记录执行耗时
+        Long exceuteConsume = responseTime.getTime() - requestTime.getTime();
+        log.setExceuteConsume(exceuteConsume);
         //返回的结果可能不是Result类型,比如void响应流，不存
         if (res instanceof ResponseVo) {
@@ -156,6 +164,8 @@ public class OperationLogAspect {
             log.setResult(resultJson);
         }
+        //基础字段赋值
+        AssignmentFieldUtils.assignmentTableBaseField(log);
         // 日志插入数据库
         logger.info("插入日志：" + JsonUtils.objectToJson(log));
         operationRepository.insert(log);
--- a/server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/util/Dm501Util.java
View file @0127565
+++ b/server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/util/Dm501Util.java
View file @0127565
@@ -111,6 +111,13 @@ public class Dm501Util {
         ceInfo.setUserUuid(dm501Consignment.getUuid());
         //发件人邮箱
         ceInfo.setShipperEmail(dm501Consignment.getShipperEmail());
+        //参考信息
+        ceInfo.setShipperReference(dm501Consignment.getShipperReferenceNotes());
+        //件数
+        String quantity = dm501Consignment.getQuantity();
+        if(Objects.nonNull(quantity)){
+            ceInfo.setPieces(Long.valueOf(quantity));
+        }
         /**
          * 初始化表基础字段
          */