Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
ims
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
ims
Commits
79885eb7
提交
79885eb7
authored
2月 24, 2024
作者:
刘明祎-运维用途
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
帖子按点赞数排行
上级
25243c11
流水线
#8280
已通过 于阶段
in 2 分 58 秒
变更
5
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
21 行增加
和
9 行删除
+21
-9
DynamicController.java
...ava/com/mmc/csf/release/controller/DynamicController.java
+9
-4
DynamicDao.java
...ice/src/main/java/com/mmc/csf/release/dao/DynamicDao.java
+1
-1
DynamicService.java
...main/java/com/mmc/csf/release/service/DynamicService.java
+1
-1
DynamicServiceImpl.java
.../com/mmc/csf/release/service/impl/DynamicServiceImpl.java
+2
-2
DynamicMapper.xml
...service/src/main/resources/mapper/forum/DynamicMapper.xml
+8
-1
没有找到文件。
release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java
浏览文件 @
79885eb7
...
...
@@ -96,10 +96,13 @@ public class DynamicController extends BaseController {
@RequestParam
(
required
=
false
)
Integer
gambitId
,
@RequestParam
(
required
=
false
)
Integer
id
,
@RequestParam
(
required
=
false
)
Integer
userAccountId
,
@RequestParam
(
required
=
false
)
String
description
,
@RequestParam
(
required
=
false
)
List
<
String
>
gambitName
)
{
@RequestParam
(
required
=
false
)
List
<
String
>
gambitName
,
@RequestParam
(
required
=
false
)
Integer
needSort
)
{
return
ResultBody
.
success
(
dynamicService
.
dynamicList
(
pageNo
,
pageSize
,
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
(),
gambitId
,
id
,
userAccountId
,
description
,
gambitName
));
pageNo
,
pageSize
,
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
(),
gambitId
,
id
,
userAccountId
,
description
,
gambitName
,
needSort
));
}
@ApiOperation
(
value
=
"动态 列表(未登录)"
)
...
...
@@ -110,10 +113,12 @@ public class DynamicController extends BaseController {
@RequestParam
(
required
=
false
)
Integer
gambitId
,
@RequestParam
(
required
=
false
)
Integer
id
,
@RequestParam
(
required
=
false
)
Integer
userAccountId
,
@RequestParam
(
required
=
false
)
String
description
,
@RequestParam
(
required
=
false
)
List
<
String
>
gambitName
)
{
@RequestParam
(
required
=
false
)
List
<
String
>
gambitName
,
@RequestParam
(
required
=
false
)
Integer
needSort
)
{
return
ResultBody
.
success
(
dynamicService
.
dynamicList
(
pageNo
,
pageSize
,
0
,
gambitId
,
id
,
userAccountId
,
description
,
gambitName
));
pageNo
,
pageSize
,
0
,
gambitId
,
id
,
userAccountId
,
description
,
gambitName
,
needSort
));
}
@ApiOperation
(
value
=
"new-小程序-返回最新5条带动态的图片"
)
...
...
release-service/src/main/java/com/mmc/csf/release/dao/DynamicDao.java
浏览文件 @
79885eb7
...
...
@@ -94,7 +94,7 @@ public interface DynamicDao {
* @param pageSize 页面大小
* @return {@link List}<{@link ForumDynamicDO}>
*/
List
<
ForumDynamicDO
>
dynamicList
(
int
itemIndex
,
Integer
pageSize
,
Integer
id
,
Integer
userAccountIds
,
String
description
);
List
<
ForumDynamicDO
>
dynamicList
(
int
itemIndex
,
Integer
pageSize
,
Integer
id
,
Integer
userAccountIds
,
String
description
,
Integer
needSort
);
List
<
ForumDynamicDO
>
dynamicListGambit
(
int
itemIndex
,
Integer
pageSize
,
Integer
id
,
Integer
userAccountIds
,
Integer
gambitId
);
...
...
release-service/src/main/java/com/mmc/csf/release/service/DynamicService.java
浏览文件 @
79885eb7
...
...
@@ -58,7 +58,7 @@ public interface DynamicService {
ResultBody
dynamicDetails
(
Integer
dynamicId
,
Integer
userId
,
HttpServletRequest
request
);
PageResult
dynamicList
(
Integer
pageNo
,
Integer
pageSize
,
Integer
userAccountId
,
Integer
gambitId
,
Integer
id
,
Integer
userId
,
String
description
,
List
<
String
>
gambitName
);
Integer
pageNo
,
Integer
pageSize
,
Integer
userAccountId
,
Integer
gambitId
,
Integer
id
,
Integer
userId
,
String
description
,
List
<
String
>
gambitName
,
Integer
needSort
);
ResultBody
recentNewsList
(
Integer
userAccountId
);
...
...
release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java
浏览文件 @
79885eb7
...
...
@@ -300,7 +300,7 @@ public class DynamicServiceImpl implements DynamicService {
@Override
public
PageResult
dynamicList
(
Integer
pageNo
,
Integer
pageSize
,
Integer
userId
,
Integer
gambitId
,
Integer
dynId
,
Integer
userAccountIds
,
String
description
,
List
<
String
>
gambitName
)
{
String
description
,
List
<
String
>
gambitName
,
Integer
needSort
)
{
Integer
tokenUserId
=
userId
;
Integer
inUserId
=
userAccountIds
;
int
count
=
dynamicDao
.
countDynamicList
(
dynId
,
userAccountIds
,
description
);
...
...
@@ -308,7 +308,7 @@ public class DynamicServiceImpl implements DynamicService {
return
PageResult
.
buildPage
(
pageNo
,
pageSize
,
0
);
}
int
itemIndex
=
(
pageNo
-
1
)
*
pageSize
;
List
<
ForumDynamicDO
>
forumDynamicList
=
dynamicDao
.
dynamicList
(
itemIndex
,
pageSize
,
dynId
,
userAccountIds
,
description
);
List
<
ForumDynamicDO
>
forumDynamicList
=
dynamicDao
.
dynamicList
(
itemIndex
,
pageSize
,
dynId
,
userAccountIds
,
description
,
needSort
);
if
(
gambitName
!=
null
){
for
(
String
s
:
gambitName
)
{
...
...
release-service/src/main/resources/mapper/forum/DynamicMapper.xml
浏览文件 @
79885eb7
...
...
@@ -428,7 +428,14 @@
<if
test=
"description!=null and description!='' "
>
and description like concat('%',#{description},'%')
</if>
order by create_time desc
<choose>
<when
test=
"needSort != null"
>
order by likes_count desc
</when>
<otherwise>
order by create_time desc
</otherwise>
</choose>
LIMIT #{itemIndex}, #{pageSize}
</select>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论