Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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-enterprise
Commits
348c9853
Commit
348c9853
authored
Jul 21, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客服服务页面调整
parent
55b126e5
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
349 additions
and
66 deletions
+349
-66
WechatServiceFieldEnum.java
...a/com/gic/enterprise/constant/WechatServiceFieldEnum.java
+58
-0
CustomChatFiledDTO.java
.../main/java/com/gic/enterprise/dto/CustomChatFiledDTO.java
+15
-1
CustomUdeskFieldDTO.java
...main/java/com/gic/enterprise/dto/CustomUdeskFieldDTO.java
+45
-10
LicenseDTO.java
...c/main/java/com/gic/enterprise/dto/market/LicenseDTO.java
+11
-0
CustomUdeskFieldApiService.java
...om/gic/enterprise/service/CustomUdeskFieldApiService.java
+3
-1
TabCustomUdeskFieldMapper.java
.../gic/enterprise/dao/mapper/TabCustomUdeskFieldMapper.java
+7
-1
TabCustomUdeskField.java
...n/java/com/gic/enterprise/entity/TabCustomUdeskField.java
+44
-10
CustomUdeskFieldService.java
...a/com/gic/enterprise/service/CustomUdeskFieldService.java
+4
-1
CustomUdeskFiledServiceImpl.java
.../enterprise/service/impl/CustomUdeskFiledServiceImpl.java
+15
-4
CustomUdeskFieldApiServiceImpl.java
...se/service/outer/impl/CustomUdeskFieldApiServiceImpl.java
+12
-12
TabCustomUdeskFieldMapper.xml
...e/src/main/resources/mapper/TabCustomUdeskFieldMapper.xml
+42
-9
CustomChatController.java
...m/gic/enterprise/web/controller/CustomChatController.java
+24
-17
UdeskFieldVO.java
...src/main/java/com/gic/enterprise/web/vo/UdeskFieldVO.java
+69
-0
No files found.
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/WechatServiceFieldEnum.java
0 → 100644
View file @
348c9853
package
com
.
gic
.
enterprise
.
constant
;
/**
* 小程序客服页面udesk的系统字段
* @ClassName: WechatServiceFieldEnum
* @Description:
* @author guojuxing
* @date 2020/7/20 4:04 PM
*/
public
enum
WechatServiceFieldEnum
{
NAME
(
1
,
"姓名"
,
1
),
GENDER
(
2
,
"性别"
,
1
),
PHONE
(
3
,
"手机号码"
,
1
),
AGE
(
4
,
"年龄"
,
1
),
BIRTHDAY
(
5
,
"生日"
,
1
),
CITY
(
6
,
"常驻城市"
,
1
),
USER_INFO
(
7
,
"用户信息"
,
1
),
LAST_CONSUME_TIME
(
8
,
"最近消费时间"
,
1
),
MEMBER_CARD
(
9
,
"会员卡号"
,
2
),
MEMBER_GRADE
(
10
,
"会员卡等级"
,
2
),
INTEGRAL_BALANCE
(
11
,
"积分余额"
,
2
),
ORDER_NUM
(
12
,
"订单号"
,
3
),
PAY_TIME
(
13
,
"支付时间"
,
3
),
ORDER_TIME
(
14
,
"下单时间"
,
3
),
ORDER_GOODS_LINK
(
15
,
"订单商品链接"
,
3
),
SHOPMENT_NUMBER
(
16
,
"物流单号"
,
3
)
;
WechatServiceFieldEnum
(
int
code
,
String
message
,
int
fieldType
)
{
this
.
code
=
code
;
this
.
message
=
message
;
this
.
fieldType
=
fieldType
;
}
private
int
code
;
private
String
message
;
/**
* 1:用户信息 2:会员卡信息 3:物流信息
*/
private
int
fieldType
;
public
int
getCode
()
{
return
code
;
}
public
String
getMessage
()
{
return
message
;
}
public
int
getFieldType
()
{
return
fieldType
;
}
public
WechatServiceFieldEnum
setFieldType
(
int
fieldType
)
{
this
.
fieldType
=
fieldType
;
return
this
;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/CustomChatFiledDTO.java
View file @
348c9853
...
...
@@ -5,13 +5,18 @@ import java.io.Serializable;
public
class
CustomChatFiledDTO
implements
Serializable
{
private
String
key
;
private
String
value
;
/**
* 1:用户信息 2:会员卡信息 3:物流信息
*/
private
Integer
type
;
public
CustomChatFiledDTO
(){
}
public
CustomChatFiledDTO
(
String
key
,
String
value
){
public
CustomChatFiledDTO
(
String
key
,
String
value
,
Integer
type
){
this
.
key
=
key
;
this
.
value
=
value
;
this
.
type
=
type
;
}
public
String
getKey
()
{
return
key
;
...
...
@@ -28,4 +33,13 @@ public class CustomChatFiledDTO implements Serializable {
public
void
setValue
(
String
value
)
{
this
.
value
=
value
;
}
public
Integer
getType
()
{
return
type
;
}
public
CustomChatFiledDTO
setType
(
Integer
type
)
{
this
.
type
=
type
;
return
this
;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/CustomUdeskFieldDTO.java
View file @
348c9853
...
...
@@ -7,6 +7,7 @@ import java.util.Date;
* tab_custom_udesk_field
*/
public
class
CustomUdeskFieldDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
3629705521334915819L
;
/**
*
*/
...
...
@@ -20,7 +21,7 @@ public class CustomUdeskFieldDTO implements Serializable {
/**
*
*/
private
String
gicFieldId
;
private
Integer
gicFieldId
;
/**
*
...
...
@@ -32,6 +33,13 @@ public class CustomUdeskFieldDTO implements Serializable {
*/
private
Integer
status
;
private
String
appId
;
/**
* 1:用户信息 2:会员卡信息 3:物流信息
*/
private
Integer
fieldType
;
/**
*
*/
...
...
@@ -51,63 +59,89 @@ public class CustomUdeskFieldDTO implements Serializable {
return
id
;
}
public
void
setId
(
Integer
id
)
{
public
CustomUdeskFieldDTO
setId
(
Integer
id
)
{
this
.
id
=
id
;
return
this
;
}
public
String
getUdeskFieldId
()
{
return
udeskFieldId
;
}
public
void
setUdeskFieldId
(
String
udeskFieldId
)
{
public
CustomUdeskFieldDTO
setUdeskFieldId
(
String
udeskFieldId
)
{
this
.
udeskFieldId
=
udeskFieldId
;
return
this
;
}
public
String
getGicFieldId
()
{
public
Integer
getGicFieldId
()
{
return
gicFieldId
;
}
public
void
setGicFieldId
(
String
gicFieldId
)
{
public
CustomUdeskFieldDTO
setGicFieldId
(
Integer
gicFieldId
)
{
this
.
gicFieldId
=
gicFieldId
;
return
this
;
}
public
String
getGicFieldName
()
{
return
gicFieldName
;
}
public
void
setGicFieldName
(
String
gicFieldName
)
{
public
CustomUdeskFieldDTO
setGicFieldName
(
String
gicFieldName
)
{
this
.
gicFieldName
=
gicFieldName
;
return
this
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
public
CustomUdeskFieldDTO
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
return
this
;
}
public
String
getAppId
()
{
return
appId
;
}
public
CustomUdeskFieldDTO
setAppId
(
String
appId
)
{
this
.
appId
=
appId
;
return
this
;
}
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
Integer
enterpriseId
)
{
public
CustomUdeskFieldDTO
setEnterpriseId
(
Integer
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
return
this
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
public
CustomUdeskFieldDTO
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
return
this
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
public
CustomUdeskFieldDTO
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
return
this
;
}
public
Integer
getFieldType
()
{
return
fieldType
;
}
public
CustomUdeskFieldDTO
setFieldType
(
Integer
fieldType
)
{
this
.
fieldType
=
fieldType
;
return
this
;
}
}
\ No newline at end of file
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/market/LicenseDTO.java
View file @
348c9853
...
...
@@ -63,6 +63,8 @@ public class LicenseDTO implements Serializable{
*/
private
Integer
alreadyBuyQuantity
;
private
boolean
licenseEditFlag
;
public
String
getServeId
()
{
return
serveId
;
}
...
...
@@ -190,4 +192,13 @@ public class LicenseDTO implements Serializable{
public
void
setServeQuantity
(
Integer
serveQuantity
)
{
this
.
serveQuantity
=
serveQuantity
;
}
public
boolean
isLicenseEditFlag
()
{
return
licenseEditFlag
;
}
public
LicenseDTO
setLicenseEditFlag
(
boolean
licenseEditFlag
)
{
this
.
licenseEditFlag
=
licenseEditFlag
;
return
this
;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/CustomUdeskFieldApiService.java
View file @
348c9853
...
...
@@ -24,13 +24,15 @@ public interface CustomUdeskFieldApiService {
*/
ServiceResponse
<
Integer
>
saveEnterpriseField
(
CustomUdeskFieldDTO
dto
);
ServiceResponse
<
Integer
>
editEnterpriseField
(
CustomUdeskFieldDTO
dto
);
/** @Description: 查询企业配置的字段
* @author taogs
* @Date 11:11 2019/12/2
* @Param
* @return
*/
ServiceResponse
<
List
<
CustomUdeskFieldDTO
>>
listEnterpriseField
(
Integer
enterpriseId
);
ServiceResponse
<
List
<
CustomUdeskFieldDTO
>>
listEnterpriseField
(
Integer
enterpriseId
,
String
appId
);
/** @Description: 获取字段配置详情
* @author taogs
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabCustomUdeskFieldMapper.java
View file @
348c9853
...
...
@@ -54,5 +54,10 @@ public interface TabCustomUdeskFieldMapper {
*/
int
updateByPrimaryKey
(
TabCustomUdeskField
record
);
List
<
TabCustomUdeskField
>
listEnterpriseField
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
);
List
<
TabCustomUdeskField
>
listEnterpriseField
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
,
@Param
(
"appId"
)
String
appId
);
TabCustomUdeskField
getUdeskField
(
@Param
(
"enterpriseId"
)
Integer
enterpriseId
,
@Param
(
"appId"
)
String
appId
,
@Param
(
"gicFieldId"
)
Integer
gicFieldId
);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabCustomUdeskField.java
View file @
348c9853
...
...
@@ -19,7 +19,7 @@ public class TabCustomUdeskField {
/**
*
*/
private
String
gicFieldId
;
private
Integer
gicFieldId
;
/**
*
...
...
@@ -31,6 +31,13 @@ public class TabCustomUdeskField {
*/
private
Integer
status
;
private
String
appId
;
/**
* 1:用户信息 2:会员卡信息 3:物流信息
*/
private
Integer
fieldType
;
/**
*
*/
...
...
@@ -50,63 +57,89 @@ public class TabCustomUdeskField {
return
id
;
}
public
voi
d
setId
(
Integer
id
)
{
public
TabCustomUdeskFiel
d
setId
(
Integer
id
)
{
this
.
id
=
id
;
return
this
;
}
public
String
getUdeskFieldId
()
{
return
udeskFieldId
;
}
public
voi
d
setUdeskFieldId
(
String
udeskFieldId
)
{
public
TabCustomUdeskFiel
d
setUdeskFieldId
(
String
udeskFieldId
)
{
this
.
udeskFieldId
=
udeskFieldId
;
return
this
;
}
public
String
getGicFieldId
()
{
public
Integer
getGicFieldId
()
{
return
gicFieldId
;
}
public
void
setGicFieldId
(
String
gicFieldId
)
{
public
TabCustomUdeskField
setGicFieldId
(
Integer
gicFieldId
)
{
this
.
gicFieldId
=
gicFieldId
;
return
this
;
}
public
String
getGicFieldName
()
{
return
gicFieldName
;
}
public
voi
d
setGicFieldName
(
String
gicFieldName
)
{
public
TabCustomUdeskFiel
d
setGicFieldName
(
String
gicFieldName
)
{
this
.
gicFieldName
=
gicFieldName
;
return
this
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
voi
d
setStatus
(
Integer
status
)
{
public
TabCustomUdeskFiel
d
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
return
this
;
}
public
String
getAppId
()
{
return
appId
;
}
public
TabCustomUdeskField
setAppId
(
String
appId
)
{
this
.
appId
=
appId
;
return
this
;
}
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
public
voi
d
setEnterpriseId
(
Integer
enterpriseId
)
{
public
TabCustomUdeskFiel
d
setEnterpriseId
(
Integer
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
return
this
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
voi
d
setCreateTime
(
Date
createTime
)
{
public
TabCustomUdeskFiel
d
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
return
this
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
voi
d
setUpdateTime
(
Date
updateTime
)
{
public
TabCustomUdeskFiel
d
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
return
this
;
}
public
Integer
getFieldType
()
{
return
fieldType
;
}
public
TabCustomUdeskField
setFieldType
(
Integer
fieldType
)
{
this
.
fieldType
=
fieldType
;
return
this
;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/CustomUdeskFieldService.java
View file @
348c9853
package
com
.
gic
.
enterprise
.
service
;
import
com.gic.enterprise.dto.CustomUdeskFieldDTO
;
import
com.gic.enterprise.entity.TabCustomUdeskField
;
import
java.util.List
;
public
interface
CustomUdeskFieldService
{
List
<
TabCustomUdeskField
>
listEnterpriseField
(
Integer
enterpriseId
);
List
<
TabCustomUdeskField
>
listEnterpriseField
(
Integer
enterpriseId
,
String
appId
);
int
saveEnterpriseField
(
TabCustomUdeskField
field
);
int
editEnterpriseField
(
CustomUdeskFieldDTO
dto
);
TabCustomUdeskField
getDetail
(
Integer
fieldId
);
int
deleteFiled
(
Integer
fieldId
);
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/CustomUdeskFiledServiceImpl.java
View file @
348c9853
package
com
.
gic
.
enterprise
.
service
.
impl
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.enterprise.dao.mapper.TabCustomUdeskFieldMapper
;
import
com.gic.enterprise.dto.CustomUdeskFieldDTO
;
import
com.gic.enterprise.entity.TabCustomUdeskField
;
import
com.gic.enterprise.service.CustomUdeskFieldService
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -15,21 +17,30 @@ public class CustomUdeskFiledServiceImpl implements CustomUdeskFieldService {
private
TabCustomUdeskFieldMapper
tabCustomUdeskFieldMapper
;
@Override
public
List
<
TabCustomUdeskField
>
listEnterpriseField
(
Integer
enterpriseId
)
{
return
this
.
tabCustomUdeskFieldMapper
.
listEnterpriseField
(
enterpriseId
);
public
List
<
TabCustomUdeskField
>
listEnterpriseField
(
Integer
enterpriseId
,
String
appId
)
{
return
this
.
tabCustomUdeskFieldMapper
.
listEnterpriseField
(
enterpriseId
,
appId
);
}
@Override
public
int
saveEnterpriseField
(
TabCustomUdeskField
field
)
{
field
.
setUpdateTime
(
new
Date
());
if
(
field
.
getId
()
!=
null
){
return
this
.
tabCustomUdeskFieldMapper
.
updateByPrimaryKey
(
field
);
TabCustomUdeskField
record
=
tabCustomUdeskFieldMapper
.
getUdeskField
(
field
.
getEnterpriseId
(),
field
.
getAppId
(),
field
.
getGicFieldId
());
if
(
record
!=
null
){
return
0
;
}
field
.
setCreateTime
(
new
Date
());
return
this
.
tabCustomUdeskFieldMapper
.
insertSelective
(
field
);
}
@Override
public
int
editEnterpriseField
(
CustomUdeskFieldDTO
dto
)
{
TabCustomUdeskField
record
=
EntityUtil
.
changeEntityNew
(
TabCustomUdeskField
.
class
,
dto
);
record
.
setUpdateTime
(
new
Date
());
return
tabCustomUdeskFieldMapper
.
updateByPrimaryKeySelective
(
record
);
}
@Override
public
TabCustomUdeskField
getDetail
(
Integer
fieldId
)
{
TabCustomUdeskField
tabCustomUdeskField
=
this
.
tabCustomUdeskFieldMapper
.
selectByPrimaryKey
(
fieldId
);
return
tabCustomUdeskField
;
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/CustomUdeskFieldApiServiceImpl.java
View file @
348c9853
...
...
@@ -2,6 +2,7 @@ package com.gic.enterprise.service.outer.impl;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.enterprise.constant.WechatServiceFieldEnum
;
import
com.gic.enterprise.dto.CustomChatFiledDTO
;
import
com.gic.enterprise.dto.CustomUdeskFieldDTO
;
import
com.gic.enterprise.entity.TabCustomUdeskField
;
...
...
@@ -28,16 +29,9 @@ public class CustomUdeskFieldApiServiceImpl implements CustomUdeskFieldApiServic
return
ServiceResponse
.
success
(
list
);
}
List
<
CustomChatFiledDTO
>
list
=
new
ArrayList
<>();
list
.
add
(
new
CustomChatFiledDTO
(
"集团卡号"
,
"cliqueCard"
));
list
.
add
(
new
CustomChatFiledDTO
(
"姓名"
,
"userName"
));
list
.
add
(
new
CustomChatFiledDTO
(
"手机号码"
,
"phoneNumber"
));
list
.
add
(
new
CustomChatFiledDTO
(
"会员卡号"
,
"cardNo"
));
list
.
add
(
new
CustomChatFiledDTO
(
"用户信息"
,
"userInfo"
));
list
.
add
(
new
CustomChatFiledDTO
(
"会员卡等级"
,
"memberGrade"
));
list
.
add
(
new
CustomChatFiledDTO
(
"积分余额"
,
"integralBalance"
));
list
.
add
(
new
CustomChatFiledDTO
(
"最近消费时间"
,
"latestCunsumeTime"
));
list
.
add
(
new
CustomChatFiledDTO
(
"消费次数"
,
"consumeTimes"
));
list
.
add
(
new
CustomChatFiledDTO
(
"消费总额"
,
"consumeTotal"
));
for
(
WechatServiceFieldEnum
fieldEnum
:
WechatServiceFieldEnum
.
values
())
{
list
.
add
(
new
CustomChatFiledDTO
(
fieldEnum
.
getMessage
(),
String
.
valueOf
(
fieldEnum
.
getCode
()),
fieldEnum
.
getFieldType
()));
}
RedisUtil
.
setCache
(
key
,
list
);
return
ServiceResponse
.
success
(
list
);
}
...
...
@@ -49,8 +43,14 @@ public class CustomUdeskFieldApiServiceImpl implements CustomUdeskFieldApiServic
}
@Override
public
ServiceResponse
<
List
<
CustomUdeskFieldDTO
>>
listEnterpriseField
(
Integer
enterpriseId
)
{
List
<
TabCustomUdeskField
>
list
=
this
.
customUdeskFieldService
.
listEnterpriseField
(
enterpriseId
);
public
ServiceResponse
<
Integer
>
editEnterpriseField
(
CustomUdeskFieldDTO
dto
)
{
customUdeskFieldService
.
editEnterpriseField
(
dto
);
return
ServiceResponse
.
success
();
}
@Override
public
ServiceResponse
<
List
<
CustomUdeskFieldDTO
>>
listEnterpriseField
(
Integer
enterpriseId
,
String
appId
)
{
List
<
TabCustomUdeskField
>
list
=
this
.
customUdeskFieldService
.
listEnterpriseField
(
enterpriseId
,
appId
);
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListByJSON
(
CustomUdeskFieldDTO
.
class
,
list
));
}
...
...
gic-platform-enterprise-service/src/main/resources/mapper/TabCustomUdeskFieldMapper.xml
View file @
348c9853
...
...
@@ -4,15 +4,17 @@
<resultMap
id=
"BaseResultMap"
type=
"com.gic.enterprise.entity.TabCustomUdeskField"
>
<id
column=
"id"
jdbcType=
"INTEGER"
property=
"id"
/>
<result
column=
"udesk_field_id"
jdbcType=
"VARCHAR"
property=
"udeskFieldId"
/>
<result
column=
"gic_field_id"
jdbcType=
"
VARCHA
R"
property=
"gicFieldId"
/>
<result
column=
"gic_field_id"
jdbcType=
"
INTEGE
R"
property=
"gicFieldId"
/>
<result
column=
"gic_field_name"
jdbcType=
"VARCHAR"
property=
"gicFieldName"
/>
<result
column=
"status"
jdbcType=
"INTEGER"
property=
"status"
/>
<result
column=
"app_id"
jdbcType=
"VARCHAR"
property=
"appId"
/>
<result
column=
"field_type"
jdbcType=
"INTEGER"
property=
"fieldType"
/>
<result
column=
"enterprise_id"
jdbcType=
"INTEGER"
property=
"enterpriseId"
/>
<result
column=
"create_time"
jdbcType=
"TIMESTAMP"
property=
"createTime"
/>
<result
column=
"update_time"
jdbcType=
"TIMESTAMP"
property=
"updateTime"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
id, udesk_field_id, gic_field_id, gic_field_name, status,
enterprise_id, create_time,
id, udesk_field_id, gic_field_id, gic_field_name, status,
app_id, field_type, enterprise_id, create_time,
update_time
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"BaseResultMap"
>
...
...
@@ -27,10 +29,10 @@
</delete>
<insert
id=
"insert"
parameterType=
"com.gic.enterprise.entity.TabCustomUdeskField"
>
insert into tab_custom_udesk_field (id, udesk_field_id, gic_field_id,
gic_field_name, status,
enterprise_id,
gic_field_name, status,
app_id, field_type, enterprise_id,
create_time, update_time)
values (#{id,jdbcType=INTEGER}, #{udeskFieldId,jdbcType=VARCHAR}, #{gicFieldId,jdbcType=
VARCHAR},
#{gicFieldName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{
enterpriseId,jdbcType=INTEGER},
values (#{id,jdbcType=INTEGER}, #{udeskFieldId,jdbcType=VARCHAR}, #{gicFieldId,jdbcType=
INTEGER},
#{gicFieldName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{
appId,jdbcType=VARCHAR}, #{fieldType,jdbcType=INTEGER},#{enterpriseId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.gic.enterprise.entity.TabCustomUdeskField"
>
...
...
@@ -51,6 +53,12 @@
<if
test=
"status != null"
>
status,
</if>
<if
test=
"appId != null"
>
app_id,
</if>
<if
test=
"fieldType != null"
>
field_type,
</if>
<if
test=
"enterpriseId != null"
>
enterprise_id,
</if>
...
...
@@ -69,7 +77,7 @@
#{udeskFieldId,jdbcType=VARCHAR},
</if>
<if
test=
"gicFieldId != null"
>
#{gicFieldId,jdbcType=
VARCHA
R},
#{gicFieldId,jdbcType=
INTEGE
R},
</if>
<if
test=
"gicFieldName != null"
>
#{gicFieldName,jdbcType=VARCHAR},
...
...
@@ -77,6 +85,12 @@
<if
test=
"status != null"
>
#{status,jdbcType=INTEGER},
</if>
<if
test=
"appId != null"
>
#{appId,jdbcType=VARCHAR},
</if>
<if
test=
"fieldType != null"
>
#{field_type,jdbcType=INTEGER},
</if>
<if
test=
"enterpriseId != null"
>
#{enterpriseId,jdbcType=INTEGER},
</if>
...
...
@@ -95,7 +109,7 @@
udesk_field_id = #{udeskFieldId,jdbcType=VARCHAR},
</if>
<if
test=
"gicFieldId != null"
>
gic_field_id = #{gicFieldId,jdbcType=
VARCHA
R},
gic_field_id = #{gicFieldId,jdbcType=
INTEGE
R},
</if>
<if
test=
"gicFieldName != null"
>
gic_field_name = #{gicFieldName,jdbcType=VARCHAR},
...
...
@@ -103,6 +117,12 @@
<if
test=
"status != null"
>
status = #{status,jdbcType=INTEGER},
</if>
<if
test=
"appId != null"
>
app_id = #{appId,jdbcType=VARCHAR},
</if>
<if
test=
"fieldType != null"
>
field_type = #{fieldType,jdbcType=INTEGER},
</if>
<if
test=
"enterpriseId != null"
>
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
...
...
@@ -118,9 +138,11 @@
<update
id=
"updateByPrimaryKey"
parameterType=
"com.gic.enterprise.entity.TabCustomUdeskField"
>
update tab_custom_udesk_field
set udesk_field_id = #{udeskFieldId,jdbcType=VARCHAR},
gic_field_id = #{gicFieldId,jdbcType=
VARCHA
R},
gic_field_id = #{gicFieldId,jdbcType=
INTEGE
R},
gic_field_name = #{gicFieldName,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
app_id = #{appId,jdbcType=VARCHAR},
field_type = #{fieldType,jdbcType=INTEGER},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
...
...
@@ -130,6 +152,16 @@
select
<include
refid=
"Base_Column_List"
/>
from tab_custom_udesk_field
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and (status=1 or status=2)
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status=1
and app_id = #{appId}
</select>
<select
id=
"getUdeskField"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_custom_udesk_field
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0
and app_id = #{appId}
and gic_field_id = #{gicFieldId}
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/CustomChatController.java
View file @
348c9853
...
...
@@ -3,6 +3,7 @@ package com.gic.enterprise.web.controller;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.constant.WechatServiceFieldEnum
;
import
com.gic.enterprise.constant.applet.AppletPageTypeEnum
;
import
com.gic.enterprise.dto.AppletCustomPageDTO
;
import
com.gic.enterprise.dto.CustomChatFiledDTO
;
...
...
@@ -10,13 +11,18 @@ import com.gic.enterprise.dto.CustomUdeskFieldDTO;
import
com.gic.enterprise.qo.AppletPageQO
;
import
com.gic.enterprise.service.AppletCustomPageApiService
;
import
com.gic.enterprise.service.CustomUdeskFieldApiService
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
org.apache.catalina.User
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
/** @Description: 小程序配置客户服务
* @author taogs
...
...
@@ -57,25 +63,21 @@ public class CustomChatController {
}
@RequestMapping
(
"list-enterprise-field"
)
public
RestResponse
listEnterpriseField
(){
ServiceResponse
<
List
<
CustomUdeskFieldDTO
>>
response
=
this
.
customUdeskFieldApiService
.
listEnterpriseField
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
if
(
response
.
isSuccess
()){
return
RestResponse
.
success
(
response
.
getResult
());
public
RestResponse
listEnterpriseField
(
String
appId
)
{
//初始化
for
(
WechatServiceFieldEnum
fieldEnum
:
WechatServiceFieldEnum
.
values
())
{
customUdeskFieldApiService
.
saveEnterpriseField
(
new
CustomUdeskFieldDTO
()
.
setAppId
(
appId
)
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
())
.
setGicFieldId
(
fieldEnum
.
getCode
())
.
setGicFieldName
(
fieldEnum
.
getMessage
())
.
setStatus
(
0
)
.
setFieldType
(
fieldEnum
.
getFieldType
()));
}
return
RestResponse
.
success
();
}
@RequestMapping
(
"save-enterprise-field"
)
public
RestResponse
saveEnterpriseField
(
String
udeskFieldId
,
String
gicFieldId
,
String
gicFieldName
,
Integer
id
){
CustomUdeskFieldDTO
dto
=
new
CustomUdeskFieldDTO
();
dto
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
dto
.
setGicFieldId
(
gicFieldId
);
dto
.
setId
(
id
);
dto
.
setGicFieldName
(
gicFieldName
);
dto
.
setStatus
(
1
);
dto
.
setUdeskFieldId
(
udeskFieldId
);
this
.
customUdeskFieldApiService
.
saveEnterpriseField
(
dto
);
return
RestResponse
.
success
();
ServiceResponse
<
List
<
CustomUdeskFieldDTO
>>
response
=
this
.
customUdeskFieldApiService
.
listEnterpriseField
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
appId
);
return
ResultControllerUtils
.
commonResult
(
response
);
}
@RequestMapping
(
"get-enterprise-field-detail"
)
...
...
@@ -84,6 +86,11 @@ public class CustomChatController {
return
RestResponse
.
success
(
response
.
getResult
());
}
@RequestMapping
(
"edit-enterprise-field-detail"
)
public
RestResponse
editEnterpriseFieldDetail
(
CustomUdeskFieldDTO
dto
){
return
ResultControllerUtils
.
commonResult
(
this
.
customUdeskFieldApiService
.
editEnterpriseField
(
dto
));
}
@RequestMapping
(
"delete-enterprise-field"
)
public
RestResponse
deleteEnterpriseField
(
Integer
id
){
ServiceResponse
<
Integer
>
response
=
this
.
customUdeskFieldApiService
.
deleteField
(
id
);
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/UdeskFieldVO.java
0 → 100644
View file @
348c9853
package
com
.
gic
.
enterprise
.
web
.
vo
;
import
java.io.Serializable
;
/**
* 客服页面装修udesk类型的自定义字段
* @ClassName: UdeskFieldVO
* @Description:
* @author guojuxing
* @date 2020/7/21 11:11 AM
*/
public
class
UdeskFieldVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1106172629914018235L
;
/**
*
*/
private
Integer
id
;
/**
*
*/
private
String
udeskFieldId
;
/**
*
*/
private
String
gicFieldId
;
/**
*
*/
private
String
gicFieldName
;
public
Integer
getId
()
{
return
id
;
}
public
UdeskFieldVO
setId
(
Integer
id
)
{
this
.
id
=
id
;
return
this
;
}
public
String
getUdeskFieldId
()
{
return
udeskFieldId
;
}
public
UdeskFieldVO
setUdeskFieldId
(
String
udeskFieldId
)
{
this
.
udeskFieldId
=
udeskFieldId
;
return
this
;
}
public
String
getGicFieldId
()
{
return
gicFieldId
;
}
public
UdeskFieldVO
setGicFieldId
(
String
gicFieldId
)
{
this
.
gicFieldId
=
gicFieldId
;
return
this
;
}
public
String
getGicFieldName
()
{
return
gicFieldName
;
}
public
UdeskFieldVO
setGicFieldName
(
String
gicFieldName
)
{
this
.
gicFieldName
=
gicFieldName
;
return
this
;
}
}
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