# 更新

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseQueue.java

@@ -62,6 +62,15 @@ public class DcBaseQueue {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_queue.queue_type
+     *
+     * @mbg.generated
+     */
+    private Integer queueType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_queue.error_stack_trace
      *
      * @mbg.generated
@@ -86,6 +95,7 @@ public class DcBaseQueue {
         sb.append(", submitDate=").append(submitDate);
         sb.append(", consumeDate=").append(consumeDate);
         sb.append(", errorMessage=").append(errorMessage);
+        sb.append(", queueType=").append(queueType);
         sb.append(", errorStackTrace=").append(errorStackTrace);
         sb.append("]");
         return sb.toString();
@@ -115,6 +125,7 @@ public class DcBaseQueue {
             && (this.getSubmitDate() == null ? other.getSubmitDate() == null : this.getSubmitDate().equals(other.getSubmitDate()))
             && (this.getConsumeDate() == null ? other.getConsumeDate() == null : this.getConsumeDate().equals(other.getConsumeDate()))
             && (this.getErrorMessage() == null ? other.getErrorMessage() == null : this.getErrorMessage().equals(other.getErrorMessage()))
+            && (this.getQueueType() == null ? other.getQueueType() == null : this.getQueueType().equals(other.getQueueType()))
             && (this.getErrorStackTrace() == null ? other.getErrorStackTrace() == null : this.getErrorStackTrace().equals(other.getErrorStackTrace()));
     }
 
@@ -134,6 +145,7 @@ public class DcBaseQueue {
         result = prime * result + ((getSubmitDate() == null) ? 0 : getSubmitDate().hashCode());
         result = prime * result + ((getConsumeDate() == null) ? 0 : getConsumeDate().hashCode());
         result = prime * result + ((getErrorMessage() == null) ? 0 : getErrorMessage().hashCode());
+        result = prime * result + ((getQueueType() == null) ? 0 : getQueueType().hashCode());
         result = prime * result + ((getErrorStackTrace() == null) ? 0 : getErrorStackTrace().hashCode());
         return result;
     }

data-common/src/main/java/com/bailuntec/domain/example/DcBaseQueueExample.java

@@ -759,6 +759,66 @@ public class DcBaseQueueExample {
             addCriterion("error_message not between", value1, value2, "errorMessage");
             return (Criteria) this;
         }
+
+        public Criteria andQueueTypeIsNull() {
+            addCriterion("queue_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeIsNotNull() {
+            addCriterion("queue_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeEqualTo(Integer value) {
+            addCriterion("queue_type =", value, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeNotEqualTo(Integer value) {
+            addCriterion("queue_type <>", value, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeGreaterThan(Integer value) {
+            addCriterion("queue_type >", value, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("queue_type >=", value, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeLessThan(Integer value) {
+            addCriterion("queue_type <", value, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("queue_type <=", value, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeIn(List<Integer> values) {
+            addCriterion("queue_type in", values, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeNotIn(List<Integer> values) {
+            addCriterion("queue_type not in", values, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeBetween(Integer value1, Integer value2) {
+            addCriterion("queue_type between", value1, value2, "queueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueueTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("queue_type not between", value1, value2, "queueType");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/mapper/DcBaseQueueMapper.xml

@@ -12,6 +12,7 @@
     <result column="submit_date" jdbcType="TIMESTAMP" property="submitDate" />
     <result column="consume_date" jdbcType="TIMESTAMP" property="consumeDate" />
     <result column="error_message" jdbcType="VARCHAR" property="errorMessage" />
+    <result column="queue_type" jdbcType="INTEGER" property="queueType" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.bailuntec.domain.entity.DcBaseQueue">
     <!--
@@ -91,7 +92,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, type, message, submit_date, consume_date, error_message
+    id, type, message, submit_date, consume_date, error_message, queue_type
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -191,10 +192,10 @@
     -->
     insert into dc_base_queue (id, type, message, 
       submit_date, consume_date, error_message, 
-      error_stack_trace)
+      queue_type, error_stack_trace)
     values (#{id,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{message,jdbcType=VARCHAR}, 
       #{submitDate,jdbcType=TIMESTAMP}, #{consumeDate,jdbcType=TIMESTAMP}, #{errorMessage,jdbcType=VARCHAR}, 
-      #{errorStackTrace,jdbcType=LONGVARCHAR})
+      #{queueType,jdbcType=INTEGER}, #{errorStackTrace,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseQueue">
     <!--
@@ -221,6 +222,9 @@
       <if test="errorMessage != null">
         error_message,
       </if>
+      <if test="queueType != null">
+        queue_type,
+      </if>
       <if test="errorStackTrace != null">
         error_stack_trace,
       </if>
@@ -244,6 +248,9 @@
       <if test="errorMessage != null">
         #{errorMessage,jdbcType=VARCHAR},
       </if>
+      <if test="queueType != null">
+        #{queueType,jdbcType=INTEGER},
+      </if>
       <if test="errorStackTrace != null">
         #{errorStackTrace,jdbcType=LONGVARCHAR},
       </if>
@@ -284,6 +291,9 @@
       <if test="record.errorMessage != null">
         error_message = #{record.errorMessage,jdbcType=VARCHAR},
       </if>
+      <if test="record.queueType != null">
+        queue_type = #{record.queueType,jdbcType=INTEGER},
+      </if>
       <if test="record.errorStackTrace != null">
         error_stack_trace = #{record.errorStackTrace,jdbcType=LONGVARCHAR},
       </if>
@@ -304,6 +314,7 @@
       submit_date = #{record.submitDate,jdbcType=TIMESTAMP},
       consume_date = #{record.consumeDate,jdbcType=TIMESTAMP},
       error_message = #{record.errorMessage,jdbcType=VARCHAR},
+      queue_type = #{record.queueType,jdbcType=INTEGER},
       error_stack_trace = #{record.errorStackTrace,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -320,7 +331,8 @@
       message = #{record.message,jdbcType=VARCHAR},
       submit_date = #{record.submitDate,jdbcType=TIMESTAMP},
       consume_date = #{record.consumeDate,jdbcType=TIMESTAMP},
-      error_message = #{record.errorMessage,jdbcType=VARCHAR}
+      error_message = #{record.errorMessage,jdbcType=VARCHAR},
+      queue_type = #{record.queueType,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -347,6 +359,9 @@
       <if test="errorMessage != null">
         error_message = #{errorMessage,jdbcType=VARCHAR},
       </if>
+      <if test="queueType != null">
+        queue_type = #{queueType,jdbcType=INTEGER},
+      </if>
       <if test="errorStackTrace != null">
         error_stack_trace = #{errorStackTrace,jdbcType=LONGVARCHAR},
       </if>
@@ -364,6 +379,7 @@
       submit_date = #{submitDate,jdbcType=TIMESTAMP},
       consume_date = #{consumeDate,jdbcType=TIMESTAMP},
       error_message = #{errorMessage,jdbcType=VARCHAR},
+      queue_type = #{queueType,jdbcType=INTEGER},
       error_stack_trace = #{errorStackTrace,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -377,7 +393,8 @@
       message = #{message,jdbcType=VARCHAR},
       submit_date = #{submitDate,jdbcType=TIMESTAMP},
       consume_date = #{consumeDate,jdbcType=TIMESTAMP},
-      error_message = #{errorMessage,jdbcType=VARCHAR}
+      error_message = #{errorMessage,jdbcType=VARCHAR},
+      queue_type = #{queueType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseQueue">
@@ -406,6 +423,9 @@
       <if test="errorMessage != null">
         error_message,
       </if>
+      <if test="queueType != null">
+        queue_type,
+      </if>
       <if test="errorStackTrace != null">
         error_stack_trace,
       </if>
@@ -430,6 +450,9 @@
       <if test="errorMessage != null">
         #{errorMessage,jdbcType=VARCHAR},
       </if>
+      <if test="queueType != null">
+        #{queueType,jdbcType=INTEGER},
+      </if>
       <if test="errorStackTrace != null">
         #{errorStackTrace,jdbcType=LONGVARCHAR},
       </if>
@@ -454,6 +477,9 @@
       <if test="errorMessage != null">
         error_message = #{errorMessage,jdbcType=VARCHAR},
       </if>
+      <if test="queueType != null">
+        queue_type = #{queueType,jdbcType=INTEGER},
+      </if>
       <if test="errorStackTrace != null">
         error_stack_trace = #{errorStackTrace,jdbcType=LONGVARCHAR},
       </if>
@@ -466,17 +492,19 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     insert into dc_base_queue
-    (id, type, message, submit_date, consume_date, error_message)
+    (id, type, message, submit_date, consume_date, error_message, queue_type)
     values
     (#{id,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{message,jdbcType=VARCHAR}, #{submitDate,jdbcType=TIMESTAMP}, 
-      #{consumeDate,jdbcType=TIMESTAMP}, #{errorMessage,jdbcType=VARCHAR})
+      #{consumeDate,jdbcType=TIMESTAMP}, #{errorMessage,jdbcType=VARCHAR}, #{queueType,jdbcType=INTEGER}
+      )
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     type = #{type,jdbcType=VARCHAR}, 
     message = #{message,jdbcType=VARCHAR}, 
     submit_date = #{submitDate,jdbcType=TIMESTAMP}, 
     consume_date = #{consumeDate,jdbcType=TIMESTAMP}, 
-    error_message = #{errorMessage,jdbcType=VARCHAR}
+    error_message = #{errorMessage,jdbcType=VARCHAR}, 
+    queue_type = #{queueType,jdbcType=INTEGER}
   </insert>
   <insert id="upsertWithBLOBs" parameterType="com.bailuntec.domain.entity.DcBaseQueue">
     <!--
@@ -485,11 +513,12 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     insert into dc_base_queue
-    (id, type, message, submit_date, consume_date, error_message, error_stack_trace)
+    (id, type, message, submit_date, consume_date, error_message, queue_type, error_stack_trace
+      )
     values
     (#{id,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{message,jdbcType=VARCHAR}, #{submitDate,jdbcType=TIMESTAMP}, 
-      #{consumeDate,jdbcType=TIMESTAMP}, #{errorMessage,jdbcType=VARCHAR}, #{errorStackTrace,jdbcType=LONGVARCHAR}
-      )
+      #{consumeDate,jdbcType=TIMESTAMP}, #{errorMessage,jdbcType=VARCHAR}, #{queueType,jdbcType=INTEGER}, 
+      #{errorStackTrace,jdbcType=LONGVARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     type = #{type,jdbcType=VARCHAR}, 
@@ -497,6 +526,7 @@
     submit_date = #{submitDate,jdbcType=TIMESTAMP}, 
     consume_date = #{consumeDate,jdbcType=TIMESTAMP}, 
     error_message = #{errorMessage,jdbcType=VARCHAR}, 
+    queue_type = #{queueType,jdbcType=INTEGER}, 
     error_stack_trace = #{errorStackTrace,jdbcType=LONGVARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseQueueExample" resultMap="BaseResultMap">

data-common/src/main/resources/init.properties

-table-name=dc_base_purchase_details
+table-name=dc_base_queue

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/QueueConsumerJob.java

@@ -66,6 +66,7 @@ public class QueueConsumerJob implements SimpleJob {
                         dcBaseQueueMapper.deleteByPrimaryKey(dcBaseQueue.getId());
                     } catch (Exception e) {
                         try {
+                            dcBaseQueue.setQueueType(2);
                             dcBaseQueue.setErrorMessage(e.getMessage());
                             dcBaseQueue.setErrorStackTrace(e.getStackTrace().toString());
                             dcBaseQueueMapper.updateByPrimaryKey(dcBaseQueue);