Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
354a31bf
Commit
354a31bf
authored
Sep 22, 2023
by
王祖波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
素材知识库
parent
0ea93dab
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
609 additions
and
39 deletions
+609
-39
ContentMaterialController.java
...age/web/controller/content/ContentMaterialController.java
+106
-26
MaterialDataAdaptor.java
...e/web/controller/content/adaptor/MaterialDataAdaptor.java
+36
-9
ContentMaterialClerkQO.java
.../haoban/manage/web/qo/content/ContentMaterialClerkQO.java
+48
-0
ContentMaterialListQO.java
...c/haoban/manage/web/qo/content/ContentMaterialListQO.java
+1
-1
ContentMaterialQO.java
...m/gic/haoban/manage/web/qo/content/ContentMaterialQO.java
+14
-2
ContentMaterialLikeQO.java
...ban/manage/web/qo/content/like/ContentMaterialLikeQO.java
+84
-0
ContentMaterialDataVO.java
...c/haoban/manage/web/vo/content/ContentMaterialDataVO.java
+87
-0
ContentMaterialInfoVO.java
...c/haoban/manage/web/vo/content/ContentMaterialInfoVO.java
+106
-1
ContentMaterialKnowVO.java
...nage/web/vo/content/statistics/ContentMaterialKnowVO.java
+127
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java
View file @
354a31bf
This diff is collapsed.
Click to expand it.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java
View file @
354a31bf
...
...
@@ -16,10 +16,7 @@ import com.gic.haoban.manage.web.qo.content.statistics.MaterialReportQO;
import
com.gic.haoban.manage.web.qo.content.statistics.MaterialStoreAnalyzeDataQO
;
import
com.gic.haoban.manage.web.qo.content.statistics.MaterialStoreReportQO
;
import
com.gic.haoban.manage.web.vo.content.creative.ContentMaterialConvsVO
;
import
com.gic.haoban.manage.web.vo.content.statistics.MaterialAreaUsedDataVO
;
import
com.gic.haoban.manage.web.vo.content.statistics.MaterialClerkUsedDataVO
;
import
com.gic.haoban.manage.web.vo.content.statistics.MaterialDataOverviewVO
;
import
com.gic.haoban.manage.web.vo.content.statistics.MaterialStoreUsedDataVO
;
import
com.gic.haoban.manage.web.vo.content.statistics.*
;
import
com.gic.haoban.manage.web.vo.content.statistics.bo.MaterialTodayDataBO
;
import
com.gic.haoban.manage.web.vo.content.statistics.bo.MemberVisitMaterialBO
;
import
com.gic.haoban.manage.web.vo.content.statistics.report.MaterialPersonalUsedDataVO
;
...
...
@@ -29,11 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -105,6 +98,10 @@ public class MaterialDataAdaptor {
*/
private
static
final
String
MATERIAL_CREATIVE_CONVS_TOTAL_DATA
=
"data_cms_matl_examine_convs_total"
;
/**
* 知识库素材列表数据
*/
private
static
final
String
MATERIAL_KNOWL_DATA
=
"data_cms_matl_knowl_list"
;
@Autowired
private
EnterpriseService
enterpriseService
;
...
...
@@ -521,4 +518,34 @@ public class MaterialDataAdaptor {
}
return
new
ContentMaterialConvsVO
();
}
/**
* 知识库列表数据
* @param enterpriseId 企业id
* @param materialIdList 素材id列表
* @return
*/
public
List
<
ContentMaterialKnowVO
>
queryKnowData
(
String
enterpriseId
,
List
<
Long
>
materialIdList
)
{
Map
<
String
,
Object
>
inlineParams
=
new
HashMap
<>();
if
(
CollectionUtils
.
isEmpty
(
materialIdList
))
{
return
new
ArrayList
<>();
}
inlineParams
.
put
(
"enterpriseId"
,
enterpriseId
);
inlineParams
.
put
(
"contentMaterialId"
,
StringUtils
.
join
(
materialIdList
,
","
));
//只查询公开的评论
inlineParams
.
put
(
"showFlag"
,
1
);
Map
<
String
,
Object
>
result
=
null
;
try
{
result
=
DataApiUtils
.
http
(
JSON
.
toJSONString
(
inlineParams
),
MATERIAL_KNOWL_DATA
);
}
catch
(
Exception
e
)
{
log
.
error
(
"获取知识库数据异常"
,
e
);
return
new
ArrayList
<>();
}
List
<
ContentMaterialKnowVO
>
list
=
DataApiUtils
.
parsePageDataList
(
result
,
ContentMaterialKnowVO
.
class
);
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
return
list
;
}
return
new
ArrayList
<>();
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialClerkQO.java
0 → 100644
View file @
354a31bf
package
com
.
gic
.
haoban
.
manage
.
web
.
qo
.
content
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
import
java.util.List
;
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
public
class
ContentMaterialClerkQO
{
/**
* 企业ID
*/
private
String
enterpriseId
;
/**
* 素材id列表
*/
private
List
<
Long
>
contentMaterialIdList
;
/**
* 导购id
*/
private
String
clerkId
;
public
String
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
String
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
List
<
Long
>
getContentMaterialIdList
()
{
return
contentMaterialIdList
;
}
public
void
setContentMaterialIdList
(
List
<
Long
>
contentMaterialIdList
)
{
this
.
contentMaterialIdList
=
contentMaterialIdList
;
}
public
String
getClerkId
()
{
return
clerkId
;
}
public
void
setClerkId
(
String
clerkId
)
{
this
.
clerkId
=
clerkId
;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialListQO.java
View file @
354a31bf
...
...
@@ -36,7 +36,7 @@ public class ContentMaterialListQO extends PageQo {
private
String
materialSearch
;
/**
* 素材类型1图文2纯文字3纯图片4视频
* 素材类型1图文2纯文字3纯图片4视频
5图文/视频6文件7富文本
*/
private
Integer
materialType
;
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialQO.java
View file @
354a31bf
package
com
.
gic
.
haoban
.
manage
.
web
.
qo
.
content
;
import
com.gic.commons.web.qo.PageQo
;
import
com.gic.content.api.enums.MaterialSearchSceneEnum
;
/**
* @Author MUSI
...
...
@@ -10,7 +11,11 @@ import com.gic.commons.web.qo.PageQo;
**/
public
class
ContentMaterialQO
extends
PageQo
{
/**
* 查询场景 1:gic后台营销素材 2:好办营销素材 3:gic后台社区素材 4:gic后台审核素材 5:好办审核素材 6:小程序社区素材 7:gic后台知识库 8:好办知识库
* @see com.gic.content.api.enums.MaterialSearchSceneEnum
*/
private
Integer
queryScene
=
MaterialSearchSceneEnum
.
HAOBAN_MARKETING
.
value
;
/**
* 企业id
*/
...
...
@@ -37,7 +42,7 @@ public class ContentMaterialQO extends PageQo {
private
Integer
sortType
;
/**
* 素材类型1图文2纯文字3纯图片4视频
* 素材类型1图文2纯文字3纯图片4视频
5图文/视频6文件7富文本
*/
private
Integer
materialType
;
...
...
@@ -58,6 +63,13 @@ public class ContentMaterialQO extends PageQo {
*/
private
Integer
searchType
;
public
Integer
getQueryScene
()
{
return
queryScene
;
}
public
void
setQueryScene
(
Integer
queryScene
)
{
this
.
queryScene
=
queryScene
;
}
public
Integer
getSortType
()
{
return
sortType
;
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/like/ContentMaterialLikeQO.java
0 → 100644
View file @
354a31bf
package
com
.
gic
.
haoban
.
manage
.
web
.
qo
.
content
.
like
;
import
java.io.Serializable
;
/**
* Created by wangzubo on 2023/9/22.
*/
public
class
ContentMaterialLikeQO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
1L
;
/**
* 企业id
*/
private
String
enterpriseId
;
/**
* 用户id(导购id)
*/
private
String
memberId
;
/**
* 用户类型0会员1导购2区经
*/
private
Integer
userType
;
/**
* 用户code
*/
private
String
userCode
;
/**
* 素材id
*/
private
Long
contentMaterialId
;
public
ContentMaterialLikeQO
()
{
}
public
ContentMaterialLikeQO
(
String
enterpriseId
,
String
memberId
,
Integer
userType
,
String
userCode
,
Long
contentMaterialId
)
{
this
.
enterpriseId
=
enterpriseId
;
this
.
memberId
=
memberId
;
this
.
userType
=
userType
;
this
.
userCode
=
userCode
;
this
.
contentMaterialId
=
contentMaterialId
;
}
public
String
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
String
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getMemberId
()
{
return
memberId
;
}
public
void
setMemberId
(
String
memberId
)
{
this
.
memberId
=
memberId
;
}
public
Integer
getUserType
()
{
return
userType
;
}
public
void
setUserType
(
Integer
userType
)
{
this
.
userType
=
userType
;
}
public
String
getUserCode
()
{
return
userCode
;
}
public
void
setUserCode
(
String
userCode
)
{
this
.
userCode
=
userCode
;
}
public
Long
getContentMaterialId
()
{
return
contentMaterialId
;
}
public
void
setContentMaterialId
(
Long
contentMaterialId
)
{
this
.
contentMaterialId
=
contentMaterialId
;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialDataVO.java
0 → 100644
View file @
354a31bf
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
.
content
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
import
java.io.Serializable
;
public
class
ContentMaterialDataVO
implements
Serializable
{
/**
* 素材id
*/
@JsonSerialize
(
using
=
ToStringSerializer
.
class
)
private
Long
contentMaterialId
;
/**
* 点赞数
*/
private
Integer
likeCount
=
0
;
/**
* 是否已点赞 1是0否
*/
private
Integer
likeFlag
=
0
;
/**
* 评论次数
*/
private
Integer
cmtCnt
=
0
;
/**
* 阅读次数
*/
private
Integer
readCnt
=
0
;
public
Long
getContentMaterialId
()
{
return
contentMaterialId
;
}
public
void
setContentMaterialId
(
Long
contentMaterialId
)
{
this
.
contentMaterialId
=
contentMaterialId
;
}
public
Integer
getLikeCount
()
{
return
likeCount
;
}
public
void
setLikeCount
(
Integer
likeCount
)
{
this
.
likeCount
=
likeCount
;
}
public
Integer
getLikeFlag
()
{
return
likeFlag
;
}
public
void
setLikeFlag
(
Integer
likeFlag
)
{
this
.
likeFlag
=
likeFlag
;
}
public
Integer
getCmtCnt
()
{
return
cmtCnt
;
}
public
void
setCmtCnt
(
Integer
cmtCnt
)
{
this
.
cmtCnt
=
cmtCnt
;
}
public
Integer
getReadCnt
()
{
return
readCnt
;
}
public
void
setReadCnt
(
Integer
readCnt
)
{
this
.
readCnt
=
readCnt
;
}
public
void
setDataVO
(
ContentMaterialDataVO
dataVO
)
{
if
(
dataVO
==
null
)
{
this
.
setLikeCount
(
0
);
this
.
setCmtCnt
(
0
);
this
.
setReadCnt
(
0
);
return
;
}
this
.
setLikeCount
(
dataVO
.
getLikeCount
());
this
.
setCmtCnt
(
dataVO
.
getCmtCnt
());
this
.
setReadCnt
(
dataVO
.
getReadCnt
());
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java
View file @
354a31bf
...
...
@@ -2,10 +2,13 @@ package com.gic.haoban.manage.web.vo.content;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
import
org.apache.commons.lang3.StringUtils
;
import
java.io.Serializable
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
* @Author MUSI
...
...
@@ -33,11 +36,16 @@ public class ContentMaterialInfoVO implements Serializable {
private
String
materialContent
;
/**
* 素材类型1图文2纯文字3纯图片4视频
* 素材类型1图文2纯文字3纯图片4视频
5图文/视频6文件7富文本
*/
private
Integer
materialType
;
/**
* 是否置顶0不置顶1置顶
*/
private
Integer
topFlag
=
0
;
/**
* 发布时间
*/
private
Date
publishTime
;
...
...
@@ -84,6 +92,23 @@ public class ContentMaterialInfoVO implements Serializable {
private
String
materialVideoFirstImageInfo
;
/**
* 素材首图url
*/
private
String
materialFirstImageUrl
;
/**
* 素材首图信息{width:px,height:px,size:Bytes}
*/
private
String
materialFirstImageInfo
;
/**
* 素材文件url
*/
private
String
materialFileUrl
;
/**
* 素材文件信息{size:Bytes,name:String}
*/
private
String
materialFileInfo
;
/**
* 分享次数
*/
private
Long
shareCount
;
...
...
@@ -121,6 +146,16 @@ public class ContentMaterialInfoVO implements Serializable {
*/
private
Integer
sourceType
;
/**
* 点赞数
*/
private
Long
likeCount
;
/**
* 是否已点赞 1是0否
*/
private
Integer
likeFlag
;
public
Long
getContentMaterialId
()
{
return
contentMaterialId
;
...
...
@@ -154,6 +189,14 @@ public class ContentMaterialInfoVO implements Serializable {
this
.
materialType
=
materialType
;
}
public
Integer
getTopFlag
()
{
return
topFlag
;
}
public
void
setTopFlag
(
Integer
topFlag
)
{
this
.
topFlag
=
topFlag
;
}
public
Date
getPublishTime
()
{
return
publishTime
;
}
...
...
@@ -194,6 +237,38 @@ public class ContentMaterialInfoVO implements Serializable {
this
.
materialVideoFirstImageUrl
=
materialVideoFirstImageUrl
;
}
public
String
getMaterialFirstImageUrl
()
{
return
materialFirstImageUrl
;
}
public
void
setMaterialFirstImageUrl
(
String
materialFirstImageUrl
)
{
this
.
materialFirstImageUrl
=
materialFirstImageUrl
;
}
public
String
getMaterialFirstImageInfo
()
{
return
materialFirstImageInfo
;
}
public
void
setMaterialFirstImageInfo
(
String
materialFirstImageInfo
)
{
this
.
materialFirstImageInfo
=
materialFirstImageInfo
;
}
public
String
getMaterialFileUrl
()
{
return
materialFileUrl
;
}
public
void
setMaterialFileUrl
(
String
materialFileUrl
)
{
this
.
materialFileUrl
=
materialFileUrl
;
}
public
String
getMaterialFileInfo
()
{
return
materialFileInfo
;
}
public
void
setMaterialFileInfo
(
String
materialFileInfo
)
{
this
.
materialFileInfo
=
materialFileInfo
;
}
public
Long
getShareCount
()
{
return
shareCount
;
}
...
...
@@ -289,4 +364,34 @@ public class ContentMaterialInfoVO implements Serializable {
public
void
setMaterialVideoFirstImageInfo
(
String
materialVideoFirstImageInfo
)
{
this
.
materialVideoFirstImageInfo
=
materialVideoFirstImageInfo
;
}
public
Long
getLikeCount
()
{
return
likeCount
;
}
public
void
setLikeCount
(
Long
likeCount
)
{
this
.
likeCount
=
likeCount
;
}
public
Integer
getLikeFlag
()
{
return
likeFlag
;
}
public
void
setLikeFlag
(
Integer
likeFlag
)
{
this
.
likeFlag
=
likeFlag
;
}
public
void
convertMaterialImages
(
String
materialImageUrls
,
String
materialThumbnailImageUrls
)
{
if
(
StringUtils
.
isNotBlank
(
materialImageUrls
))
{
String
[]
split
=
StringUtils
.
split
(
materialImageUrls
,
","
);
List
<
String
>
imageUrls
=
Arrays
.
stream
(
split
).
collect
(
Collectors
.
toList
());
this
.
setMaterialImageUrls
(
imageUrls
);
}
if
(
StringUtils
.
isNotBlank
(
materialThumbnailImageUrls
))
{
String
[]
split
=
StringUtils
.
split
(
materialThumbnailImageUrls
,
","
);
List
<
String
>
imageUrls
=
Arrays
.
stream
(
split
).
collect
(
Collectors
.
toList
());
this
.
setMaterialThumbnailImageUrls
(
imageUrls
);
}
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/statistics/ContentMaterialKnowVO.java
0 → 100644
View file @
354a31bf
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
.
content
.
statistics
;
import
java.io.Serializable
;
public
class
ContentMaterialKnowVO
implements
Serializable
{
/**
* 素材id
*/
private
Long
contentMaterialId
;
/**
* 评论人数
*/
private
Integer
cmtNum
;
/**
* 评论次数
*/
private
Integer
cmtCnt
;
/**
* 阅读人数
*/
private
Integer
readNum
;
/**
* 阅读次数
*/
private
Integer
readCnt
;
/**
* 点赞人数
*/
private
Integer
likeNum
;
/**
* 点赞次数
*/
private
Integer
likeCnt
;
public
ContentMaterialKnowVO
()
{
}
public
ContentMaterialKnowVO
(
Integer
cmtNum
,
Integer
cmtCnt
,
Integer
readNum
,
Integer
readCnt
,
Integer
likeNum
,
Integer
likeCnt
)
{
this
.
cmtNum
=
cmtNum
;
this
.
cmtCnt
=
cmtCnt
;
this
.
readNum
=
readNum
;
this
.
readCnt
=
readCnt
;
this
.
likeNum
=
likeNum
;
this
.
likeCnt
=
likeCnt
;
}
public
void
setKnow
(
ContentMaterialKnowVO
know
)
{
if
(
know
==
null
)
{
this
.
setCmtNum
(
0
);
this
.
setCmtCnt
(
0
);
this
.
setReadCnt
(
0
);
this
.
setReadNum
(
0
);
this
.
setLikeCnt
(
0
);
this
.
setLikeNum
(
0
);
return
;
}
this
.
setCmtNum
(
know
.
getCmtNum
());
this
.
setCmtCnt
(
know
.
getCmtCnt
());
this
.
setReadCnt
(
know
.
getReadCnt
());
this
.
setReadNum
(
know
.
getReadNum
());
this
.
setLikeCnt
(
know
.
getLikeCnt
());
this
.
setLikeNum
(
know
.
getLikeNum
());
}
public
Long
getContentMaterialId
()
{
return
contentMaterialId
;
}
public
void
setContentMaterialId
(
Long
contentMaterialId
)
{
this
.
contentMaterialId
=
contentMaterialId
;
}
public
Integer
getCmtNum
()
{
return
cmtNum
;
}
public
void
setCmtNum
(
Integer
cmtNum
)
{
this
.
cmtNum
=
cmtNum
;
}
public
Integer
getCmtCnt
()
{
return
cmtCnt
;
}
public
void
setCmtCnt
(
Integer
cmtCnt
)
{
this
.
cmtCnt
=
cmtCnt
;
}
public
Integer
getReadNum
()
{
return
readNum
;
}
public
void
setReadNum
(
Integer
readNum
)
{
this
.
readNum
=
readNum
;
}
public
Integer
getReadCnt
()
{
return
readCnt
;
}
public
void
setReadCnt
(
Integer
readCnt
)
{
this
.
readCnt
=
readCnt
;
}
public
Integer
getLikeNum
()
{
return
likeNum
;
}
public
void
setLikeNum
(
Integer
likeNum
)
{
this
.
likeNum
=
likeNum
;
}
public
Integer
getLikeCnt
()
{
return
likeCnt
;
}
public
void
setLikeCnt
(
Integer
likeCnt
)
{
this
.
likeCnt
=
likeCnt
;
}
}
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