WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 70a6e3d

Browse files
yangrunkangyangrunkang
committed
DevTest(页面适配增强实体): 文章详情上/下一篇、待办、全局搜索、管理员处理用户所有数据、管理文章数据 测试ok
1 parent a49b3f7 commit 70a6e3d

File tree

9 files changed

+33
-28
lines changed

9 files changed

+33
-28
lines changed

‎upupor-data/src/main/java/com/upupor/data/types/ContentStatus.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,11 @@ public static List<ContentStatus> notIn() {
101101
ContentStatus.EXCEPTION.getStatus(), ContentStatus.DELETED.getStatus()
102102
);
103103

104+
/**
105+
* 管理员可操作的状态
106+
*/
107+
public static List<Integer> adminCanOperateStatusList = Lists.newArrayList(
108+
ContentStatus.ONLY_SELF_CAN_SEE.getStatus(), ContentStatus.NORMAL.getStatus(), ContentStatus.DELETED.getStatus()
109+
);
110+
104111
}

‎upupor-service/src/main/java/com/upupor/service/aggregation/RadioAggregateService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public RadioIndexDto detail(String radioId, Integer pageNum, Integer pageSize) {
9797
contentService.bindRadioContentData(Collections.singletonList(radioEnhance));
9898

9999
// 绑定访问者
100-
radioEnhance.setViewHistoryEnhanceList(viewerService.listViewerByTargetIdAndType(radioId, ViewTargetType.CONTENT));
100+
radioEnhance.setViewHistoryEnhanceList(viewerService.listViewerByTargetIdAndType(radioId, ViewTargetType.RADIO));
101101

102102
RadioIndexDto radioIndexDto = new RadioIndexDto();
103103
radioIndexDto.setRadioEnhance(radioEnhance);

‎upupor-service/src/main/java/com/upupor/service/base/impl/ContentServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ public Boolean updateContent(ContentEnhance contentEnhance) {
300300
Asserts.notNull(content, CONTENT_NOT_EXISTS);
301301
Boolean updateContent, updateContentExtend = Boolean.FALSE;
302302
updateContent = contentMapper.updateById(content) > 0;
303-
ContentExtend contentExtend = contentEnhance.getContentExtendEnhance().getContentExtend();
304-
if (Objects.nonNull(contentExtend)) {
303+
if (Objects.nonNull(contentEnhance.getContentExtendEnhance())) {
304+
ContentExtend contentExtend = contentEnhance.getContentExtendEnhance().getContentExtend();
305305
updateContentExtend = contentExtendMapper.updateById(contentExtend) > 0;
306306
}
307307

‎upupor-web/src/main/java/com/upupor/web/controller/AdminController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ public CcResponse handleUser(BatchHandleExceptionUserReq batchHandleExceptionUse
134134
});
135135

136136

137-
// 将用户的所有文章设置为审核中
137+
// 将用户的所有文章设置为 仅自己可见
138138
List<ContentEnhance> contentEnhanceList = contentService.listAllByUserId(userIdList);
139139
if (!CollectionUtils.isEmpty(contentEnhanceList)) {
140140
contentEnhanceList.forEach(content -> {
141-
content.getContent().setStatus(ContentStatus.Applying);
141+
content.getContent().setStatus(ContentStatus.ONLY_SELF_CAN_SEE);
142142
contentService.updateContent(content);
143143
});
144144
}

‎upupor-web/src/main/java/com/upupor/web/controller/TodoController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public CcResponse markTodo(UpdateTodoDoneStatus updateTodoDoneStatus) {
127127
throw new BusinessException(ErrorCode.TODO_STATUS_ERROR);
128128
}
129129

130-
Integer result = todoService.update(Converter.todoEnhance(todo));
130+
Integer result = todoService.update(Converter.todoEnhance(update));
131131
ccResponse.setData(result > 0);
132132
return ccResponse;
133133
}

‎upupor-web/src/main/java/com/upupor/web/page/AdminPageJumpController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
package com.upupor.web.page;
2929

30+
import com.upupor.data.types.ContentStatus;
3031
import com.upupor.framework.CcConstant;
3132
import com.upupor.service.aggregation.AdminAggregateService;
32-
import com.upupor.data.types.ContentStatus;
3333
import io.swagger.annotations.Api;
3434
import io.swagger.annotations.ApiOperation;
3535
import lombok.RequiredArgsConstructor;
@@ -89,7 +89,7 @@ public ModelAndView userManageAdmin(Integer pageNum, Integer pageSize, @PathVari
8989
ModelAndView modelAndView = new ModelAndView();
9090
modelAndView.setViewName(EDIT_USER_MANAGE_CONTENT);
9191
modelAndView.addObject(adminAggregateService.adminContent(pageNum, pageSize, contentId));
92-
modelAndView.addObject("contentStatusList", ContentStatus.values());
92+
modelAndView.addObject("contentStatusList", ContentStatus.adminCanOperateStatusList);
9393
modelAndView.addObject(SeoKey.TITLE, "管理员");
9494
modelAndView.addObject(SeoKey.DESCRIPTION, "管理员");
9595
return modelAndView;

‎upupor-web/src/main/resources/templates/content/index.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ <h5 class="text-wrap m-0" th:text="${contentIndexDto.contentEnhance.content.titl
9999
<!--上一篇/下一篇-->
100100
<div class="list-group list-group-horizontal" th:if="${contentIndexDto.contentEnhance.lastAndNextContentDto} != null">
101101
<a class="list-group-item list-group-item-action flex-grow-1 text-start flex-fill cv-link text-truncate border-0"
102-
th:if="${contentIndexDto.contentEnhance.lastAndNextContentDto.nextContentEnhance.content} != null"
103-
th:href="'/u/'+${contentIndexDto.contentEnhance.lastAndNextContentDto.nextContentEnhance.content.contentId}"
104-
th:title="${contentIndexDto.contentEnhance.lastAndNextContentDto.nextContentEnhance.content.title}"
105-
th:inline="text">上一篇: 《[[${contentIndexDto.contentEnhance.lastAndNextContentDto.nextContentEnhance.content.title}]]》</a>
102+
th:if="${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.nextContentEnhance?.content} != null"
103+
th:href="'/u/'+${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.nextContentEnhance?.content.contentId}"
104+
th:title="${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.nextContentEnhance?.content.title}"
105+
th:inline="text">上一篇: 《[[${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.nextContentEnhance?.content.title}]]》</a>
106106

107107
<a class="list-group-item list-group-item-action flex-grow-1 text-start flex-fill cv-link text-truncate border-0"
108-
th:if="${contentIndexDto.contentEnhance.lastAndNextContentDto.lastContentEnhance.content} != null"
109-
th:href="'/u/'+${contentIndexDto.contentEnhance.lastAndNextContentDto.lastContentEnhance.content.contentId}"
110-
th:title="${contentIndexDto.contentEnhance.lastAndNextContentDto.lastContentEnhance.content.title}"
111-
th:inline="text">下一篇: 《[[${contentIndexDto.contentEnhance.lastAndNextContentDto.lastContentEnhance.content.title}]]》</a>
108+
th:if="${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.lastContentEnhance?.content} != null"
109+
th:href="'/u/'+${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.lastContentEnhance?.content.contentId}"
110+
th:title="${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.lastContentEnhance?.content.title}"
111+
th:inline="text">下一篇: 《[[${contentIndexDto?.contentEnhance?.lastAndNextContentDto?.lastContentEnhance?.content.title}]]》</a>
112112
</div>
113113
<!--未登录提示-->
114114
<div th:if="!${session?.cv_user_id}" th:include="fragments/index::login_tips"></div>
@@ -195,7 +195,7 @@ <h5 class="text-wrap m-0" th:text="${contentIndexDto.contentEnhance.content.titl
195195
<div class="border-0 mt-2 small text-black-50">以下用户觉得很赞:</div>
196196
<span th:each="memberEnhance : ${contentIndexDto.contentEnhance.likesMemberEnhanceList}">
197197
<a class="cv-link" th:href="'/profile/'+${memberEnhance.member.userId}+'/content'">
198-
<span th:if="!${#strings.isEmpty(member.via)}"><img class="lazyload img rounded cv-icon" th:data-src="${memberEnhance.member.via}" th:alt="${memberEnhance.member.userName}" /></span>
198+
<span th:if="!${#strings.isEmpty(memberEnhance.member.via)}"><img class="lazyload img rounded cv-icon" th:data-src="${memberEnhance.member.via}" th:alt="${memberEnhance.member.userName}" /></span>
199199
</a>
200200
</span>
201201
</div>

‎upupor-web/src/main/resources/templates/search/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ <h2 style="font-weight: lighter">关键字</h2>
6767
<span class="badge bg-gradient bg-warning text-dark fw-light rounded-3 small">文章</span>
6868
</div>
6969
</div>
70-
<a class="flex-shrink-0 text-black-50 cv-link" th:href="'/profile/' + ${searchData.member.userId}+'/content'" th:title="${searchData.member.userName}">
71-
<img class="lazyload img rounded rounded-right cv-icon-50" th:data-src="${searchData.member.via}" th:alt="${searchData.member.userName}">
70+
<a class="flex-shrink-0 text-black-50 cv-link" th:href="'/profile/' + ${searchData.memberEnhance.member.userId}+'/content'" th:title="${searchData.memberEnhance.member.userName}">
71+
<img class="lazyload img rounded rounded-right cv-icon-50" th:data-src="${searchData.memberEnhance.member.via}" th:alt="${searchData.memberEnhance.member.userName}">
7272
</a>
7373
</div>
7474

@@ -79,20 +79,20 @@ <h2 style="font-weight: lighter">关键字</h2>
7979
<span class="badge bg-gradient bg-primary fw-light rounded-3 small">电台</span>
8080
</div>
8181
</div>
82-
<a class="flex-shrink-0 text-black-50 cv-link" th:href="'/profile/' + ${searchData.member.userId}+'/content'" th:title="${searchData.member.userName}">
83-
<img class="lazyload img rounded rounded-right cv-icon-50" th:data-src="${searchData.member.via}" th:alt="${searchData.member.userName}">
82+
<a class="flex-shrink-0 text-black-50 cv-link" th:href="'/profile/' + ${searchData.memberEnhance.member.userId}+'/content'" th:title="${searchData.memberEnhance.member.userName}">
83+
<img class="lazyload img rounded rounded-right cv-icon-50" th:data-src="${searchData.memberEnhance.member.via}" th:alt="${searchData.memberEnhance.member.userName}">
8484
</a>
8585
</div>
8686

8787
<div class="d-flex align-items-center" th:if="${searchData.dataType.name()} == 'MEMBER'">
8888
<div class="flex-grow-1">
8989
<div class="mt-0">
90-
<a th:href="'/profile/' + ${searchData.member.userId}+'/content'" class="cv-link up-text-overflow fs-6 fst-normal" th:title="${searchData.resultTitle}" th:utext="${searchData.resultTitle}"></a>
90+
<a th:href="'/profile/' + ${searchData.memberEnhance.member.userId}+'/content'" class="cv-link up-text-overflow fs-6 fst-normal" th:title="${searchData.resultTitle}" th:utext="${searchData.resultTitle}"></a>
9191
<span class="badge bg-gradient bg-success fw-light rounded-3 small">用户</span>
9292
</div>
9393
</div>
94-
<a class="flex-shrink-0 text-black-50 cv-link" th:href="'/profile/' + ${searchData.member.userId}+'/content'" th:title="${searchData.member.userName}">
95-
<img class="lazyload img rounded rounded-right cv-icon-50" th:data-src="${searchData.member.via}" th:alt="${searchData.member.userName}">
94+
<a class="flex-shrink-0 text-black-50 cv-link" th:href="'/profile/' + ${searchData.memberEnhance.member.userId}+'/content'" th:title="${searchData.memberEnhance.member.userName}">
95+
<img class="lazyload img rounded rounded-right cv-icon-50" th:data-src="${searchData.memberEnhance.member.via}" th:alt="${searchData.memberEnhance.member.userName}">
9696
</a>
9797
</div>
9898
</li>

‎upupor-web/src/main/resources/templates/user/admin/content.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@ <h5 class="lead fw-bold text-primary">关键字</h5>
5050
</div>
5151
<div class="col-11">
5252
<input class="form-control" type="text" id="keywords"
53-
th:value="${contentIndexDto.getContentEnhance.keywords}"/>
53+
th:value="${contentIndexDto.contentEnhance.content.keywords}"/>
5454
<button class="ui primary button mt-2"
5555
th:onclick="setKeywords([[${contentIndexDto.contentEnhance.content.contentId}]])">设置
5656
</button>
5757
</div>
5858
</div>
59-
60-
6159
</div>
6260

6361
<div class="card border-0 rounded-3 p-2 mb-2">
@@ -70,7 +68,7 @@ <h5 class="lead fw-bold text-primary">设置状态</h5>
7068
<select class="form-select" id="admin_set_content_status">
7169
<option th:each="contentStatus : ${contentStatusList}"
7270
th:value="${contentStatus.name()}"
73-
th:selected="${contentIndexDto?.getContentEnhance?.status.name() == contentStatus.name()}"
71+
th:selected="${contentIndexDto?.contentEnhance?.content.status.name() == contentStatus.name()}"
7472
>
7573
[[${contentStatus.name}]]
7674
</option>

0 commit comments

Comments
 (0)