Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-udesk
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-udesk
Commits
31ec84ba
Commit
31ec84ba
authored
May 21, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加字段:是否客服审核
parent
0efabf3f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
171 additions
and
9 deletions
+171
-9
TapdConfigApiServiceImpl.java
...ic/udesk/service/outer/impl/TapdConfigApiServiceImpl.java
+3
-0
UdeskMessageApiServiceImpl.java
.../udesk/service/outer/impl/UdeskMessageApiServiceImpl.java
+47
-9
UdeskConstant.java
...vice/src/main/java/com/gic/udesk/utils/UdeskConstant.java
+15
-0
VersionReport3Enum.java
...in/java/com/gic/udesk/utils/field/VersionReport3Enum.java
+52
-0
VersionReportEnum.java
...ain/java/com/gic/udesk/utils/field/VersionReportEnum.java
+54
-0
No files found.
gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/TapdConfigApiServiceImpl.java
View file @
31ec84ba
...
...
@@ -73,6 +73,9 @@ public class TapdConfigApiServiceImpl implements TapdConfigApiService {
tabUdeskTapdRel
=
new
TabUdeskTapdRel
(
workspaceId
,
9
,
"getOrganizationName"
,
"公司"
,
"set"
+
captureName
(
custom_field
),
"公司信息"
);
break
;
case
"是否客服内部已审核"
:
tabUdeskTapdRel
=
new
TabUdeskTapdRel
(
workspaceId
,
9
,
UdeskConstant
.
UDESK_SERVICE_AUDIT
,
"是否客服内部已审核"
,
"set"
+
captureName
(
custom_field
),
"是否客服内部已审核"
);
break
;
default
:
break
;
}
...
...
gic-platform-udesk-service/src/main/java/com/gic/udesk/service/outer/impl/UdeskMessageApiServiceImpl.java
View file @
31ec84ba
...
...
@@ -8,9 +8,12 @@ import java.util.Map;
import
javax.annotation.Resource
;
import
javax.validation.ConstraintViolationException
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.udesk.constant.UdeskStatusEnum
;
import
com.gic.udesk.entity.TabUdeskTapdRel
;
import
com.gic.udesk.service.*
;
import
com.gic.udesk.utils.field.VersionReport3Enum
;
import
com.gic.udesk.utils.field.VersionReportEnum
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
...
...
@@ -112,6 +115,11 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
}
tabUdeskTicket
.
setCurrentOwner
(
builder
.
toString
());
}
//发现版本添加
String
versionReportCode
=
customFields
.
get
(
UdeskConstant
.
UDESK_FIELD_VERSION_3
);
tapdBug
.
setVersion_report
(
VersionReport3Enum
.
getMessage
(
versionReportCode
));
//填充部分自定义字段值
this
.
setUdeskCostomFields
(
tabUdeskTicket
,
tapdBug
,
customFields
);
}
...
...
@@ -158,7 +166,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
String
workspaceId
=
tabUdeskTicket
.
getWorkspaceId
();
tapdBug
.
setWorkspace_id
(
workspaceId
);
this
.
setTapdCustomField
(
workspaceId
,
tapdBug
,
tabUdeskTicket
);
this
.
setTapdCustomField
(
workspaceId
,
tapdBug
,
tabUdeskTicket
,
customFields
);
tapdBug
.
setStatus
(
tabUdeskTicket
.
getStatusTapd
());
this
.
setDescription
(
ticket
,
tapdBug
);
...
...
@@ -286,10 +294,18 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
this
.
setUdeskCostomFields
(
tabUdeskTicket
,
tapdBug
,
customFields
);
}
tabUdeskTicket
.
setUserName
(
ticket
.
getUser_name
());
this
.
setTapdCustomField
(
workspaceId
,
tapdBug
,
tabUdeskTicket
);
this
.
setTapdCustomField
(
workspaceId
,
tapdBug
,
tabUdeskTicket
,
customFields
);
udeskTicketService
.
update
(
tabUdeskTicket
);
String
bugStr
=
JSON
.
toJSONString
(
tapdBug
);
JSONObject
bugJson
=
(
JSONObject
)
JSONObject
.
toJSON
(
tapdBug
);
if
(
customFields
!=
null
)
{
//发现版本添加
String
versionReportCode
=
customFields
.
get
(
UdeskConstant
.
UDESK_FIELD_VERSION_3
);
bugJson
.
put
(
"version_report"
,
VersionReport3Enum
.
getMessage
(
versionReportCode
));
}
String
bugStr
=
bugJson
.
toJSONString
();
logger
.
info
(
"更新TAPDbug入参为{}"
,
bugStr
);
String
bugReturnStr
=
UdeskHttpClientUtil
.
postTapdJsonFromJson
(
TAPD_BUGS
,
bugStr
);
logger
.
info
(
"更新TAPDbug返回为{}"
,
bugReturnStr
);
...
...
@@ -440,15 +456,26 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
* @param tapdBug
* @param tabUdeskTicket
*/
private
void
setTapdCustomField
(
String
workspaceId
,
TapdBugDTO
tapdBug
,
TabUdeskTicket
tabUdeskTicket
)
{
private
void
setTapdCustomField
(
String
workspaceId
,
TapdBugDTO
tapdBug
,
TabUdeskTicket
tabUdeskTicket
,
Map
<
String
,
String
>
customFields
)
{
TabUdeskTapdRel
params
=
new
TabUdeskTapdRel
();
params
.
setRelType
(
9
);
params
.
setWorkspaceId
(
workspaceId
);
List
<
TabUdeskTapdRel
>
udeskTapdRelList
=
udeskTapdRelService
.
list
(
params
);
for
(
TabUdeskTapdRel
tabUdeskTapdRel
:
udeskTapdRelList
)
{
try
{
Method
udeskMethod
=
TabUdeskTicket
.
class
.
getMethod
(
tabUdeskTapdRel
.
getUdeskIdKey
());
String
value
=
(
String
)
udeskMethod
.
invoke
(
tabUdeskTicket
);
String
value
;
if
(
UdeskConstant
.
UDESK_SERVICE_AUDIT
.
equals
(
tabUdeskTapdRel
.
getUdeskIdKey
()))
{
//是否客服内部已审核字段
value
=
customFields
.
get
(
UdeskConstant
.
UDESK_SERVICE_AUDIT
);
if
(
"0"
.
equals
(
value
))
{
value
=
"是"
;
}
else
if
(
"1"
.
equals
(
value
))
{
value
=
"否"
;
}
}
else
{
Method
udeskMethod
=
TabUdeskTicket
.
class
.
getMethod
(
tabUdeskTapdRel
.
getUdeskIdKey
());
value
=
(
String
)
udeskMethod
.
invoke
(
tabUdeskTicket
);
}
Method
tapdMethod
=
TapdBugDTO
.
class
.
getMethod
(
tabUdeskTapdRel
.
getTapdId
(),
String
.
class
);
tapdMethod
.
invoke
(
tapdBug
,
value
);
}
catch
(
Exception
e
)
{
...
...
@@ -465,7 +492,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
* @param tapdBug
* @param tabUdeskTicket
*/
private
void
setTapdCustomField
(
String
workspaceId
,
TapdBugUpdateDTO
tapdBug
,
TabUdeskTicket
tabUdeskTicket
)
{
private
void
setTapdCustomField
(
String
workspaceId
,
TapdBugUpdateDTO
tapdBug
,
TabUdeskTicket
tabUdeskTicket
,
Map
<
String
,
String
>
customFields
)
{
TabUdeskTapdRel
params
=
new
TabUdeskTapdRel
();
params
.
setWorkspaceId
(
workspaceId
);
params
.
setRelType
(
9
);
...
...
@@ -476,8 +503,19 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
continue
;
}
try
{
Method
udeskMethod
=
TabUdeskTicket
.
class
.
getMethod
(
udeskIdKey
);
String
value
=
(
String
)
udeskMethod
.
invoke
(
tabUdeskTicket
);
String
value
;
if
(
UdeskConstant
.
UDESK_SERVICE_AUDIT
.
equals
(
tabUdeskTapdRel
.
getUdeskIdKey
()))
{
//是否客服内部已审核字段
value
=
customFields
.
get
(
UdeskConstant
.
UDESK_SERVICE_AUDIT
);
if
(
"0"
.
equals
(
value
))
{
value
=
"是"
;
}
else
if
(
"1"
.
equals
(
value
))
{
value
=
"否"
;
}
}
else
{
Method
udeskMethod
=
TabUdeskTicket
.
class
.
getMethod
(
udeskIdKey
);
value
=
(
String
)
udeskMethod
.
invoke
(
tabUdeskTicket
);
}
Method
tapdMethod
=
TapdBugUpdateDTO
.
class
.
getMethod
(
tabUdeskTapdRel
.
getTapdId
(),
String
.
class
);
tapdMethod
.
invoke
(
tapdBug
,
value
);
}
catch
(
Exception
e
)
{
...
...
gic-platform-udesk-service/src/main/java/com/gic/udesk/utils/UdeskConstant.java
View file @
31ec84ba
...
...
@@ -106,6 +106,16 @@ public class UdeskConstant {
public
static
final
String
UDESK_FIELD_WORKSPACE
=
"SelectField_19946"
;
/**
* 3.0生产:发现版本
*/
public
static
final
String
UDESK_FIELD_VERSION_3
=
"SelectField_69821"
;
/**
* udesk字段:发现版本
*/
public
static
final
String
UDESK_FIELD_VERSION
=
"SelectField_69731"
;
/**
* udesk字段发现阶段
*/
public
static
final
String
UDESK_FIELD_ORIGINPHASE
=
"SelectField_23551"
;
...
...
@@ -131,6 +141,11 @@ public class UdeskConstant {
public
static
final
String
UDESK_FIELD_TRANSACTOR
=
"SelectField_23591"
;
/**
* udesk字段:是否客服内部已审核
*/
public
static
final
String
UDESK_SERVICE_AUDIT
=
"SelectField_73261"
;
/**
* GIC后台对应的基础模块 级联字段
*/
public
static
final
String
GIC_BASE_MODULE_SELECT
=
"SelectField_56661"
;
...
...
gic-platform-udesk-service/src/main/java/com/gic/udesk/utils/field/VersionReport3Enum.java
0 → 100644
View file @
31ec84ba
package
com
.
gic
.
udesk
.
utils
.
field
;
/**
* 发现版本字段字典数据
* @ClassName: VersionReport3Enum
* @Description:
* @author guojuxing
* @date 2020/5/21 10:23 AM
*/
public
enum
VersionReport3Enum
{
MEMBER_3
(
"0"
,
"3.0_生产_会员"
),
ENTERPRISE_3
(
"1"
,
"3.0_生产_企业"
),
GOODS_3
(
"7"
,
"3.0_生产_商品"
),
MARKETING_E
(
"3"
,
"3.0_生产_营销"
),
MALL_3
(
"2"
,
"3.0_生产_商城"
),
OPERATION_3
(
"4"
,
"3.0_生产_运维"
),
DATA_3
(
"5"
,
"3.0_生产_数据"
),
MOBILE_3
(
"6"
,
"3.0_生产_移动"
),
WM_MALL_3
(
"8"
,
"3.0_生产_微盟商城"
);
private
String
code
;
private
String
message
;
private
VersionReport3Enum
(
String
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
public
static
String
getMessage
(
String
code
)
{
for
(
VersionReport3Enum
versionReportEnum
:
values
())
{
if
(
versionReportEnum
.
getCode
().
equals
(
code
))
{
return
versionReportEnum
.
getMessage
();
}
}
return
null
;
}
public
String
getCode
()
{
return
code
;
}
public
void
setCode
(
String
code
)
{
this
.
code
=
code
;
}
public
String
getMessage
()
{
return
message
;
}
public
void
setMessage
(
String
message
)
{
this
.
message
=
message
;
}
}
gic-platform-udesk-service/src/main/java/com/gic/udesk/utils/field/VersionReportEnum.java
0 → 100644
View file @
31ec84ba
package
com
.
gic
.
udesk
.
utils
.
field
;
/**
* 发现版本字段字典数据
* @ClassName: VersionReportEnum
* @Description:
* @author guojuxing
* @date 2020/5/21 10:21 AM
*/
public
enum
VersionReportEnum
{
TEST_GOODS_4
(
"0"
,
"4.0_测试_商品"
),
GOODS_4
(
"1"
,
"4.0_生产_商品"
),
MEMBER_4
(
"2"
,
"4.0_生产_会员"
),
TEST_MEMBER_3
(
"3"
,
"3.0_测试_会员"
),
MEMBER_3
(
"4"
,
"3.0_生产_会员"
),
TEST_MEMBER_4
(
"5"
,
"4.0_测试_会员"
),
TEST_ENTERPRISE_4
(
"6"
,
"4.0_测试_企业"
),
ENTERPRISE_4
(
"7"
,
"4.0_生产_企"
),
TEST_ENTERPRISE_3
(
"8"
,
"3.0_测试_企业"
),
ENTERPRISE_3
(
"9"
,
"3.0_生产_企业"
);
private
String
code
;
private
String
message
;
private
VersionReportEnum
(
String
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
public
static
String
getMessage
(
String
code
)
{
for
(
VersionReportEnum
versionReportEnum
:
values
())
{
if
(
versionReportEnum
.
getCode
().
equals
(
code
))
{
return
versionReportEnum
.
getMessage
();
}
}
return
null
;
}
public
String
getCode
()
{
return
code
;
}
public
void
setCode
(
String
code
)
{
this
.
code
=
code
;
}
public
String
getMessage
()
{
return
message
;
}
public
void
setMessage
(
String
message
)
{
this
.
message
=
message
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment