Skip to content

G
gic-platform-udesk
Commit e0da0a03 by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !2
parents e59d7e99 0efabf3f
Showing with 62 additions and 21 deletions
gic-platform-udesk-api/pom.xml
......@@ -86,6 +86,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
......
gic-platform-udesk-api/src/main/java/com/gic/udesk/qo/TicketListQO.java
......@@ -32,6 +32,8 @@ public class TicketListQO extends PageQO implements Serializable{
*/
private String endTime;
private Integer enterpriseId;
public String getSearch() {
return search;
}
......@@ -71,4 +73,13 @@ public class TicketListQO extends PageQO implements Serializable{
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TicketListQO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
}
gic-platform-udesk-service/pom.xml
......@@ -19,14 +19,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<libraryVersion>4.0-SNAPSHOT</libraryVersion>
<gic-sharding-sdk>3.1-SNAPSHOT</gic-sharding-sdk>
<!-- api依赖，正式版会在 gic-pom-base 里生成 -->
<gic-store-api>4.0-SNAPSHOT</gic-store-api>
<gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
<gic-bizdict-api>4.0.0-SNAPSHOT</gic-bizdict-api>
<gic-platform-auth-api>4.0-SNAPSHOT</gic-platform-auth-api>
<gic-wechat-business-api>4.0-SNAPSHOT</gic-wechat-business-api>
<gic-member-api>4.0-SNAPSHOT</gic-member-api>
<gic-open-platform-api>4.0-SNAPSHOT</gic-open-platform-api>
</properties>
<dependencies>
......
gic-platform-udesk-service/src/main/java/com/gic/udesk/entity/TabUdeskEnterprise.java
......@@ -11,6 +11,8 @@ public class TabUdeskEnterprise {
*/
private Integer id;
private Integer enterpriseId;
/**
* 业务模块ID
*/
......@@ -64,6 +66,15 @@ public class TabUdeskEnterprise {
this.id = id;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabUdeskEnterprise setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public String getBusinessModule() {
return businessModule;
}
......
gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/GicTicketApiServiceImpl.java
......@@ -130,6 +130,7 @@ public class GicTicketApiServiceImpl implements GicTicketApiService{
TabUdeskEnterprise record = new TabUdeskEnterprise();
//工单ID
record.setTicketId(ticketId);
record.setEnterpriseId(gicEnterpriseId);
//工单编号
record.setTicketNum(detail.getTicket().getField_num());
//工单标题
......
gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/UdeskMessageApiServiceImpl.java
......@@ -343,7 +343,6 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
String statusEn = ticket.getStatus_en();
//同步到gic工单状态
logger.info("同步gic工单状态，ID：{}, 状态：{}", Integer.parseInt(id), statusEn);
updateGicTicketStatus(Integer.parseInt(id), statusEn);
} else {
String exceptionRecord = "工单id为" + id + "更新工单请求udesk工单详情异常，返回为" + detailStr;
......
gic-platform-udesk-service/src/main/resources/mapper/TabUdeskEnterpriseMapper.xml
......@@ -3,6 +3,7 @@
<mapper namespace="com.gic.udesk.dao.mapper.TabUdeskEnterpriseMapper">
<resultMap id="BaseResultMap" type="com.gic.udesk.entity.TabUdeskEnterprise">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="business_module" jdbcType="VARCHAR" property="businessModule" />
<result column="business_module_name" jdbcType="VARCHAR" property="businessModuleName" />
<result column="business_type" jdbcType="INTEGER" property="businessType" />
......@@ -14,7 +15,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
id, business_module, business_module_name, business_type, ticket_id, ticket_num,
id, enterprise_id, business_module, business_module_name, business_type, ticket_id, ticket_num,
ticket_title, ticket_status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -28,11 +29,11 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.udesk.entity.TabUdeskEnterprise">
insert into tab_udesk_enterprise (id, business_module, business_module_name,
insert into tab_udesk_enterprise (id, enterprise_id, business_module, business_module_name,
business_type, ticket_id, ticket_num,
ticket_title, ticket_status, create_time,
update_time)
values (#{id,jdbcType=INTEGER}, #{businessModule,jdbcType=VARCHAR}, #{businessModuleName,jdbcType=VARCHAR},
values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{businessModule,jdbcType=VARCHAR}, #{businessModuleName,jdbcType=VARCHAR},
#{businessType,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER}, #{ticketNum,jdbcType=CHAR},
#{ticketTitle,jdbcType=CHAR}, #{ticketStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
......@@ -43,6 +44,9 @@
<if test="id != null">
id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="businessModule != null">
business_module,
</if>
......@@ -75,6 +79,9 @@
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="businessModule != null">
#{businessModule,jdbcType=VARCHAR},
</if>
......@@ -107,6 +114,9 @@
<update id="updateByPrimaryKeySelective" parameterType="com.gic.udesk.entity.TabUdeskEnterprise">
update tab_udesk_enterprise
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="businessModule != null">
business_module = #{businessModule,jdbcType=VARCHAR},
</if>
......@@ -139,7 +149,9 @@
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.udesk.entity.TabUdeskEnterprise">
update tab_udesk_enterprise
set business_module = #{businessModule,jdbcType=VARCHAR},
set
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
business_module = #{businessModule,jdbcType=VARCHAR},
business_module_name = #{businessModuleName,jdbcType=VARCHAR},
business_type = #{businessType,jdbcType=INTEGER},
ticket_id = #{ticketId,jdbcType=INTEGER},
......@@ -154,7 +166,8 @@
<select id="page" parameterType="com.gic.udesk.qo.TicketListQO" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
from tab_udesk_enterprise
where 1=1
where
enterprise_id = #{enterpriseId}
<if test="search != null and search != '' ">
and (business_module_name like concat('%', #{search}, '%')
or ticket_num like concat('%', #{search}, '%')
......
gic-platform-udesk-web/pom.xml
......@@ -20,10 +20,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<libraryVersion>4.0-SNAPSHOT</libraryVersion>
<!-- api依赖，正式版会在 gic-pom-base 里生成 -->
<gic-store-api>4.0-SNAPSHOT</gic-store-api>
<gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
<gic-marketing-api>4.0-SNAPSHOT</gic-marketing-api>
<gic-open-platform-api>4.0-SNAPSHOT</gic-open-platform-api>
</properties>
<dependencies>
......@@ -129,6 +125,11 @@
<artifactId>gic-platform-enterprise-api</artifactId>
<version>${gic-platform-enterprise-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-enterprise-download</artifactId>
<version>${gic-enterprise-download}</version>
</dependency>
</dependencies>
<build>
......
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.download.utils.log.LogUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -73,25 +74,25 @@ public class GicTicketController {
}
@RequestMapping("/add-ticket")
@IgnoreLogin
public RestResponse addTicket(GicTicketDTO dto) {
dto.setTicket_field(JSON.parseObject(dto.getTicketFieldJsonStr(), Map.class));
dto.setGicEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
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));
}
@RequestMapping("/list-ticket")
@IgnoreLogin
public RestResponse page(TicketListQO params) {
params.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return ResultControllerUtils.commonResult(gicTicketApiService.page(params));
}
@RequestMapping("/close-ticket")
@IgnoreLogin
public RestResponse closeTicket(Integer ticketId) {
LogUtils.createLog("关闭工单", "工单管理");
return ResultControllerUtils.commonResult(gicTicketApiService.closeTicket(ticketId));
}
......
gic-platform-udesk-web/src/main/resources/dubbo-gic-platform-udesk-web.xml
......@@ -20,4 +20,7 @@
<dubbo:reference interface="com.gic.udesk.service.UdeskBaseApiService" id="udeskBaseApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.udesk.service.GicTicketApiService" id="gicTicketApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="60000" />
</beans>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment