Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
6aefdabe
Commit
6aefdabe
authored
Jul 29, 2019
by
宋祥
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dx' into 'master'
关键词配置优化-运营需求 See merge request rays/pcloud-book!62
parents
9140f530
57536923
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
354 additions
and
37 deletions
+354
-37
BookGroupClassifyBizImpl.java
.../pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
+28
-0
SyncKeyworsVO.java
...src/main/java/com/pcloud/book/group/vo/SyncKeyworsVO.java
+56
-0
BookKeywordBiz.java
...ain/java/com/pcloud/book/keywords/biz/BookKeywordBiz.java
+7
-1
BookKeywordBizImpl.java
...com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java
+122
-26
BookKeywordDao.java
...ain/java/com/pcloud/book/keywords/dao/BookKeywordDao.java
+15
-0
BookKeywordDaoImpl.java
...com/pcloud/book/keywords/dao/impl/BookKeywordDaoImpl.java
+16
-0
BookKeyword.java
...ain/java/com/pcloud/book/keywords/entity/BookKeyword.java
+5
-0
BookKeywordFacade.java
...va/com/pcloud/book/keywords/facade/BookKeywordFacade.java
+11
-5
BookKeywordFacadeImpl.java
...loud/book/keywords/facade/impl/BookKeywordFacadeImpl.java
+12
-4
DeleteKeywordVO.java
...ain/java/com/pcloud/book/keywords/vo/DeleteKeywordVO.java
+28
-0
ListKeywordVO.java
.../main/java/com/pcloud/book/keywords/vo/ListKeywordVO.java
+3
-0
BookKeyword.Mapper.xml
...src/main/resources/mapper/keywords/BookKeyword.Mapper.xml
+51
-1
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
View file @
6aefdabe
...
...
@@ -32,6 +32,8 @@ import com.pcloud.book.group.enums.RankTypeEnum;
import
com.pcloud.book.group.set.GroupSet
;
import
com.pcloud.book.group.tools.SendWeixinRequestTools
;
import
com.pcloud.book.group.vo.*
;
import
com.pcloud.book.keywords.dao.BookKeywordDao
;
import
com.pcloud.book.keywords.entity.BookKeyword
;
import
com.pcloud.common.core.aspect.ParamLog
;
import
com.pcloud.common.core.constant.SystemCode
;
import
com.pcloud.common.core.enums.NotifyOriginTypeEnum
;
...
...
@@ -115,7 +117,11 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
@Autowired
private
LabelService
labelService
;
@Autowired
private
BookKeywordDao
bookKeywordDao
;
@Autowired
private
GroupSet
groupSet
;
@Autowired
private
BookGroupClassifyBiz
bookGroupClassifyBiz
;
@Override
@ParamLog
(
"新增分类"
)
...
...
@@ -170,6 +176,28 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
bookGroupClassifyDao
.
updateSpecId
(
bookGroupClassify
.
getId
(),
bookGroupClassify
.
getProductSpecId
());
//发送更新群名称请求
// String robotId = wechatGroupConsr.getRobotIdByGroupId(oneQrcode.getWeixinGroupId());
//同步关键词
List
<
BookKeyword
>
bookKeywords
=
new
ArrayList
<>();
List
<
SyncKeyworsVO
>
syncKeyworsVOS
=
bookKeywordDao
.
getKeywordsIdsByBookGroupId
(
addClassifyVO
.
getBookGroupId
());
syncKeyworsVOS
.
forEach
(
e
->
{
BookKeyword
bookKeyword
=
new
BookKeyword
();
bookKeyword
.
setBookGroupId
(
addClassifyVO
.
getBookGroupId
());
bookKeyword
.
setClassifyId
(
bookGroupClassify
.
getId
());
bookKeyword
.
setKeywordId
(
e
.
getKeywordsId
());
bookKeyword
.
setBookId
(
addClassifyVO
.
getBookId
());
bookKeyword
.
setChannelId
(
addClassifyVO
.
getChannelId
());
bookKeyword
.
setSetType
(
0
);
//获取最大排序值
Integer
seq
=
bookKeywordDao
.
getMaxRank
(
addClassifyVO
.
getBookGroupId
(),
bookKeyword
.
getClassifyId
());
bookKeyword
.
setRank
(
seq
+
1
);
bookKeyword
.
setCreateUser
(
partyId
);
bookKeyword
.
setWarehouseId
(
e
.
getWarehouseId
());
bookKeyword
.
setIsWarehouse
(
e
.
getIsWarehouse
());
bookKeyword
.
setIsEdit
(
0
);
bookKeywords
.
add
(
bookKeyword
);
});
bookKeywordDao
.
insert
(
bookKeywords
);
SendWeixinRequestTools
.
changeGroupName
(
oneQrcode
.
getRobotWxId
(),
oneQrcode
.
getWeixinGroupId
(),
groupQrcode
.
getGroupName
());
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/SyncKeyworsVO.java
0 → 100644
View file @
6aefdabe
package
com
.
pcloud
.
book
.
group
.
vo
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
java.io.Serializable
;
/**
* @author 戴兴
* @description TODO
* @date 2019/7/16 16:34
*/
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
class
SyncKeyworsVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
3548004941763949055L
;
private
Long
keywordsId
;
private
Integer
isWarehouse
;
private
Long
warehouseId
;
public
Long
getKeywordsId
()
{
return
keywordsId
;
}
public
void
setKeywordsId
(
Long
keywordsId
)
{
this
.
keywordsId
=
keywordsId
;
}
public
Integer
getIsWarehouse
()
{
return
isWarehouse
;
}
public
void
setIsWarehouse
(
Integer
isWarehouse
)
{
this
.
isWarehouse
=
isWarehouse
;
}
public
Long
getWarehouseId
()
{
return
warehouseId
;
}
public
void
setWarehouseId
(
Long
warehouseId
)
{
this
.
warehouseId
=
warehouseId
;
}
@Override
public
String
toString
()
{
return
"SyncKeyworsVO{"
+
"keywordsId="
+
keywordsId
+
", isWarehouse="
+
isWarehouse
+
", warehouseId="
+
warehouseId
+
'}'
;
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/BookKeywordBiz.java
View file @
6aefdabe
...
...
@@ -35,7 +35,7 @@ public interface BookKeywordBiz {
* @Desr:删除关键词
* @Date:2019/4/25 10:53
*/
void
deleteKeyword
(
Long
keywordId
,
Long
partyId
);
void
deleteKeyword
(
DeleteKeywordVO
deleteKeywordVO
,
Long
partyId
);
/**
* @Author:lili
...
...
@@ -83,6 +83,12 @@ public interface BookKeywordBiz {
PageBeanNew
<
KeywordStatisticsDTO
>
getKeywordStatistics
(
Integer
currentPage
,
Integer
numPerPage
,
Long
bookGroupId
,
String
weixinGroupId
);
/**
* @description 获取关键词个数
* @author 戴兴
* @date 2019/7/18 15:55
*/
Integer
getKeywordCount
(
Long
bookGroupId
,
Long
classifyId
);
/**
* 获取某个群内关键词配置的所有资源
* @param qrWeixinParam
* @return
...
...
pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java
View file @
6aefdabe
...
...
@@ -21,6 +21,7 @@ import com.pcloud.book.group.entity.AppTouchRecord;
import
com.pcloud.book.group.entity.GroupQrcode
;
import
com.pcloud.book.group.enums.TouchTypeEnum
;
import
com.pcloud.book.group.tools.SendWeixinRequestTools
;
import
com.pcloud.book.group.vo.ClassifyNameVO
;
import
com.pcloud.book.keywords.biz.BookKeywordBiz
;
import
com.pcloud.book.keywords.dao.BookKeywordDao
;
import
com.pcloud.book.keywords.dao.BookKeywordRecordDao
;
...
...
@@ -143,28 +144,100 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
}
productConsr
.
productAutoOnShelves
(
bookGroupDTO
.
getChannelId
(),
productIds
);
//新增关键词与分类或者图书的关系
BookKeyword
bookKeyword
=
new
BookKeyword
();
BeanUtils
.
copyProperties
(
setKeywordVO
,
bookKeyword
);
bookKeyword
.
setKeywordId
(
keyword
.
getId
());
bookKeyword
.
setBookId
(
bookGroupDTO
.
getBookId
());
bookKeyword
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
//获取最大排序值
Integer
rank
=
bookKeywordDao
.
getMaxRank
(
setKeywordVO
.
getBookGroupId
(),
bookKeyword
.
getClassifyId
());
bookKeyword
.
setRank
(
rank
+
1
);
bookKeyword
.
setCreateUser
(
setKeywordVO
.
getUserId
());
if
(
null
!=
setKeywordVO
.
getAddWarehouse
()
&&
1
==
setKeywordVO
.
getAddWarehouse
())
{
setKeywordVO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
final
Long
warehouseId
=
bookKeywordWarehouseBiz
.
addBookKeyword
(
setKeywordVO
);
bookKeyword
.
setWarehouseId
(
warehouseId
);
bookKeyword
.
setIsWarehouse
(
1
);
}
if
(
null
==
bookKeyword
.
getIsWarehouse
()){
bookKeyword
.
setIsWarehouse
(
0
);
}
if
(
null
==
bookKeyword
.
getWarehouseId
()){
bookKeyword
.
setWarehouseId
(
0L
);
}
bookKeywordDao
.
insert
(
bookKeyword
);
//按群创建
if
(
setKeywordVO
.
getSetType
()
==
1
){
BookKeyword
bookKeyword
=
new
BookKeyword
();
BeanUtils
.
copyProperties
(
setKeywordVO
,
bookKeyword
);
bookKeyword
.
setKeywordId
(
keyword
.
getId
());
bookKeyword
.
setBookId
(
bookGroupDTO
.
getBookId
());
bookKeyword
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
//获取最大排序值
Integer
rank
=
bookKeywordDao
.
getMaxRank
(
setKeywordVO
.
getBookGroupId
(),
bookKeyword
.
getClassifyId
());
bookKeyword
.
setRank
(
rank
+
1
);
bookKeyword
.
setCreateUser
(
setKeywordVO
.
getUserId
());
if
(
null
!=
setKeywordVO
.
getAddWarehouse
()
&&
1
==
setKeywordVO
.
getAddWarehouse
())
{
setKeywordVO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
final
Long
warehouseId
=
bookKeywordWarehouseBiz
.
addBookKeyword
(
setKeywordVO
);
bookKeyword
.
setWarehouseId
(
warehouseId
);
bookKeyword
.
setIsWarehouse
(
1
);
}
if
(
null
==
bookKeyword
.
getIsWarehouse
()){
bookKeyword
.
setIsWarehouse
(
0
);
}
if
(
null
==
bookKeyword
.
getWarehouseId
()){
bookKeyword
.
setWarehouseId
(
0L
);
}
bookKeyword
.
setIsEdit
(
1
);
bookKeywordDao
.
insert
(
bookKeyword
);
}
//按书创建
else
{
List
<
ClassifyNameVO
>
classifyNameVOS
=
bookGroupClassifyDao
.
listClassifyByRank
(
setKeywordVO
.
getBookGroupId
());
List
<
BookKeyword
>
bookKeywords
=
new
ArrayList
<>();
//创建群的记录
if
(!
ListUtils
.
isEmpty
(
classifyNameVOS
))
{
classifyNameVOS
.
forEach
(
e
->
{
BookKeyword
bookKeyword
=
new
BookKeyword
();
BeanUtils
.
copyProperties
(
setKeywordVO
,
bookKeyword
);
bookKeyword
.
setKeywordId
(
keyword
.
getId
());
bookKeyword
.
setBookId
(
bookGroupDTO
.
getBookId
());
bookKeyword
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
bookKeyword
.
setClassifyId
(
e
.
getId
());
//获取最大排序值
Integer
rank
=
bookKeywordDao
.
getMaxRank
(
setKeywordVO
.
getBookGroupId
(),
bookKeyword
.
getClassifyId
());
bookKeyword
.
setRank
(
rank
+
1
);
bookKeyword
.
setCreateUser
(
setKeywordVO
.
getUserId
());
if
(
null
!=
setKeywordVO
.
getAddWarehouse
()
&&
1
==
setKeywordVO
.
getAddWarehouse
())
{
setKeywordVO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
final
Long
warehouseId
=
bookKeywordWarehouseBiz
.
addBookKeyword
(
setKeywordVO
);
bookKeyword
.
setWarehouseId
(
warehouseId
);
bookKeyword
.
setIsWarehouse
(
1
);
}
if
(
null
==
bookKeyword
.
getIsWarehouse
())
{
bookKeyword
.
setIsWarehouse
(
0
);
}
if
(
null
==
bookKeyword
.
getWarehouseId
())
{
bookKeyword
.
setWarehouseId
(
0L
);
}
if
(
0
==
bookKeyword
.
getClassifyId
())
{
bookKeyword
.
setIsEdit
(
1
);
}
else
{
bookKeyword
.
setIsEdit
(
0
);
}
bookKeywords
.
add
(
bookKeyword
);
});
}
//创建书的记录
BookKeyword
bookKeyword
=
new
BookKeyword
();
BeanUtils
.
copyProperties
(
setKeywordVO
,
bookKeyword
);
bookKeyword
.
setKeywordId
(
keyword
.
getId
());
bookKeyword
.
setBookId
(
bookGroupDTO
.
getBookId
());
bookKeyword
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
//获取最大排序值
Integer
rank
=
bookKeywordDao
.
getMaxRank
(
setKeywordVO
.
getBookGroupId
(),
bookKeyword
.
getClassifyId
());
bookKeyword
.
setRank
(
rank
+
1
);
bookKeyword
.
setCreateUser
(
setKeywordVO
.
getUserId
());
if
(
null
!=
setKeywordVO
.
getAddWarehouse
()
&&
1
==
setKeywordVO
.
getAddWarehouse
())
{
setKeywordVO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
final
Long
warehouseId
=
bookKeywordWarehouseBiz
.
addBookKeyword
(
setKeywordVO
);
bookKeyword
.
setWarehouseId
(
warehouseId
);
bookKeyword
.
setIsWarehouse
(
1
);
}
if
(
null
==
bookKeyword
.
getIsWarehouse
())
{
bookKeyword
.
setIsWarehouse
(
0
);
}
if
(
null
==
bookKeyword
.
getWarehouseId
())
{
bookKeyword
.
setWarehouseId
(
0L
);
}
if
(
0
==
bookKeyword
.
getClassifyId
())
{
bookKeyword
.
setIsEdit
(
1
);
}
else
{
bookKeyword
.
setIsEdit
(
0
);
}
bookKeywords
.
add
(
bookKeyword
);
bookKeywordDao
.
insert
(
bookKeywords
);
}
}
@Override
...
...
@@ -237,9 +310,20 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@ParamLog
(
"删除关键词"
)
public
void
deleteKeyword
(
Long
keywordId
,
Long
partyId
)
{
keywordDao
.
deleteById
(
keywordId
,
partyId
);
bookKeywordDao
.
deleteById
(
keywordId
,
partyId
);
public
void
deleteKeyword
(
DeleteKeywordVO
deleteKeywordVO
,
Long
partyId
)
{
if
(
deleteKeywordVO
==
null
||
deleteKeywordVO
.
getIsEdit
()
==
null
||
deleteKeywordVO
.
getKeywordId
()
==
null
){
throw
new
BookBizException
(
BookBizException
.
ERROR
,
"缺少必要参数"
);
}
if
(
deleteKeywordVO
.
getClassifyId
()
==
null
){
deleteKeywordVO
.
setClassifyId
(
0L
);
}
if
(
deleteKeywordVO
.
getIsEdit
()
==
1
){
keywordDao
.
deleteById
(
deleteKeywordVO
.
getKeywordId
(),
partyId
);
bookKeywordDao
.
deleteById
(
deleteKeywordVO
.
getKeywordId
(),
partyId
);
}
else
{
bookKeywordDao
.
deleteKeywords
(
deleteKeywordVO
.
getKeywordId
(),
deleteKeywordVO
.
getBookGroupId
(),
deleteKeywordVO
.
getClassifyId
(),
partyId
);
}
}
@Override
...
...
@@ -273,6 +357,9 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
if
(
"PRODUCT"
.
equalsIgnoreCase
(
vo
.
getServeType
()))
{
productIds
.
add
(
vo
.
getServeId
());
}
if
(
vo
.
getIsEdit
()
==
null
){
vo
.
setIsEdit
(
1
);
}
}
Map
<
Long
,
AppDto
>
app
=
Maps
.
newHashMap
();
if
(!
CollectionUtils
.
isEmpty
(
appIds
))
{
...
...
@@ -496,7 +583,16 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
return
pageBeanNew
;
}
@Override
public
Integer
getKeywordCount
(
Long
bookGroupId
,
Long
classifyId
)
{
if
(
bookGroupId
==
null
){
throw
new
BookBizException
(
BookBizException
.
ERROR
,
"缺少参数bookGroupId"
);
}
if
(
classifyId
==
null
){
classifyId
=
0L
;
}
return
bookKeywordDao
.
getKeywordCount
(
bookGroupId
,
classifyId
);
}
@Override
...
...
pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/BookKeywordDao.java
View file @
6aefdabe
package
com
.
pcloud
.
book
.
keywords
.
dao
;
import
com.pcloud.book.group.vo.SyncKeyworsVO
;
import
com.pcloud.book.keywords.dto.KeywordDTO
;
import
com.pcloud.book.keywords.dto.ReplyKeywordDTO
;
import
com.pcloud.book.keywords.entity.BookKeyword
;
...
...
@@ -83,4 +84,18 @@ public interface BookKeywordDao extends BaseDao<BookKeyword> {
* @return
*/
List
<
ListKeywordVO
>
getKeywordsByClassifyIds
(
List
<
Long
>
classifyIds
,
Long
bookId
);
/**
* @description 根据booGroupId获取关键词id
* @author 戴兴
* @date 2019/7/16 15:28
*/
List
<
SyncKeyworsVO
>
getKeywordsIdsByBookGroupId
(
Long
bookGroupId
);
/**
* @description 按群删除关键词
* @author 戴兴
* @date 2019/7/16 17:18
*/
void
deleteKeywords
(
Long
keywordId
,
Long
bookGroupId
,
Long
classifyId
,
Long
partyId
);
}
pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/impl/BookKeywordDaoImpl.java
View file @
6aefdabe
...
...
@@ -2,6 +2,7 @@ package com.pcloud.book.keywords.dao.impl;
import
com.google.common.collect.Maps
;
import
com.pcloud.book.group.vo.SyncKeyworsVO
;
import
com.pcloud.book.keywords.dao.BookKeywordDao
;
import
com.pcloud.book.keywords.dto.KeywordDTO
;
import
com.pcloud.book.keywords.dto.ReplyKeywordDTO
;
...
...
@@ -98,4 +99,19 @@ public class BookKeywordDaoImpl extends BaseDaoImpl<BookKeyword> implements Book
paramMap
.
put
(
"bookId"
,
bookId
);
return
this
.
getSqlSession
().
selectList
(
this
.
getStatement
(
"getKeywordsByClassifyIds"
),
paramMap
);
}
@Override
public
List
<
SyncKeyworsVO
>
getKeywordsIdsByBookGroupId
(
Long
bookGroupId
)
{
return
this
.
getSqlSession
().
selectList
(
this
.
getStatement
(
"getKeywordsIdsByBookGroupId"
),
bookGroupId
);
}
@Override
public
void
deleteKeywords
(
Long
keywordId
,
Long
bookGroupId
,
Long
classifyId
,
Long
partyId
)
{
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"keywordId"
,
keywordId
);
paramMap
.
put
(
"bookGroupId"
,
bookGroupId
);
paramMap
.
put
(
"classifyId"
,
classifyId
);
paramMap
.
put
(
"partyId"
,
partyId
);
this
.
getSqlSession
().
update
(
this
.
getStatement
(
"deleteKeywords"
),
paramMap
);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/keywords/entity/BookKeyword.java
View file @
6aefdabe
...
...
@@ -84,5 +84,10 @@ public class BookKeyword extends BaseEntity {
*/
private
Date
updateTime
;
/**
* 创建类型0-按书创建,1-按群创建
*/
private
Integer
isEdit
;
}
pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/BookKeywordFacade.java
View file @
6aefdabe
...
...
@@ -34,7 +34,7 @@ public interface BookKeywordFacade {
@ApiOperation
(
value
=
"设置关键词"
,
httpMethod
=
"POST"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"token"
,
value
=
"token"
,
dataType
=
"String"
,
paramType
=
"header"
),
@ApiImplicitParam
(
name
=
"setKeywordVO"
,
value
=
"设置关键词"
,
dataType
=
"
SetKeywordVO
"
,
paramType
=
"body"
)
@ApiImplicitParam
(
name
=
"setKeywordVO"
,
value
=
"设置关键词"
,
dataType
=
"
List<SetKeywordVO>
"
,
paramType
=
"body"
)
})
@PostMapping
(
"insertKeyword"
)
ResponseDto
<?>
insertKeyword
(
@RequestHeader
(
"token"
)
String
token
,
@RequestBody
List
<
SetKeywordVO
>
setKeywordVOs
)
...
...
@@ -49,13 +49,13 @@ public interface BookKeywordFacade {
ResponseDto
<?>
updateKeyword
(
@RequestHeader
(
"token"
)
String
token
,
@RequestBody
UpdateKeywordVO
updateKeywordVO
)
throws
BizException
,
PermissionException
;
@ApiOperation
(
value
=
"删除关键词"
,
httpMethod
=
"
GE
T"
)
@ApiOperation
(
value
=
"删除关键词"
,
httpMethod
=
"
POS
T"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"token"
,
value
=
"token"
,
dataType
=
"String"
,
paramType
=
"header"
),
@ApiImplicitParam
(
name
=
"
keywordId"
,
value
=
"关键词标识"
,
dataType
=
"Long"
,
paramType
=
"quer
y"
)
@ApiImplicitParam
(
name
=
"
deleteKeywordVO"
,
value
=
"关键词删除VO"
,
dataType
=
"DeleteKeywordVO"
,
paramType
=
"bod
y"
)
})
@
Ge
tMapping
(
"deleteKeyword"
)
ResponseDto
<?>
deleteKeyword
(
@RequestHeader
(
"token"
)
String
token
,
@Request
Param
(
"keywordId"
)
Long
keywordId
)
@
Pos
tMapping
(
"deleteKeyword"
)
ResponseDto
<?>
deleteKeyword
(
@RequestHeader
(
"token"
)
String
token
,
@Request
Body
DeleteKeywordVO
deleteKeywordVO
)
throws
BizException
,
PermissionException
;
...
...
@@ -106,6 +106,12 @@ public interface BookKeywordFacade {
@RequestParam
(
value
=
"weixinGroupId"
,
required
=
false
)
String
weixinGroupId
)
throws
BizException
,
PermissionException
;
@ApiOperation
(
"获取关键词数量"
)
@GetMapping
(
"getKeywordCount"
)
ResponseDto
<?>
getKeywordCount
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
"bookGroupId"
)
Long
bookGroupId
,
@RequestParam
(
required
=
false
,
value
=
"classifyId"
)
Long
classifyId
)
throws
PermissionException
;
@ApiOperation
(
"获取某个群内关键词配置的所有资源"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"userInfo"
,
value
=
"Cookie"
,
dataType
=
"string"
,
paramType
=
"header"
),
...
...
pcloud-service-book/src/main/java/com/pcloud/book/keywords/facade/impl/BookKeywordFacadeImpl.java
View file @
6aefdabe
...
...
@@ -58,10 +58,10 @@ public class BookKeywordFacadeImpl implements BookKeywordFacade {
}
@Override
@
Ge
tMapping
(
"deleteKeyword"
)
public
ResponseDto
<?>
deleteKeyword
(
@RequestHeader
(
"token"
)
String
token
,
@Request
Param
(
"keywordId"
)
Long
keywordId
)
throws
BizException
,
PermissionException
{
@
Pos
tMapping
(
"deleteKeyword"
)
public
ResponseDto
<?>
deleteKeyword
(
@RequestHeader
(
"token"
)
String
token
,
@Request
Body
DeleteKeywordVO
deleteKeywordVO
)
throws
BizException
,
PermissionException
{
Long
partyId
=
(
Long
)
SessionUtil
.
getVlaue
(
token
,
SessionUtil
.
PARTY_ID
);
bookKeywordBiz
.
deleteKeyword
(
keywordId
,
partyId
);
bookKeywordBiz
.
deleteKeyword
(
deleteKeywordVO
,
partyId
);
return
new
ResponseDto
<>();
}
...
...
@@ -116,7 +116,15 @@ public class BookKeywordFacadeImpl implements BookKeywordFacade {
return
new
ResponseDto
<>(
bookKeywordBiz
.
getKeywordStatistics
(
currentPage
,
numPerPage
,
bookGroupId
,
weixinGroupId
));
}
@Override
@ApiOperation
(
"获取关键词数量"
)
@GetMapping
(
"getKeywordCount"
)
public
ResponseDto
<?>
getKeywordCount
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
"bookGroupId"
)
Long
bookGroupId
,
@RequestParam
(
required
=
false
,
value
=
"classifyId"
)
Long
classifyId
)
throws
PermissionException
{
SessionUtil
.
getVlaue
(
token
,
SessionUtil
.
PARTY_ID
);
Integer
keywordCount
=
bookKeywordBiz
.
getKeywordCount
(
bookGroupId
,
classifyId
);
return
new
ResponseDto
<>(
keywordCount
);
}
@ApiOperation
(
"获取某个群内关键词配置的所有资源"
)
@PostMapping
(
"getAllServiceByWeixinGroup4Wechat"
)
...
...
pcloud-service-book/src/main/java/com/pcloud/book/keywords/vo/DeleteKeywordVO.java
0 → 100644
View file @
6aefdabe
package
com
.
pcloud
.
book
.
keywords
.
vo
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @author 戴兴
* @description TODO
* @date 2019/7/16 17:06
*/
@Data
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
class
DeleteKeywordVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
3814214370941974682L
;
private
Long
keywordId
;
private
Long
bookGroupId
;
private
Long
classifyId
;
private
Integer
isEdit
;
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/keywords/vo/ListKeywordVO.java
View file @
6aefdabe
...
...
@@ -79,4 +79,7 @@ public class ListKeywordVO implements Serializable {
@ApiModelProperty
(
"来源APP应用,PRODUCT作品,SUPER_PRODUCT超级作者作品"
)
private
String
apSource
;
@ApiModelProperty
(
"是否可编辑0-否,1-是"
)
private
Integer
isEdit
;
}
pcloud-service-book/src/main/resources/mapper/keywords/BookKeyword.Mapper.xml
View file @
6aefdabe
...
...
@@ -17,6 +17,7 @@
warehouse_id,
create_user,
create_time,
is_edit,
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
#{bookId,jdbcType=BIGINT},
...
...
@@ -30,8 +31,38 @@
#{warehouseId,jdbcType=BIGINT},
#{createUser,jdbcType=BIGINT},
NOW(),
#{isEdit,jdbcType=TINYINT},
</trim>
</insert>
<insert
id=
"batchInsert"
parameterType=
"bookKeyword"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
insert into book_keyword(book_id,
channel_id,
book_group_id,
classify_id,
set_type,
rank,
keyword_id,
is_warehouse,
warehouse_id,
create_user,
create_time,
is_edit) values
<foreach
collection=
"list"
item=
"item"
separator=
","
>
(#{item.bookId,jdbcType=BIGINT},
#{item.channelId,jdbcType=BIGINT},
#{item.bookGroupId,jdbcType=BIGINT},
#{item.classifyId,jdbcType=BIGINT},
#{item.setType,jdbcType=TINYINT},
#{item.rank,jdbcType=TINYINT},
#{item.keywordId,jdbcType=BIGINT},
#{item.isWarehouse,jdbcType=TINYINT},
#{item.warehouseId,jdbcType=BIGINT},
#{item.createUser,jdbcType=BIGINT},
NOW(),
#{item.isEdit,jdbcType=TINYINT})
</foreach>
</insert>
<update
id=
"deleteById"
parameterType=
"map"
>
update book_keyword
...
...
@@ -82,7 +113,8 @@
k.serve_id serveId,
k.serve_type serveType,
bk.is_warehouse as isWarehouse,
bk.warehouse_id as warehouseId
bk.warehouse_id as warehouseId,
bk.is_edit as isEdit
FROM
book_keyword bk
JOIN
...
...
@@ -261,6 +293,24 @@
ORDER BY
bk.rank ASC,bk.id DESC
</select>
<select
id=
"getKeywordsIdsByBookGroupId"
parameterType=
"long"
resultType=
"com.pcloud.book.group.vo.SyncKeyworsVO"
>
select k.id keywordsId, bk.is_warehouse isWarehouse, bk.warehouse_id warehouseId from book_keyword bk
JOIN keyword k ON bk.keyword_id = k.id where bk.book_group_id = #{bookGroupId}
</select>
<update
id=
"deleteKeywords"
parameterType=
"map"
>
update book_keyword
<set>
is_delete = 1,
update_user = #{partyId},
update_time = now()
</set>
where keyword_id = #{keywordId,jdbcType=BIGINT}
and book_group_id = #{bookGroupId,jdbcType=BIGINT}
and classify_id = #{classifyId,jdbcType=BIGINT}
</update>
<select
id=
"getServiceByWeixinGroup"
parameterType=
"map"
resultType=
"com.pcloud.book.keywords.dto.ServiceResourceDTO"
>
SELECT
t.channel_id as channelId,
...
...
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