Merge branch 'developer' into 'master'

Developer

See merge request !4

gic-platform-udesk-api/src/main/java/com/gic/udesk/dto/TapdCustomFieldConfig.java

@@ -17,7 +17,7 @@ public class TapdCustomFieldConfig implements Serializable{
     /**
      * 自定义字段配置的ID
      */
-    private Integer id;
+    private Long id;
 
     /**
      * 所属项目ID
@@ -59,11 +59,11 @@ public class TapdCustomFieldConfig implements Serializable{
      */
     private String sort;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

gic-platform-udesk-service/src/main/java/com/gic/udesk/dao/mapper/TabUdeskCustomersMapper.java

@@ -10,13 +10,6 @@ import org.apache.ibatis.annotations.Param;
  * @date 2020/9/18 10:25 AM
 
  */
 public interface TabUdeskCustomersMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
 
     /**
      * 插入一条记录

gic-platform-udesk-service/src/main/java/com/gic/udesk/dao/mapper/TabUdeskEnterpriseMapper.java

@@ -13,13 +13,6 @@ import java.util.List;
  * @date 2020/9/18 10:28 AM

  */
 public interface TabUdeskEnterpriseMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
 
     /**
      * 插入一条记录

gic-platform-udesk-service/src/main/java/com/gic/udesk/dao/mapper/TabUdeskExceptionMapper.java

@@ -9,13 +9,6 @@ import com.gic.udesk.entity.TabUdeskException;
  * @date 2020/9/18 10:28 AM

  */
 public interface TabUdeskExceptionMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
 
     /**
      * 插入一条记录

gic-platform-udesk-service/src/main/java/com/gic/udesk/dao/mapper/TabUdeskMessageMapper.java

@@ -9,13 +9,7 @@ import com.gic.udesk.entity.TabUdeskMessage;
  * @date 2020/9/18 10:28 AM

  */
 public interface TabUdeskMessageMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
+
 
     /**
      * 插入一条记录

gic-platform-udesk-service/src/main/java/com/gic/udesk/dao/mapper/TabUdeskTapdRelMapper.java

@@ -12,13 +12,7 @@ import java.util.List;
  * @date 2020/9/18 10:12 AM

  */
 public interface TabUdeskTapdRelMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
+
 
     /**
      * 插入一条记录

gic-platform-udesk-service/src/main/java/com/gic/udesk/dao/mapper/TabUdeskTicketMapper.java

@@ -11,13 +11,7 @@ import java.util.List;
  * @date 2020/9/18 10:28 AM

  */
 public interface TabUdeskTicketMapper {
-    /**
-     * 根据主键删除
-     *
-     * @param id 主键
-     * @return 更新条目数
-     */
-    int deleteByPrimaryKey(Integer id);
+
 
     /**
      * 插入一条记录

gic-platform-udesk-service/src/main/java/com/gic/udesk/entity/TabUdeskMessage.java

@@ -43,7 +43,7 @@ public class TabUdeskMessage {
     /**
      * 状态（0：删除；1：未删除）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      * TPAD的bug_id
@@ -108,12 +108,13 @@ public class TabUdeskMessage {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabUdeskMessage setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public String getBugId() {

gic-platform-udesk-service/src/main/java/com/gic/udesk/entity/TabUdeskTapdRel.java

@@ -63,9 +63,9 @@ public class TabUdeskTapdRel {
     private Date updateTime;
 
     /**
-     * 状态（0：删除；1：正常）
+     * 状态（1：删除；0：正常）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getId() {
         return id;
@@ -147,12 +147,13 @@ public class TabUdeskTapdRel {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabUdeskTapdRel setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 
     public TabUdeskTapdRel() {
@@ -167,7 +168,7 @@ public class TabUdeskTapdRel {
         this.udeskName = udeskName;
         this.tapdId = tapdId;
         this.tapdName = tapdName;
-        this.status = UdeskConstant.UNDELETED;
+        this.deleteFlag = UdeskConstant.NORMAL_STATUS;
     }
 
     public TabUdeskTapdRel(String workspaceId,Integer relType,  String udeskIdKey, String udeskName, String tapdId,
@@ -178,6 +179,6 @@ public class TabUdeskTapdRel {
         this.udeskName = udeskName;
         this.tapdId = tapdId;
         this.tapdName = tapdName;
-        this.status = UdeskConstant.UNDELETED;
+        this.deleteFlag = UdeskConstant.NORMAL_STATUS;
     }
 }
\ No newline at end of file

gic-platform-udesk-service/src/main/java/com/gic/udesk/entity/TabUdeskTicket.java

@@ -131,9 +131,9 @@ public class TabUdeskTicket {
     private Date updateTime;
 
     /**
-     * 状态（0：删除；1：未删除）
+     * 状态（1：删除；0：未删除）
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     public Integer getId() {
         return id;
@@ -327,11 +327,12 @@ public class TabUdeskTicket {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public TabUdeskTicket setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
     }
 }
\ No newline at end of file

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/impl/UdeskMessageServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.udesk.service.impl;
 import com.gic.udesk.dao.mapper.TabUdeskMessageMapper;
 import com.gic.udesk.entity.TabUdeskMessage;
 import com.gic.udesk.service.UdeskMessageService;
+import com.gic.udesk.utils.UdeskConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +24,7 @@ public class UdeskMessageServiceImpl implements UdeskMessageService{
     public int save(TabUdeskMessage record) {
         record.setCreateTime(new Date());
         record.setUpdateTime(new Date());
-        record.setStatus(1);
+        record.setDeleteFlag(UdeskConstant.NORMAL_STATUS);
         tabUdeskMessageMapper.insertSelective(record);
         return record.getId();
     }

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/impl/UdeskTapdRelServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.udesk.service.impl;
 import com.gic.udesk.dao.mapper.TabUdeskTapdRelMapper;
 import com.gic.udesk.entity.TabUdeskTapdRel;
 import com.gic.udesk.service.UdeskTapdRelService;
+import com.gic.udesk.utils.UdeskConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +30,7 @@ public class UdeskTapdRelServiceImpl implements UdeskTapdRelService{
     public int save(TabUdeskTapdRel record) {
         record.setCreateTime(new Date());
         record.setUpdateTime(new Date());
-        record.setStatus(1);
+        record.setDeleteFlag(UdeskConstant.NORMAL_STATUS);
         return tabUdeskTapdRelMapper.insertSelective(record);
     }
 

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/impl/UdeskTicketServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.udesk.service.impl;
 import com.gic.udesk.dao.mapper.TabUdeskTicketMapper;
 import com.gic.udesk.entity.TabUdeskTicket;
 import com.gic.udesk.service.UdeskTicketService;
+import com.gic.udesk.utils.UdeskConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +25,7 @@ public class UdeskTicketServiceImpl implements UdeskTicketService{
     public int save(TabUdeskTicket record) {
         record.setCreateTime(new Date());
         record.setUpdateTime(new Date());
-        record.setStatus(1);
+        record.setDeleteFlag(UdeskConstant.NORMAL_STATUS);
         return tabUdeskTicketMapper.insertSelective(record);
     }
 

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/TapdMessageApiServiceImpl.java

@@ -126,7 +126,7 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
                 && ((dataBaseTicket.getSeverity() == null ? "" : dataBaseTicket.getSeverity())
                         .equals((severityCn == null ? "" : severityCn)))) {
             // 如果tapd最新的数据和数据库中的数据相同就不操作了,再完成消息处理
-            tabTapdMessage.setStatus(UdeskConstant.DELETED);
+            tabTapdMessage.setDeleteFlag(UdeskConstant.DELETE_STATUS);
             udeskMessageService.update(tabTapdMessage);
             return NOT_HANDLE;
         }
@@ -161,7 +161,7 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
         dataBaseTicket.setStatusTapd(latestBugFromTapd.getStatus());
         udeskTicketService.update(dataBaseTicket);
         //消息处理完成
-        tabTapdMessage.setStatus(UdeskConstant.DELETED);
+        tabTapdMessage.setDeleteFlag(UdeskConstant.DELETE_STATUS);
         udeskMessageService.update(tabTapdMessage);
         return msgId.toString();
     }
@@ -192,10 +192,10 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
             return msgId.toString();
         }
         //更新数据库中ticket状态 注: 放在udesk操作完成之后
-        dataBaseTicket.setStatus(UdeskConstant.DELETED);
+        dataBaseTicket.setDeleteFlag(UdeskConstant.DELETE_STATUS);
         udeskTicketService.update(dataBaseTicket);
         //消息处理完成
-        tabTapdMessage.setStatus(UdeskConstant.DELETED);
+        tabTapdMessage.setDeleteFlag(UdeskConstant.DELETE_STATUS);
         udeskMessageService.update(tabTapdMessage);
         return msgId.toString();
     }
@@ -253,7 +253,7 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
         tabTapdMessage.setEvent(bugEvent);
         //消息数据
         tabTapdMessage.setMsgBody(JSON.toJSONString(tapdMessage));
-        tabTapdMessage.setStatus(UdeskConstant.UNDELETED);
+        tabTapdMessage.setDeleteFlag(UdeskConstant.NORMAL_STATUS);
         return tabTapdMessage;
     }
 

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/UdeskMessageApiServiceImpl.java

@@ -82,7 +82,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
         tabUdeskMessage.setEvent(messageDTO.getEvent());
         tabUdeskMessage.setMsgBody(messageDTO.getMsgBody());
         tabUdeskMessage.setSource(messageDTO.getSource());
-        tabUdeskMessage.setStatus(UdeskConstant.UNDELETED);
+        tabUdeskMessage.setDeleteFlag(UdeskConstant.NORMAL_STATUS);
         tabUdeskMessage.setTopic(messageDTO.getTopic());
         int messageId = udeskMessageService.save(tabUdeskMessage);
         //设置主键，用于update
@@ -222,7 +222,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
         }
         //填充工单优先级中文名称
         this.setPriority(ticket, tabUdeskTicket, tapdBug);
-        tabUdeskTicket.setStatus(UdeskConstant.UNDELETED);
+        tabUdeskTicket.setDeleteFlag(UdeskConstant.NORMAL_STATUS);
         //状态英文名称
         tabUdeskTicket.setStatusEn(ticket.getStatus_en());
         //tapd状态值
@@ -588,7 +588,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
     private void updateTabUdeskMessage(TabUdeskMessage tabUdeskMessage, String id, String bugId) {
         tabUdeskMessage.setBugId(bugId);
         tabUdeskMessage.setTicketId(id);
-        tabUdeskMessage.setStatus(UdeskConstant.DELETED);
+        tabUdeskMessage.setDeleteFlag(UdeskConstant.DELETE_STATUS);
         udeskMessageService.update(tabUdeskMessage);
     }
 

gic-platform-udesk-service/src/main/java/com/gic/udesk/utils/UdeskConstant.java

@@ -9,6 +9,15 @@ import org.apache.commons.codec.binary.Base64;
  * @date 2019/12/23 3:57 PM

  */
 public class UdeskConstant {
+    /**
+     * 数据正常状态
+     */
+    public static final int NORMAL_STATUS = 0;
+
+    /**
+     * 数据删除状态
+     */
+    public static final int DELETE_STATUS = 1;
 
     /**
      * udesk邮箱账号

gic-platform-udesk-service/src/main/resources/mapper/TabUdeskCustomersMapper.xml

@@ -17,10 +17,7 @@
     from tab_udesk_customers
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_udesk_customers
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskCustomers">
     insert into tab_udesk_customers (id, enterprise_id, user_id, 
       customer_id, create_time)

gic-platform-udesk-service/src/main/resources/mapper/TabUdeskEnterpriseMapper.xml

@@ -24,10 +24,7 @@
     from tab_udesk_enterprise
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_udesk_enterprise
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskEnterprise">
     insert into tab_udesk_enterprise (id, enterprise_id, business_module, business_module_name,
       business_type, ticket_id, ticket_num, 

gic-platform-udesk-service/src/main/resources/mapper/TabUdeskExceptionMapper.xml

@@ -16,10 +16,7 @@
     from tab_udesk_exception
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_udesk_exception
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskException">
     insert into tab_udesk_exception (id, exp_type, exception_record, 
       create_time)

gic-platform-udesk-service/src/main/resources/mapper/TabUdeskMessageMapper.xml

@@ -8,7 +8,7 @@
     <result column="event" jdbcType="VARCHAR" property="event" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="bug_id" jdbcType="VARCHAR" property="bugId" />
     <result column="ticket_id" jdbcType="VARCHAR" property="ticketId" />
   </resultMap>
@@ -16,7 +16,7 @@
     <result column="msg_body" jdbcType="LONGVARCHAR" property="msgBody" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, source, topic, event, create_time, update_time, status, bug_id, ticket_id
+    id, source, topic, event, create_time, update_time, delete_flag, bug_id, ticket_id
   </sql>
   <sql id="Blob_Column_List">
     msg_body
@@ -29,18 +29,15 @@
     from tab_udesk_message
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_udesk_message
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskMessage">
     insert into tab_udesk_message (id, source, topic, 
       event, create_time, update_time, 
-      status, bug_id, ticket_id, 
+      delete_flag, bug_id, ticket_id,
       msg_body)
     values (#{id,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, #{topic,jdbcType=VARCHAR}, 
       #{event,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER}, #{bugId,jdbcType=VARCHAR}, #{ticketId,jdbcType=VARCHAR}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{bugId,jdbcType=VARCHAR}, #{ticketId,jdbcType=VARCHAR},
       #{msgBody,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.udesk.entity.TabUdeskMessage" useGeneratedKeys="true" keyProperty="id">
@@ -64,8 +61,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
       <if test="bugId != null">
         bug_id,
@@ -96,8 +93,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="bugId != null">
         #{bugId,jdbcType=VARCHAR},
@@ -128,8 +125,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
       <if test="bugId != null">
         bug_id = #{bugId,jdbcType=VARCHAR},
@@ -150,7 +147,7 @@
       event = #{event,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       bug_id = #{bugId,jdbcType=VARCHAR},
       ticket_id = #{ticketId,jdbcType=VARCHAR},
       msg_body = #{msgBody,jdbcType=LONGVARCHAR}
@@ -163,7 +160,7 @@
       event = #{event,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
       bug_id = #{bugId,jdbcType=VARCHAR},
       ticket_id = #{ticketId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}

gic-platform-udesk-service/src/main/resources/mapper/TabUdeskTapdRelMapper.xml

@@ -12,11 +12,11 @@
     <result column="tapd_name" jdbcType="CHAR" property="tapdName" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     id, rel_type, workspace_id, udesk_id_key, udesk_id_value, udesk_name, tapd_id, tapd_name, 
-    create_time, update_time, status
+    create_time, update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -24,19 +24,16 @@
     from tab_udesk_tapd_rel
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_udesk_tapd_rel
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskTapdRel">
     insert into tab_udesk_tapd_rel (id, rel_type, workspace_id, 
       udesk_id_key, udesk_id_value, udesk_name, 
       tapd_id, tapd_name, create_time, 
-      update_time, status)
+      update_time, delete_flag)
     values (#{id,jdbcType=INTEGER}, #{relType,jdbcType=INTEGER}, #{workspaceId,jdbcType=CHAR}, 
       #{udeskIdKey,jdbcType=CHAR}, #{udeskIdValue,jdbcType=CHAR}, #{udeskName,jdbcType=CHAR}, 
       #{tapdId,jdbcType=CHAR}, #{tapdName,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.udesk.entity.TabUdeskTapdRel">
     insert into tab_udesk_tapd_rel
@@ -71,8 +68,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -106,8 +103,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -141,8 +138,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -158,14 +155,14 @@
       tapd_name = #{tapdName,jdbcType=CHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
   <select id="list" resultMap="BaseResultMap" parameterType="com.gic.udesk.entity.TabUdeskTapdRel">
     select <include refid="Base_Column_List"></include>
     from tab_udesk_tapd_rel
-    where status = 1
+    where delete_flag = ${@com.gic.udesk.utils.UdeskConstant@NORMAL_STATUS}
     <if test="relType != null">
       and rel_type = #{relType,jdbcType=INTEGER}
     </if>
@@ -181,9 +178,9 @@
   </select>
 
   <update id="deleteByWorkspaceId">
-    update tab_udesk_tapd_rel set status = 0
-    where status = 1
-    and rel_type = #{relType};
+    update tab_udesk_tapd_rel set delete_flag = ${@com.gic.udesk.utils.UdeskConstant@DELETE_STATUS}
+    where delete_flag = ${@com.gic.udesk.utils.UdeskConstant@NORMAL_STATUS}
+    and rel_type = #{relType}
     and workspace_id = #{workspace_id}
   </update>
 </mapper>
\ No newline at end of file

gic-platform-udesk-service/src/main/resources/mapper/TabUdeskTicketMapper.xml

@@ -26,13 +26,13 @@
     <result column="resolved_at" jdbcType="VARCHAR" property="resolvedAt" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     id, field_num, subject, user_id, user_name, organization_id, organization_name, creator_id, 
     assignee_id, assignee_name, priority, status_en, status_tapd, reporter, bug_id, workspace_id, 
     current_owner, service_staff, severity, solving_at, replied_at, resolved_at, create_time, 
-    update_time, status
+    update_time, delete_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -40,10 +40,7 @@
     from tab_udesk_ticket
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tab_udesk_ticket
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskTicket">
     insert into tab_udesk_ticket (id, field_num, subject, 
       user_id, user_name, organization_id, 
@@ -53,7 +50,7 @@
       workspace_id, current_owner, service_staff, 
       severity, solving_at, replied_at, 
       resolved_at, create_time, update_time, 
-      status)
+      delete_flag)
     values (#{id,jdbcType=INTEGER}, #{fieldNum,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, 
       #{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{organizationId,jdbcType=INTEGER}, 
       #{organizationName,jdbcType=VARCHAR}, #{creatorId,jdbcType=INTEGER}, #{assigneeId,jdbcType=INTEGER}, 
@@ -62,7 +59,7 @@
       #{workspaceId,jdbcType=VARCHAR}, #{currentOwner,jdbcType=VARCHAR}, #{serviceStaff,jdbcType=VARCHAR}, 
       #{severity,jdbcType=VARCHAR}, #{solvingAt,jdbcType=VARCHAR}, #{repliedAt,jdbcType=VARCHAR}, 
       #{resolvedAt,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER})
+      #{deleteFlag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.udesk.entity.TabUdeskTicket">
     insert into tab_udesk_ticket
@@ -139,8 +136,8 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="status != null">
-        status,
+      <if test="deleteFlag != null">
+        delete_flag,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -216,8 +213,8 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -293,8 +290,8 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -324,14 +321,14 @@
       resolved_at = #{resolvedAt,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER}
+      delete_flag = #{deleteFlag,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
   <select id="list" resultMap="BaseResultMap" parameterType="com.gic.udesk.entity.TabUdeskTicket">
     select <include refid="Base_Column_List"></include>
     from tab_udesk_ticket
-    where status = 1
+    where delete_flag = ${@com.gic.udesk.utils.UdeskConstant@NORMAL_STATUS}
     <if test="bugId != null">
       and bug_id = #{bugId,jdbcType=VARCHAR}
     </if>

gic-platform-udesk-web/src/main/java/com/gic/udesk/web/controller/GicTicketController.java

@@ -4,6 +4,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +51,7 @@ public class GicTicketController {
 
     @RequestMapping("/get-gic-service-select")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getGicServiceSelect() {
         return ResultControllerUtils.commonResult(udeskBaseApiService.getGicServiceSelect());
     }
@@ -61,6 +63,7 @@ public class GicTicketController {
      */
     @RequestMapping("/get-custom-field-by-type")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getCustomFieldFromUdeskTemplates(Integer type) {
         return ResultControllerUtils.commonResult(udeskBaseApiService.getCustomFieldFromUdeskTemplates(type));
     }
@@ -74,17 +77,20 @@ public class GicTicketController {
      */
     @RequestMapping("/get-ticket-replies")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getTicketReplies(Integer ticketId, Integer currentPage, Integer pageSize) {
         return ResultControllerUtils.commonResult(gicTicketApiService.getTicketReplies(ticketId, currentPage, pageSize));
     }
 
     @RequestMapping("/get-ticket-detail")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getTicketDetail(Integer ticketId) {
         return ResultControllerUtils.commonResult(gicTicketApiService.getTicketDetailById(ticketId));
     }
 
     @RequestMapping("/add-ticket")
+    @HeaderSignIgnore
     public RestResponse addTicket(GicTicketDTO dto) {
         dto.setTicket_field(JSON.parseObject(dto.getTicketFieldJsonStr(), Map.class));
         dto.setGicEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
@@ -96,12 +102,14 @@ public class GicTicketController {
     }
 
     @RequestMapping("/list-ticket")
+    @HeaderSignIgnore
     public RestResponse page(TicketListQO params) {
         params.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         return ResultControllerUtils.commonResult(gicTicketApiService.page(params));
     }
 
     @RequestMapping("/close-ticket")
+    @HeaderSignIgnore
     public RestResponse closeTicket(Integer ticketId) {
         LogUtils.createLog("关闭工单", "工单管理");
         return ResultControllerUtils.commonResult(gicTicketApiService.closeTicket(ticketId));
@@ -109,6 +117,7 @@ public class GicTicketController {
 
     @RequestMapping("/ticket-upload-file")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse getCustomFieldFromUdeskTemplates(HttpServletRequest request) throws Exception {
         String ticketId = request.getParameter("ticketId");
         if (!StringUtils.isNumeric(ticketId)) {
@@ -136,6 +145,7 @@ public class GicTicketController {
      */
     @RequestMapping("/agent-permission-enum")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse agentPermissionEnum() {
         return RestResponse.success(AgentPermissionEnum.list());
     }
@@ -146,12 +156,14 @@ public class GicTicketController {
      */
     @RequestMapping("/calculate-result-type-enum")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse calculateResultTypeEnum() {
         return RestResponse.success(CalculateResultTypeEnum.list());
     }
 
     @RequestMapping("/ticket-status-enum")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse ticketStatusEnum() {
         return RestResponse.success(UdeskStatusEnum.list());
     }
@@ -162,6 +174,7 @@ public class GicTicketController {
      */
     @RequestMapping("/custom-permission-enum")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse customPermissionEnum() {
         return RestResponse.success(CustomerPermissionEnum.list());
     }
@@ -172,6 +185,7 @@ public class GicTicketController {
      */
     @RequestMapping("/custom-field-content-type-enum")
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse customFieldContentTypeEnum() {
         return RestResponse.success(CustomFieldContentTypeEnum.list());
     }

gic-platform-udesk-web/src/main/java/com/gic/udesk/web/controller/MessageController.java

 package com.gic.udesk.web.controller;
 
+import com.gic.commons.annotation.HeaderSignIgnore;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,7 @@ public class MessageController {
     @Autowired
     private TapdMessageApiService tapdMessageApiService;
 
+    @HeaderSignIgnore
     @IgnoreLogin
     @RequestMapping("udesk-message")
     public RestResponse udeskMessage(@RequestBody UdeskMessageDTO udeskMessage) {
@@ -44,6 +46,7 @@ public class MessageController {
      * @param udeskMessage
      * @return
      */
+    @HeaderSignIgnore
     @IgnoreLogin
     @RequestMapping("udesk-message-no-tapd")
     public RestResponse udeskMessageNoTapd(@RequestBody UdeskMessageDTO udeskMessage) {
@@ -54,6 +57,7 @@ public class MessageController {
 
     @RequestMapping(value = "tapd-message", method = RequestMethod.POST)
     @IgnoreLogin
+    @HeaderSignIgnore
     public RestResponse tapdMessage(@RequestBody String tapdMessageStr) {
         logger.info("接收TAPD的消息:{}",tapdMessageStr);
         return ResultControllerUtils.commonResult(tapdMessageApiService.handleTapdMessage(tapdMessageStr));

gic-platform-udesk-web/src/main/java/com/gic/udesk/web/controller/TapdConfigController.java

 package com.gic.udesk.web.controller;
 
+import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.udesk.service.UdeskBaseApiService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -26,8 +27,9 @@ public class TapdConfigController {
     @Autowired
     private TapdConfigApiService tapdConfigApiService;
 
-    @RequestMapping(value = "/set-custom-field-rel")
+    @HeaderSignIgnore
     @IgnoreLogin
+    @RequestMapping(value = "/set-custom-field-rel")
     public RestResponse setTapdCustomFieldRelUdesk(String workspaceId) {
         return ResultControllerUtils.commonResult(tapdConfigApiService.setTapdCustomFieldRelUdesk(workspaceId));
     }