客户ID从integer类型改成long

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

@@ -45,7 +45,7 @@ public class TicketDTO implements Serializable{
     /**
      * 客户id
      */
-    private Integer user_id;
+    private Long user_id;
 
     /**
      * 客户姓名
@@ -242,11 +242,11 @@ public class TicketDTO implements Serializable{
         this.content_type = content_type;
     }
 
-    public Integer getUser_id() {
+    public Long getUser_id() {
         return user_id;
     }
 
-    public void setUser_id(Integer user_id) {
+    public void setUser_id(Long user_id) {
         this.user_id = user_id;
     }
 

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

@@ -28,7 +28,7 @@ public class TabUdeskCustomers {
     /**
      * udesk客户ID
      */
-    private Integer customerId;
+    private Long customerId;
 
     /**
      * 
@@ -55,16 +55,18 @@ public class TabUdeskCustomers {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public TabUdeskCustomers setUserId(Integer userId) {
         this.userId = userId;
+        return this;
     }
 
-    public Integer getCustomerId() {
+    public Long getCustomerId() {
         return customerId;
     }
 
-    public void setCustomerId(Integer customerId) {
+    public TabUdeskCustomers setCustomerId(Long customerId) {
         this.customerId = customerId;
+        return this;
     }
 
     public Date getCreateTime() {

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

@@ -28,7 +28,7 @@ public class TabUdeskTicket {
     /**
      * 客户id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 客户姓名
@@ -159,11 +159,11 @@ public class TabUdeskTicket {
         this.subject = subject;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

gic-platform-udesk-service/src/main/java/com/gic/udesk/service/UdeskCustomersService.java

@@ -19,7 +19,7 @@ public interface UdeskCustomersService {
      * @param userId

      * @return  int

     
*/
-    int save(Integer enterpriseId, Integer customerId, Integer userId);
+    int save(Integer enterpriseId, Long customerId, Integer userId);
     /**
      * hasCustomerId
      * @Title: hasCustomerId


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

@@ -20,7 +20,7 @@ public class UdeskCustomersServiceImpl implements UdeskCustomersService{
     private TabUdeskCustomersMapper tabUdeskCustomersMapper;
 
     @Override
-    public int save(Integer enterpriseId, Integer customerId, Integer userId) {
+    public int save(Integer enterpriseId, Long customerId, Integer userId) {
         TabUdeskCustomers record = new TabUdeskCustomers();
         record.setCreateTime(new Date());
         record.setCustomerId(customerId);

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

@@ -104,7 +104,7 @@ public class GicTicketApiServiceImpl implements GicTicketApiService{
                 int code = customerRes.getIntValue("code");
                 JSONObject customerObj = customerRes.getJSONObject("customer");
                 if (code == UdeskConstant.UDESK_SUCCESS_CODE) {
-                    int customerId = customerObj.getIntValue("id");
+                    Long customerId = customerObj.getLong("id");
                     gicTicketDTO.setType("customer_id");
                     gicTicketDTO.setType_content(customerId + "");
                     //保存到

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
-    <result column="customer_id" jdbcType="INTEGER" property="customerId" />
+    <result column="customer_id" jdbcType="BIGINT" property="customerId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
@@ -21,8 +21,8 @@
   <insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskCustomers">
     insert into tab_udesk_customers (id, enterprise_id, user_id, 
       customer_id, create_time)
-    values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
-      #{customerId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
+    values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER},
+      #{customerId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.udesk.entity.TabUdeskCustomers">
     insert into tab_udesk_customers
@@ -54,7 +54,7 @@
         #{userId,jdbcType=INTEGER},
       </if>
       <if test="customerId != null">
-        #{customerId,jdbcType=INTEGER},
+        #{customerId,jdbcType=BIGINT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -71,7 +71,7 @@
         user_id = #{userId,jdbcType=INTEGER},
       </if>
       <if test="customerId != null">
-        customer_id = #{customerId,jdbcType=INTEGER},
+        customer_id = #{customerId,jdbcType=BIGINT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -83,7 +83,7 @@
     update tab_udesk_customers
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       user_id = #{userId,jdbcType=INTEGER},
-      customer_id = #{customerId,jdbcType=INTEGER},
+      customer_id = #{customerId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="field_num" jdbcType="VARCHAR" property="fieldNum" />
     <result column="subject" jdbcType="VARCHAR" property="subject" />
-    <result column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="user_name" jdbcType="VARCHAR" property="userName" />
     <result column="organization_id" jdbcType="INTEGER" property="organizationId" />
     <result column="organization_name" jdbcType="VARCHAR" property="organizationName" />
@@ -52,7 +52,7 @@
       resolved_at, create_time, update_time, 
       delete_flag)
     values (#{id,jdbcType=INTEGER}, #{fieldNum,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, 
-      #{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{organizationId,jdbcType=INTEGER}, 
+      #{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, #{organizationId,jdbcType=INTEGER},
       #{organizationName,jdbcType=VARCHAR}, #{creatorId,jdbcType=INTEGER}, #{assigneeId,jdbcType=INTEGER}, 
       #{assigneeName,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{statusEn,jdbcType=VARCHAR}, 
       #{statusTapd,jdbcType=VARCHAR}, #{reporter,jdbcType=VARCHAR}, #{bugId,jdbcType=VARCHAR}, 
@@ -151,7 +151,7 @@
         #{subject,jdbcType=VARCHAR},
       </if>
       <if test="userId != null">
-        #{userId,jdbcType=INTEGER},
+        #{userId,jdbcType=BIGINT},
       </if>
       <if test="userName != null">
         #{userName,jdbcType=VARCHAR},
@@ -228,7 +228,7 @@
         subject = #{subject,jdbcType=VARCHAR},
       </if>
       <if test="userId != null">
-        user_id = #{userId,jdbcType=INTEGER},
+        user_id = #{userId,jdbcType=BIGINT},
       </if>
       <if test="userName != null">
         user_name = #{userName,jdbcType=VARCHAR},
@@ -300,7 +300,7 @@
     update tab_udesk_ticket
     set field_num = #{fieldNum,jdbcType=VARCHAR},
       subject = #{subject,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=BIGINT},
       user_name = #{userName,jdbcType=VARCHAR},
       organization_id = #{organizationId,jdbcType=INTEGER},
       organization_name = #{organizationName,jdbcType=VARCHAR},

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.api.base.commons.ServiceResponse;
 import com.gic.commons.annotation.HeaderSignIgnore;
 import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
@@ -99,8 +100,11 @@ public class GicTicketController {
         dto.setGicUserId(UserDetailUtils.getUserDetail().getUserId());
         dto.setGicUserName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         dto.setGicEnterpriseName(UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
-        LogUtils.createLog("提交工单", "工单管理");
-        return ResultControllerUtils.commonResult(gicTicketApiService.saveTicket(dto));
+        ServiceResponse<Integer> response = gicTicketApiService.saveTicket(dto);
+        if (response.isSuccess()) {
+            LogUtils.createLog("提交工单", "工单管理");
+        }
+        return ResultControllerUtils.commonResult(response);
     }
 
     @RequestMapping("/list-ticket")
@@ -113,8 +117,11 @@ public class GicTicketController {
     @RequestMapping("/close-ticket")
     @HeaderSignIgnore
     public RestResponse closeTicket(Integer ticketId) {
-        LogUtils.createLog("关闭工单", "工单管理");
-        return ResultControllerUtils.commonResult(gicTicketApiService.closeTicket(ticketId));
+        ServiceResponse<String> response = gicTicketApiService.closeTicket(ticketId);
+        if (response.isSuccess()) {
+            LogUtils.createLog("关闭工单", "工单管理");
+        }
+        return ResultControllerUtils.commonResult(response);
     }
 
     @RequestMapping("/ticket-upload-file")