Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
T
tanpu-community
Project
Project
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
探普后端
tanpu-community
Commits
faef2ae3
Commit
faef2ae3
authored
Feb 21, 2022
by
刘基明
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2.3.1' into 'dev'
置頂 See merge request
!53
parents
d3594c25
f1224b4e
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
535 additions
and
25 deletions
+535
-25
TopicAttachment.java
...ava/com/tanpu/community/api/beans/qo/TopicAttachment.java
+2
-2
TopicAttachmentDetail.java
...m/tanpu/community/api/beans/qo/TopicAttachmentDetail.java
+29
-0
TopicPageDetailQo.java
...a/com/tanpu/community/api/beans/qo/TopicPageDetailQo.java
+1
-1
CoursePackageSimpleResp.java
...npu/community/api/beans/resp/CoursePackageSimpleResp.java
+50
-0
Price.java
...c/main/java/com/tanpu/community/api/beans/resp/Price.java
+83
-0
CodeAutoGenerator.java
.../main/java/com/tanpu/community/dao/CodeAutoGenerator.java
+1
-1
TopicManagerEntity.java
...pu/community/dao/entity/community/TopicManagerEntity.java
+93
-0
TopicSubjectEntity.java
...pu/community/dao/entity/community/TopicSubjectEntity.java
+117
-0
TopicManagerMapper.java
...pu/community/dao/mapper/community/TopicManagerMapper.java
+16
-0
TopicSubjectMapper.java
...pu/community/dao/mapper/community/TopicSubjectMapper.java
+16
-0
FeignBackClientForCourse.java
...anpu/community/feign/course/FeignBackClientForCourse.java
+8
-0
FeignClientForCourse.java
...om/tanpu/community/feign/course/FeignClientForCourse.java
+6
-0
CommentService.java
...main/java/com/tanpu/community/service/CommentService.java
+3
-1
FeignService.java
...c/main/java/com/tanpu/community/service/FeignService.java
+22
-9
TopicService.java
...c/main/java/com/tanpu/community/service/TopicService.java
+58
-11
TopicManagerEntityMapper.xml
...n/resources/mapper/community/TopicManagerEntityMapper.xml
+14
-0
TopicSubjectEntityMapper.xml
...n/resources/mapper/community/TopicSubjectEntityMapper.xml
+16
-0
No files found.
community-api/src/main/java/com/tanpu/community/api/beans/qo/TopicAttach
e
ment.java
→
community-api/src/main/java/com/tanpu/community/api/beans/qo/TopicAttachment.java
View file @
faef2ae3
...
@@ -12,12 +12,12 @@ import lombok.NoArgsConstructor;
...
@@ -12,12 +12,12 @@ import lombok.NoArgsConstructor;
@Builder
@Builder
@AllArgsConstructor
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor
public
class
TopicAttach
e
ment
{
public
class
TopicAttachment
{
@ApiModelProperty
(
value
=
" 88:产品 300:课程包 323: 线下活动 未定:资管人"
)
@ApiModelProperty
(
value
=
" 88:产品 300:课程包 323: 线下活动 未定:资管人"
)
private
String
type
;
private
String
type
;
@ApiModelProperty
(
value
=
"对象详情"
)
@ApiModelProperty
(
value
=
"对象详情"
)
private
AttachmentDetailVo
detail
;
private
TopicAttachmentDetail
detail
;
}
}
community-api/src/main/java/com/tanpu/community/api/beans/qo/TopicAttachmentDetail.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
api
.
beans
.
qo
;
import
com.tanpu.community.api.beans.resp.CoursePackageSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel
(
value
=
"附件对象"
)
public
class
TopicAttachmentDetail
{
@ApiModelProperty
(
"产品信息"
)
private
FundInfoBaseResp
product
;
@ApiModelProperty
(
"新版课程"
)
private
CoursePackageSimpleResp
coursePackage
;
@ApiModelProperty
(
"线下活动"
)
private
OfflineActivitySimpleResp
activity
;
}
community-api/src/main/java/com/tanpu/community/api/beans/qo/TopicPageDetailQo.java
View file @
faef2ae3
...
@@ -47,5 +47,5 @@ public class TopicPageDetailQo {
...
@@ -47,5 +47,5 @@ public class TopicPageDetailQo {
private
String
managers
;
private
String
managers
;
@ApiModelProperty
(
value
=
"关联产品"
)
@ApiModelProperty
(
value
=
"关联产品"
)
private
List
<
TopicAttach
e
ment
>
attachments
;
private
List
<
TopicAttachment
>
attachments
;
}
}
community-api/src/main/java/com/tanpu/community/api/beans/resp/CoursePackageSimpleResp.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
api
.
beans
.
resp
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.SuperBuilder
;
/**
* @Description 课程包列表信息
* @Author wangyalei
* @Date 2021/4/13 11:25
**/
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
@SuperBuilder
@ApiModel
@AllArgsConstructor
@NoArgsConstructor
public
class
CoursePackageSimpleResp
extends
Price
{
@ApiModelProperty
(
"课程包Id"
)
private
String
coursePackageId
;
@ApiModelProperty
(
"课程包标题"
)
private
String
coursePackageMainTitle
;
@ApiModelProperty
(
"课程包简介(副标题)"
)
private
String
coursePackageTwoTitle
;
/**
* 1:普通课程包 2:定期更新系列课程
*/
@ApiModelProperty
(
"课程包类型 1:普通课程包 2:定期更新系列课程"
)
private
Integer
type
;
@ApiModelProperty
(
"是否引用讲师头像 0否 1是;bgStatus=0时,直接展示squareImg;bgStatus=1时,将squareImg与bgImg叠加展示"
)
private
Integer
bgStatus
;
@ApiModelProperty
(
"方图"
)
private
String
squareImg
;
@ApiModelProperty
(
"背景图地址"
)
private
String
bgImg
;
@ApiModelProperty
(
"长图 仅系列课用"
)
private
String
lengthImg
;
@ApiModelProperty
(
"总期数"
)
private
Integer
totalNum
;
@ApiModelProperty
(
"学习人数"
)
private
Integer
readNum
;
}
community-api/src/main/java/com/tanpu/community/api/beans/resp/Price.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
api
.
beans
.
resp
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.SuperBuilder
;
/**
* @author: wangyalei
*
*/
@Data
@SuperBuilder
(
toBuilder
=
true
)
@AllArgsConstructor
@NoArgsConstructor
public
class
Price
{
@ApiModelProperty
(
"资源id"
)
private
String
resId
;
@ApiModelProperty
(
"是不是白名单 0:不是 1:是白名单"
)
private
Integer
isWhite
;
@ApiModelProperty
(
"付费模式 1:免费 2:积分 3:现金"
)
private
Integer
chargeMode
;
@ApiModelProperty
(
"价格"
)
private
String
totalPrice
;
@ApiModelProperty
(
"划线价格"
)
private
String
discountPrice
;
@ApiModelProperty
(
"积分"
)
private
String
totalScore
;
@ApiModelProperty
(
"划线积分"
)
private
String
discountScore
;
@ApiModelProperty
(
"会员打折价"
)
private
String
memberDiscountPrice
;
@ApiModelProperty
(
"是否需要报名 0:不需要 1:需要"
)
private
Integer
bmStatus
;
@ApiModelProperty
(
"报名是否需要审核 0:不需要 1:需要"
)
private
Integer
signUpReviewSwitch
;
@ApiModelProperty
(
"报名是否需要填写问卷 0不需要 1需要"
)
private
Integer
isAnswer
;
@ApiModelProperty
(
"是否已报名报 0:未报名 1:已报名"
)
private
Integer
bmInfo
;
@ApiModelProperty
(
"用户报名时间戳"
)
private
Long
signedTime
;
@ApiModelProperty
(
"审批状态 0:待审批 1:通过 2:驳回"
)
private
Integer
spStatus
;
@ApiModelProperty
(
"最终可参与的会员等级"
)
private
Integer
finalLevel
;
@ApiModelProperty
(
"最终付费模式 1:免费 2:积分 3:现金"
)
private
Integer
finalChargeMode
;
@ApiModelProperty
(
"最终价格"
)
private
String
finalPrice
;
@ApiModelProperty
(
"最终积分"
)
private
String
finalScore
;
@ApiModelProperty
(
"需不需要支付 2:不需要 1:需要"
)
private
Integer
isNeedBuy
;
@ApiModelProperty
(
"有没有支付 2:已购买 1:未购买"
)
private
Integer
isBuy
;
@ApiModelProperty
(
"是否正在参与拼团活动 0不参加 1参加"
)
private
Integer
isJoinGroupBuy
=
0
;
}
community-service/src/main/java/com/tanpu/community/dao/CodeAutoGenerator.java
View file @
faef2ae3
...
@@ -23,7 +23,7 @@ public class CodeAutoGenerator {
...
@@ -23,7 +23,7 @@ public class CodeAutoGenerator {
String
mysqlPassword
=
"@imeng123"
;
String
mysqlPassword
=
"@imeng123"
;
String
jdbcUrl
=
"jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_community"
;
String
jdbcUrl
=
"jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_community"
;
// String[] tables = new String[]{"theme"};
// String[] tables = new String[]{"theme"};
String
[]
tables
=
new
String
[]{
"t
heme
"
};
String
[]
tables
=
new
String
[]{
"t
opic_subject
"
};
String
basePackage
=
"com.tanpu.community"
;
String
basePackage
=
"com.tanpu.community"
;
String
mapperPackage
=
"dao.mapper.community"
;
String
mapperPackage
=
"dao.mapper.community"
;
String
entityPackage
=
"dao.entity.community"
;
String
entityPackage
=
"dao.entity.community"
;
...
...
community-service/src/main/java/com/tanpu/community/dao/entity/community/TopicManagerEntity.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
dao
.
entity
.
community
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
* 话题管理员表
* </p>
*
* @author xudong
* @since 2022-02-21
*/
@TableName
(
"topic_manager"
)
@ApiModel
(
value
=
"TopicManagerEntity对象"
,
description
=
"话题管理员表"
)
public
class
TopicManagerEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"主键"
)
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Long
id
;
@ApiModelProperty
(
value
=
"话题id"
)
private
String
topicId
;
@ApiModelProperty
(
value
=
"管理员用户id"
)
private
String
userId
;
@ApiModelProperty
(
value
=
"创建人"
)
private
String
createBy
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
public
Long
getId
()
{
return
id
;
}
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
String
getTopicId
()
{
return
topicId
;
}
public
void
setTopicId
(
String
topicId
)
{
this
.
topicId
=
topicId
;
}
public
String
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
}
public
String
getCreateBy
()
{
return
createBy
;
}
public
void
setCreateBy
(
String
createBy
)
{
this
.
createBy
=
createBy
;
}
public
LocalDateTime
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
LocalDateTime
createTime
)
{
this
.
createTime
=
createTime
;
}
@Override
public
String
toString
()
{
return
"TopicManagerEntity{"
+
"id="
+
id
+
", topicId="
+
topicId
+
", userId="
+
userId
+
", createBy="
+
createBy
+
", createTime="
+
createTime
+
"}"
;
}
}
community-service/src/main/java/com/tanpu/community/dao/entity/community/TopicSubjectEntity.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
dao
.
entity
.
community
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
* 话题关联内容表
* </p>
*
* @author xudong
* @since 2022-02-21
*/
@TableName
(
"topic_subject"
)
@ApiModel
(
value
=
"TopicSubjectEntity对象"
,
description
=
"话题关联内容表"
)
public
class
TopicSubjectEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"主键"
)
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Long
id
;
@ApiModelProperty
(
value
=
"话题主键id"
)
private
String
topicId
;
@ApiModelProperty
(
value
=
"关联内容id,如课程id"
)
private
String
subjectId
;
@ApiModelProperty
(
value
=
"关联内容类型,88基金产品 90基金管理人 300课程 323线下活动 "
)
private
Integer
subjectType
;
@ApiModelProperty
(
value
=
"关联内容子类型 res_type=88基金产品时有值"
)
private
Integer
subjectSubType
;
@ApiModelProperty
(
value
=
"创建人"
)
private
String
createBy
;
@ApiModelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
createTime
;
public
Long
getId
()
{
return
id
;
}
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
String
getTopicId
()
{
return
topicId
;
}
public
void
setTopicId
(
String
topicId
)
{
this
.
topicId
=
topicId
;
}
public
String
getSubjectId
()
{
return
subjectId
;
}
public
void
setSubjectId
(
String
subjectId
)
{
this
.
subjectId
=
subjectId
;
}
public
Integer
getSubjectType
()
{
return
subjectType
;
}
public
void
setSubjectType
(
Integer
subjectType
)
{
this
.
subjectType
=
subjectType
;
}
public
Integer
getSubjectSubType
()
{
return
subjectSubType
;
}
public
void
setSubjectSubType
(
Integer
subjectSubType
)
{
this
.
subjectSubType
=
subjectSubType
;
}
public
String
getCreateBy
()
{
return
createBy
;
}
public
void
setCreateBy
(
String
createBy
)
{
this
.
createBy
=
createBy
;
}
public
LocalDateTime
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
LocalDateTime
createTime
)
{
this
.
createTime
=
createTime
;
}
@Override
public
String
toString
()
{
return
"TopicSubjectEntity{"
+
"id="
+
id
+
", topicId="
+
topicId
+
", subjectId="
+
subjectId
+
", subjectType="
+
subjectType
+
", subjectSubType="
+
subjectSubType
+
", createBy="
+
createBy
+
", createTime="
+
createTime
+
"}"
;
}
}
community-service/src/main/java/com/tanpu/community/dao/mapper/community/TopicManagerMapper.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
dao
.
mapper
.
community
;
import
com.tanpu.community.dao.entity.community.TopicManagerEntity
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
* <p>
* 话题管理员表 Mapper 接口
* </p>
*
* @author xudong
* @since 2022-02-21
*/
public
interface
TopicManagerMapper
extends
BaseMapper
<
TopicManagerEntity
>
{
}
community-service/src/main/java/com/tanpu/community/dao/mapper/community/TopicSubjectMapper.java
0 → 100644
View file @
faef2ae3
package
com
.
tanpu
.
community
.
dao
.
mapper
.
community
;
import
com.tanpu.community.dao.entity.community.TopicSubjectEntity
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
* <p>
* 话题关联内容表 Mapper 接口
* </p>
*
* @author xudong
* @since 2022-02-21
*/
public
interface
TopicSubjectMapper
extends
BaseMapper
<
TopicSubjectEntity
>
{
}
community-service/src/main/java/com/tanpu/community/feign/course/FeignBackClientForCourse.java
View file @
faef2ae3
package
com
.
tanpu
.
community
.
feign
.
course
;
package
com
.
tanpu
.
community
.
feign
.
course
;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.community.api.beans.resp.CoursePackageSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseDetailExt
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseDetailExt
;
import
com.tanpu.community.api.beans.vo.feign.course.CoursePackageDetail
;
import
com.tanpu.community.api.beans.vo.feign.course.CoursePackageDetail
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp
;
...
@@ -43,6 +44,13 @@ public class FeignBackClientForCourse implements FallbackFactory<FeignClientForC
...
@@ -43,6 +44,13 @@ public class FeignBackClientForCourse implements FallbackFactory<FeignClientForC
log
.
error
(
"FeignClientForCourse.getStudyCourseCount-查询userid:{}"
,
userId
);
log
.
error
(
"FeignClientForCourse.getStudyCourseCount-查询userid:{}"
,
userId
);
return
CommonResp
.
failed
(
"调用getStudyCourseCount失败"
);
return
CommonResp
.
failed
(
"调用getStudyCourseCount失败"
);
}
}
@Override
public
CommonResp
<
List
<
CoursePackageSimpleResp
>>
getCoursePackageListByUserId
(
List
<
String
>
ids
)
{
log
.
error
(
"请求信息"
,
throwable
);
log
.
error
(
"FeignClientForCourse.getCoursePackageSimpleRespListByUserId-查询coursePackage:{}"
,
ids
);
return
CommonResp
.
failed
(
"调用getStudyCourseCount失败"
);
}
};
};
}
}
}
}
community-service/src/main/java/com/tanpu/community/feign/course/FeignClientForCourse.java
View file @
faef2ae3
package
com
.
tanpu
.
community
.
feign
.
course
;
package
com
.
tanpu
.
community
.
feign
.
course
;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.community.api.beans.resp.CoursePackageSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseDetailExt
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseDetailExt
;
import
com.tanpu.community.api.beans.vo.feign.course.CoursePackageDetail
;
import
com.tanpu.community.api.beans.vo.feign.course.CoursePackageDetail
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp
;
...
@@ -36,4 +37,9 @@ public interface FeignClientForCourse {
...
@@ -36,4 +37,9 @@ public interface FeignClientForCourse {
@ApiOperation
(
"查询已学习课程包总数"
)
@ApiOperation
(
"查询已学习课程包总数"
)
@GetMapping
(
"/course/getStudyCourseCount"
)
@GetMapping
(
"/course/getStudyCourseCount"
)
CommonResp
<
Integer
>
getStudyCourseCount
(
@ApiParam
(
value
=
"用户id"
)
@RequestParam
(
value
=
"userId"
,
required
=
false
)
String
userId
);
CommonResp
<
Integer
>
getStudyCourseCount
(
@ApiParam
(
value
=
"用户id"
)
@RequestParam
(
value
=
"userId"
,
required
=
false
)
String
userId
);
@ApiOperation
(
"课程包列表查询 含价格"
)
@GetMapping
(
"/course/getCoursePackageSimpleRespList"
)
CommonResp
<
List
<
CoursePackageSimpleResp
>>
getCoursePackageListByUserId
(
@RequestParam
(
"list"
)
List
<
String
>
list
);
}
}
community-service/src/main/java/com/tanpu/community/service/CommentService.java
View file @
faef2ae3
...
@@ -191,6 +191,8 @@ public class CommentService {
...
@@ -191,6 +191,8 @@ public class CommentService {
}
}
public
void
queryRecentComments
(
List
<
ThemeQo
>
themes
)
{
public
void
queryRecentComments
(
List
<
ThemeQo
>
themes
)
{
if
(
CollectionUtils
.
isEmpty
(
themes
))
return
;
List
<
String
>
themeIds
=
themes
.
stream
().
map
(
ThemeQo:
:
getThemeId
).
collect
(
Collectors
.
toList
());
List
<
String
>
themeIds
=
themes
.
stream
().
map
(
ThemeQo:
:
getThemeId
).
collect
(
Collectors
.
toList
());
List
<
CommentEntity
>
commentEntities
=
commentMapper
.
selectList
(
new
LambdaQueryWrapper
<
CommentEntity
>()
List
<
CommentEntity
>
commentEntities
=
commentMapper
.
selectList
(
new
LambdaQueryWrapper
<
CommentEntity
>()
...
@@ -206,7 +208,7 @@ public class CommentService {
...
@@ -206,7 +208,7 @@ public class CommentService {
for
(
ThemeQo
theme
:
themes
)
{
for
(
ThemeQo
theme
:
themes
)
{
if
(
collect
.
containsKey
(
theme
.
getThemeId
()))
{
if
(
collect
.
containsKey
(
theme
.
getThemeId
()))
{
List
<
CommentEntity
>
comments
=
collect
.
get
(
theme
.
getThemeId
());
List
<
CommentEntity
>
comments
=
collect
.
get
(
theme
.
getThemeId
());
theme
.
setRecentComments
(
ConvertUtil
.
comment2Simple
(
comments
,
nameMap
));
theme
.
setRecentComments
(
ConvertUtil
.
comment2Simple
(
comments
,
nameMap
));
}
}
}
}
...
...
community-service/src/main/java/com/tanpu/community/service/FeignService.java
View file @
faef2ae3
...
@@ -2,6 +2,7 @@ package com.tanpu.community.service;
...
@@ -2,6 +2,7 @@ package com.tanpu.community.service;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.common.api.CommonResp
;
import
com.tanpu.common.exception.BizException
;
import
com.tanpu.common.exception.BizException
;
import
com.tanpu.community.api.beans.resp.CoursePackageSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp
;
import
com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp
;
...
@@ -88,7 +89,20 @@ public class FeignService {
...
@@ -88,7 +89,20 @@ public class FeignService {
}
else
{
}
else
{
return
new
ArrayList
<>();
return
new
ArrayList
<>();
}
}
});
}
});
}
public
List
<
CoursePackageSimpleResp
>
getCoursePackageList
(
List
<
String
>
coursePackageIds
)
{
return
batchExecute
(
"getCoursePackageList"
,
coursePackageIds
,
CoursePackageSimpleResp
.
class
,
CoursePackageSimpleResp:
:
getCoursePackageId
,
ids
->
{
CommonResp
<
List
<
CoursePackageSimpleResp
>>
resp
=
feignForCourse
.
getCoursePackageListByUserId
(
ids
);
if
(
resp
.
isSuccess
())
{
return
resp
.
getData
();
}
else
{
return
new
ArrayList
<>();
}
});
}
public
List
<
ZhiboListResp
>
getZhiboSimpleList
(
List
<
String
>
zhiboIds
)
{
public
List
<
ZhiboListResp
>
getZhiboSimpleList
(
List
<
String
>
zhiboIds
)
{
return
batchExecute
(
"getZhiboSimpleList_"
,
zhiboIds
,
ZhiboListResp
.
class
,
return
batchExecute
(
"getZhiboSimpleList_"
,
zhiboIds
,
ZhiboListResp
.
class
,
...
@@ -170,7 +184,6 @@ public class FeignService {
...
@@ -170,7 +184,6 @@ public class FeignService {
}
}
private
<
T
>
List
<
T
>
batchExecute
(
String
keyPrefix
,
private
<
T
>
List
<
T
>
batchExecute
(
String
keyPrefix
,
List
<
String
>
keys
,
List
<
String
>
keys
,
Class
<
T
>
clz
,
Class
<
T
>
clz
,
...
...
community-service/src/main/java/com/tanpu/community/service/TopicService.java
View file @
faef2ae3
package
com
.
tanpu
.
community
.
service
;
package
com
.
tanpu
.
community
.
service
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.tanpu.
common.uuid.UuidGenHelper
;
import
com.tanpu.
biz.common.enums.RelTypeEnum
;
import
com.tanpu.community.api.beans.qo.ThemeQo
;
import
com.tanpu.community.api.beans.qo.ThemeQo
;
import
com.tanpu.community.api.beans.qo.TopicAttachement
;
import
com.tanpu.community.api.beans.qo.TopicAttachment
;
import
com.tanpu.community.api.beans.qo.TopicAttachmentDetail
;
import
com.tanpu.community.api.beans.qo.TopicFollowQo
;
import
com.tanpu.community.api.beans.qo.TopicFollowQo
;
import
com.tanpu.community.api.beans.qo.TopicPageDetailQo
;
import
com.tanpu.community.api.beans.qo.TopicPageDetailQo
;
import
com.tanpu.community.api.beans.qo.TopicRankQo
;
import
com.tanpu.community.api.beans.qo.TopicRankQo
;
import
com.tanpu.community.api.beans.resp.CoursePackageSimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp
;
import
com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp
;
import
com.tanpu.community.api.enums.DeleteTagEnum
;
import
com.tanpu.community.api.enums.DeleteTagEnum
;
import
com.tanpu.community.api.enums.StatusEnum
;
import
com.tanpu.community.api.enums.StatusEnum
;
import
com.tanpu.community.api.enums.TopicSpecialPermissionEnum
;
import
com.tanpu.community.api.enums.TopicSpecialPermissionEnum
;
import
com.tanpu.community.dao.entity.community.TopicEntity
;
import
com.tanpu.community.dao.entity.community.TopicEntity
;
import
com.tanpu.community.dao.entity.community.TopicFollowRelEntity
;
import
com.tanpu.community.dao.entity.community.TopicFollowRelEntity
;
import
com.tanpu.community.dao.entity.community.TopicManagerEntity
;
import
com.tanpu.community.dao.entity.community.TopicSubjectEntity
;
import
com.tanpu.community.dao.mapper.community.TopicFollowRelMapper
;
import
com.tanpu.community.dao.mapper.community.TopicFollowRelMapper
;
import
com.tanpu.community.dao.mapper.community.TopicManagerMapper
;
import
com.tanpu.community.dao.mapper.community.TopicMapper
;
import
com.tanpu.community.dao.mapper.community.TopicMapper
;
import
com.tanpu.community.dao.mapper.community.TopicSubjectMapper
;
import
com.tanpu.community.util.ConvertUtil
;
import
com.tanpu.community.util.ConvertUtil
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -23,9 +31,9 @@ import org.springframework.stereotype.Service;
...
@@ -23,9 +31,9 @@ import org.springframework.stereotype.Service;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Service
@Service
...
@@ -39,11 +47,11 @@ public class TopicService {
...
@@ -39,11 +47,11 @@ public class TopicService {
TopicMapper
topicMapper
;
TopicMapper
topicMapper
;
@Resource
@Resource
private
UuidGenHelper
uuidGenHel
per
;
private
TopicManagerMapper
topicManagerMap
per
;
@Resource
@Resource
private
ThemeService
theme
Service
;
private
FeignService
feign
Service
;
@Resource
@Resource
private
VisitLogService
visitLogService
;
private
TopicSubjectMapper
topicSubjectMapper
;
public
List
<
TopicEntity
>
queryAll
()
{
public
List
<
TopicEntity
>
queryAll
()
{
...
@@ -166,14 +174,42 @@ public class TopicService {
...
@@ -166,14 +174,42 @@ public class TopicService {
}
}
public
void
queryAttachments
(
TopicPageDetailQo
topic
)
{
public
void
queryAttachments
(
TopicPageDetailQo
topic
)
{
TopicAttachement
a1
=
TopicAttachement
.
builder
().
type
(
"88"
).
detail
(
null
).
build
();
List
<
TopicSubjectEntity
>
topicSubjectEntities
=
topicSubjectMapper
.
selectList
(
new
LambdaQueryWrapper
<
TopicSubjectEntity
>().
eq
(
TopicSubjectEntity:
:
getTopicId
,
topic
.
getTopicId
()));
TopicAttachement
a2
=
TopicAttachement
.
builder
().
type
(
"300"
).
detail
(
null
).
build
();
if
(
CollectionUtils
.
isEmpty
(
topicSubjectEntities
))
{
TopicAttachement
a3
=
TopicAttachement
.
builder
().
type
(
"323"
).
detail
(
null
).
build
();
topic
.
setAttachments
(
null
);
}
ArrayList
<
TopicAttachment
>
attachements
=
new
ArrayList
<>();
for
(
TopicSubjectEntity
entity
:
topicSubjectEntities
)
{
if
(
RelTypeEnum
.
FUND
.
type
.
equals
(
entity
.
getSubjectType
().
toString
()))
{
// 基金
TopicAttachment
attach
=
TopicAttachment
.
builder
().
type
(
RelTypeEnum
.
FUND
.
type
).
detail
(
null
).
build
();
attachements
.
add
(
attach
);
}
else
if
(
RelTypeEnum
.
FUND_COMPANY
.
type
.
equals
(
entity
.
getSubjectType
().
toString
()))
{
// 资管人
TopicAttachment
attach
=
TopicAttachment
.
builder
().
type
(
RelTypeEnum
.
FUND_COMPANY
.
type
).
detail
(
null
).
build
();
attachements
.
add
(
attach
);
}
else
if
(
RelTypeEnum
.
NEW_COURSE_WARE
.
type
.
equals
(
entity
.
getSubjectType
().
toString
()))
{
// 课程包
List
<
CoursePackageSimpleResp
>
coursePackage
=
feignService
.
getCoursePackageList
(
Collections
.
singletonList
(
entity
.
getSubjectId
()));
TopicAttachmentDetail
detailVo
=
TopicAttachmentDetail
.
builder
().
coursePackage
(
coursePackage
.
get
(
0
)).
build
();
TopicAttachment
attach
=
TopicAttachment
.
builder
().
type
(
RelTypeEnum
.
NEW_COURSE_WARE
.
type
).
detail
(
detailVo
).
build
();
attachements
.
add
(
attach
);
}
else
if
(
RelTypeEnum
.
OFFLINE_ACTIVITY
.
type
.
equals
(
entity
.
getSubjectType
().
toString
()))
{
// 线下活动
List
<
OfflineActivitySimpleResp
>
activitySimpleList
=
feignService
.
getActivitySimpleList
(
Collections
.
singletonList
(
entity
.
getSubjectId
()));
TopicAttachmentDetail
detailVo
=
TopicAttachmentDetail
.
builder
().
activity
(
activitySimpleList
.
get
(
0
)).
build
();
TopicAttachment
attach
=
TopicAttachment
.
builder
().
type
(
RelTypeEnum
.
OFFLINE_ACTIVITY
.
type
).
detail
(
detailVo
).
build
();
attachements
.
add
(
attach
);
}
}
topic
.
setAttachments
(
Arrays
.
asList
(
a1
,
a2
,
a3
)
);
topic
.
setAttachments
(
attachements
);
}
}
public
boolean
checkFollow
(
String
topicId
,
String
userId
)
{
public
boolean
checkFollow
(
String
topicId
,
String
userId
)
{
if
(
StringUtils
.
isBlank
(
userId
))
{
if
(
StringUtils
.
isBlank
(
userId
))
{
return
false
;
return
false
;
...
@@ -191,7 +227,18 @@ public class TopicService {
...
@@ -191,7 +227,18 @@ public class TopicService {
}
}
public
String
getManagerId
(
String
topicId
)
{
public
String
getManagerId
(
String
topicId
)
{
return
"123"
;
List
<
TopicManagerEntity
>
topicManagerEntities
=
topicManagerMapper
.
selectList
(
new
LambdaQueryWrapper
<
TopicManagerEntity
>().
eq
(
TopicManagerEntity:
:
getTopicId
,
topicId
));
List
<
String
>
managerIds
=
topicManagerEntities
.
stream
().
map
(
TopicManagerEntity:
:
getUserId
).
collect
(
Collectors
.
toList
());
List
<
UserInfoResp
>
userList
=
feignService
.
getUserList
(
managerIds
);
if
(
CollectionUtils
.
isEmpty
(
userList
))
{
return
""
;
}
List
<
String
>
userNames
=
userList
.
stream
().
map
(
UserInfoResp:
:
getNickName
).
collect
(
Collectors
.
toList
());
return
StringUtils
.
join
(
userNames
,
"、"
);
}
}
}
}
community-service/src/main/resources/mapper/community/TopicManagerEntityMapper.xml
0 → 100644
View file @
faef2ae3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.tanpu.community.dao.mapper.community.TopicManagerMapper"
>
<!-- 通用查询映射结果 -->
<resultMap
id=
"BaseResultMap"
type=
"com.tanpu.community.dao.entity.community.TopicManagerEntity"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"topic_id"
property=
"topicId"
/>
<result
column=
"user_id"
property=
"userId"
/>
<result
column=
"create_by"
property=
"createBy"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
</mapper>
community-service/src/main/resources/mapper/community/TopicSubjectEntityMapper.xml
0 → 100644
View file @
faef2ae3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.tanpu.community.dao.mapper.community.TopicSubjectMapper"
>
<!-- 通用查询映射结果 -->
<resultMap
id=
"BaseResultMap"
type=
"com.tanpu.community.dao.entity.community.TopicSubjectEntity"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"topic_id"
property=
"topicId"
/>
<result
column=
"subject_id"
property=
"subjectId"
/>
<result
column=
"subject_type"
property=
"subjectType"
/>
<result
column=
"subject_sub_type"
property=
"subjectSubType"
/>
<result
column=
"create_by"
property=
"createBy"
/>
<result
column=
"create_time"
property=
"createTime"
/>
</resultMap>
</mapper>
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