Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update fix

Browse Source
This commit is contained in:
Chuyaoyuan
2026-05-09 11:35:30 +08:00
parent 1828c37fca
commit ba8c1e3be3
15 changed files with 158 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java
+3
View File
@@ -73,6 +73,9 @@ public class UserPostController extends BaseController {
public String getDiscussionsById(HttpServletRequest request, ModelMap map, @RequestParam("id") Integer id) {
logger.info(">>> getDiscussionsById{}", id);
// Atomically increment view count before loading the discussion
discussionsService.incrementViewCount(id);
Discussion discussion = discussionsService.findOne(id);
// 获取此主题下的评论
List<Post> posts = postsService.findOneBy(id);
src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java
+1
View File
@@ -112,6 +112,7 @@ public class UserSystemController extends BaseController {
map.put("pageTotal", total);
map.put("pageNum", pageNum);
map.put("pageTotalPages", allDiscussionsPage.getTotalPages());
map.put("pageNumAll", allDiscussionsPage.getTotalPages());
UserInfo user = getUserInfo(request);
if (user != null) {
map.put("username", user.getUsername());
src/main/java/com/yaoyuan/jiscuss/controller/api/RestUserController.java
+28 -18
View File
@@ -1,11 +1,16 @@
package com.yaoyuan.jiscuss.controller.api;
import com.yaoyuan.jiscuss.dto.UserCreateRequest;
import com.yaoyuan.jiscuss.dto.UserMapper;
import com.yaoyuan.jiscuss.dto.UserResponse;
import com.yaoyuan.jiscuss.entity.User;
import com.yaoyuan.jiscuss.exception.BaseException;
import com.yaoyuan.jiscuss.response.ApiResponse;
import com.yaoyuan.jiscuss.response.ResponseCode;
import com.yaoyuan.jiscuss.service.IUsersService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,46 +35,51 @@ public class RestUserController {
@Autowired
private IUsersService usersService;
@Autowired
private UserMapper userMapper;
@PostMapping("/user")
@Operation(summary = "新增用户")
public User save(@RequestBody User user) {
User saveUser = usersService.insert(user);
if (saveUser != null) {
return saveUser;
} else {
throw new BaseException(ResponseCode.RESOURCES_NOT_EXIST);
public ApiResponse<UserResponse> save(@Valid @RequestBody UserCreateRequest request) {
User user = userMapper.fromCreateRequest(request);
User saved = usersService.insert(user);
if (saved != null) {
return ApiResponse.ok(userMapper.toResponse(saved));
}
throw new BaseException(ResponseCode.RESOURCES_NOT_EXIST);
}
@DeleteMapping("/user/{id}")
@Operation(summary = "删除用户")
public Boolean delete(@PathVariable Integer id) {
public ApiResponse<Boolean> delete(@PathVariable Integer id) {
usersService.remove(id);
return true;
return ApiResponse.ok(true);
}
@PutMapping("/user/{id}")
@Operation(summary = "修改用户")
public User update(@RequestBody User user, @PathVariable Integer id) {
User updateuser = usersService.update(user, id);
if (updateuser != null) {
return updateuser;
} else {
throw new BaseException(ResponseCode.RESOURCES_NOT_EXIST);
public ApiResponse<UserResponse> update(@RequestBody User user, @PathVariable Integer id) {
User updated = usersService.update(user, id);
if (updated != null) {
return ApiResponse.ok(userMapper.toResponse(updated));
}
throw new BaseException(ResponseCode.RESOURCES_NOT_EXIST);
}
@GetMapping("/user/{id}")
@Operation(summary = "获取用户")
public User getUser(@PathVariable Integer id) {
public ApiResponse<UserResponse> getUser(@PathVariable Integer id) {
User user = usersService.findOne(id);
logger.info("获取用户==>：{}", user);
return user;
return ApiResponse.ok(userMapper.toResponse(user));
}
@GetMapping("/user")
@Operation(summary = "获取全部用户")
public List<User> getAllUsers() {
return usersService.getAllList();
public ApiResponse<List<UserResponse>> getAllUsers() {
List<UserResponse> list = usersService.getAllList().stream()
.map(userMapper::toResponse)
.toList();
return ApiResponse.ok(list);
}
}
src/main/java/com/yaoyuan/jiscuss/entity/Discussion.java
+3
View File
@@ -77,5 +77,8 @@ public class Discussion implements Serializable {
@Column(name = "create_time")
private Date createTime;
@Column(name = "view_count")
private Integer viewCount = 0;
}
src/main/java/com/yaoyuan/jiscuss/entity/User.java
+3 -1
View File
@@ -1,5 +1,6 @@
package com.yaoyuan.jiscuss.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
@@ -39,7 +40,8 @@ public class User implements Serializable {
@Column(name = "email")
private String email;
/** BCrypt-hashed password. Column length must be >= 68 (see V2 migration). */
/** BCrypt-hashed password. Column length must be >= 68 (see V2 migration). Never serialized to JSON. */
@JsonIgnore
@Column(name = "password")
private String password;
src/main/java/com/yaoyuan/jiscuss/entity/UserInfo.java
+2 -3
View File
@@ -77,10 +77,9 @@ public class UserInfo implements UserDetails {
@Override
public String toString() {
return "UserInfo{" +
"authorities=" + authorities +
", password='" + password + '\'' +
", username='" + username + '\'' +
"username='" + username + '\'' +
", id='" + id + '\'' +
", authorities=" + authorities +
'}';
}
}
src/main/java/com/yaoyuan/jiscuss/repository/DiscussionsRepository.java
+6 -1
View File
@@ -4,8 +4,10 @@ import com.yaoyuan.jiscuss.entity.Discussion;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository
public interface DiscussionsRepository extends JpaRepository<Discussion, Integer> {
@@ -14,5 +16,8 @@ public interface DiscussionsRepository extends JpaRepository<Discussion, Integer
"SELECT discussion_id from discussiontag where tag_id = ?1 ) ", nativeQuery = true)
Page<Discussion> findByQuery(String tagId, Pageable pageable);
@Modifying
@Transactional
@Query("UPDATE Discussion d SET d.viewCount = d.viewCount + 1 WHERE d.id = :id")
void incrementViewCount(@org.springframework.data.repository.query.Param("id") Integer id);
}
src/main/java/com/yaoyuan/jiscuss/service/IDiscussionsService.java
+2
View File
@@ -14,4 +14,6 @@ public interface IDiscussionsService {
Discussion findOne(Integer id);
Page<Discussion> queryAllDiscussionsList(Discussion discussion, int pageNumNew, int pageSiz, String tag, String type);
void incrementViewCount(Integer id);
}
src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java
+7 -2
View File
@@ -35,8 +35,7 @@ public class DiscussionsServiceImpl implements IDiscussionsService {
@Transactional(readOnly = true)
@Override
public Discussion findOne(Integer id) {
// getReferenceById replaces removed JpaRepository.getOne()
return discussionsRepository.getReferenceById(id);
return discussionsRepository.findById(id).orElse(null);
}
@Transactional(readOnly = true)
@@ -55,4 +54,10 @@ public class DiscussionsServiceImpl implements IDiscussionsService {
return discussionsRepository.findAll(example, pageable);
}
}
@Transactional
@Override
public void incrementViewCount(Integer id) {
discussionsRepository.incrementViewCount(id);
}
}
src/main/resources/db/migration/V6__add_indexes.sql
+26
View File
@@ -0,0 +1,26 @@
-- V6: Add indexes for high-frequency query columns.
-- All indexes use IF NOT EXISTS for idempotent migrations.
-- post table: most reads filter/sort by discussion_id, parent_id, create_time
CREATE INDEX IF NOT EXISTS idx_post_discussion_id ON post(discussion_id);
CREATE INDEX IF NOT EXISTS idx_post_parent_id ON post(parent_id);
CREATE INDEX IF NOT EXISTS idx_post_create_time ON post(create_time);
CREATE INDEX IF NOT EXISTS idx_post_create_id ON post(create_id);
-- discussion table: sorted by id/create_time/start_time/like_count; joined on start_user_id/last_user_id
CREATE INDEX IF NOT EXISTS idx_discussion_create_time ON discussion(create_time);
CREATE INDEX IF NOT EXISTS idx_discussion_start_time ON discussion(start_time);
CREATE INDEX IF NOT EXISTS idx_discussion_like_count ON discussion(like_count);
CREATE INDEX IF NOT EXISTS idx_discussion_start_user_id ON discussion(start_user_id);
CREATE INDEX IF NOT EXISTS idx_discussion_last_user_id ON discussion(last_user_id);
-- discussiontag table: used in tag-filter queries and cascade deletes
CREATE INDEX IF NOT EXISTS idx_discussiontag_discussion_id ON discussiontag(discussion_id);
CREATE INDEX IF NOT EXISTS idx_discussiontag_tag_id ON discussiontag(tag_id);
-- user table: login and username-lookup path
CREATE INDEX IF NOT EXISTS idx_user_username ON user(username);
-- likecollect table: user activity queries
CREATE INDEX IF NOT EXISTS idx_likecollect_user_id ON likecollect(user_id);
CREATE INDEX IF NOT EXISTS idx_likecollect_discussion_id ON likecollect(discussion_id);
src/main/resources/db/migration/V7__view_count.sql
+5
View File
@@ -0,0 +1,5 @@
-- V7: Add view_count to discussion table.
-- Tracks how many times a discussion has been viewed.
ALTER TABLE discussion ADD COLUMN IF NOT EXISTS view_count INTEGER NOT NULL DEFAULT 0;
CREATE INDEX IF NOT EXISTS idx_discussion_view_count ON discussion(view_count);
src/main/resources/templates/discussions.ftl
+5 -1
View File
@@ -49,9 +49,13 @@
<i class="heart icon"></i> 赞这个主题
</div>
<a class="ui basic red left pointing label">
1,048
${discussions.likeCount!0}
</a>
</div>
<span style="margin-left:12px; color:#888; font-size:0.9em;">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
&nbsp;&nbsp;<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</span>
<div class="ui feed">
src/main/resources/templates/index.ftl
+67 -58
View File
@@ -347,10 +347,13 @@
</div>
<div class="nullright meta">
<a class="like ">
<i class="like icon"></i> ${discussions.likeCount} 喜欢
<i class="like icon"></i> ${discussions.likeCount!0} 喜欢
</a>
<a class="comment ">
<i class="comment icon"></i> ${discussions.commentsCount} 回复
<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</a>
<a class="comment ">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
</a>
</div>
</div>
@@ -397,10 +400,13 @@
</div>
<div class="nullright meta">
<a class="like ">
<i class="like icon"></i> ${discussions.likeCount} 喜欢
<i class="like icon"></i> ${discussions.likeCount!0} 喜欢
</a>
<a class="comment ">
<i class="comment icon"></i> ${discussions.commentsCount} 回复
<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</a>
<a class="comment ">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
</a>
</div>
</div>
@@ -446,10 +452,13 @@
</div>
<div class="nullright meta">
<a class="like ">
<i class="like icon"></i> ${discussions.likeCount} 喜欢
<i class="like icon"></i> ${discussions.likeCount!0} 喜欢
</a>
<a class="comment ">
<i class="comment icon"></i> ${discussions.commentsCount} 回复
<i class="comment icon"></i> ${discussions.commentsCount!0} 回复
</a>
<a class="comment ">
<i class="eye icon"></i> ${discussions.viewCount!0} 浏览
</a>
</div>
</div>
@@ -461,68 +470,68 @@
</div>
<#-- Pagination: preserves tag and type query parameters -->
<div class="ui borderless menu">
<a class="icon item" id="upPage">
<i class="left chevron icon"></i>
</a>
<#assign baseUrl = "/?tag=" + tag + "&type=" + type>
<#if pageNum gt 1>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum - 1}">
<i class="left chevron icon"></i>
</a>
<#else>
<div class="disabled icon item"><i class="left chevron icon"></i></div>
</#if>
<#list pageDiscussions as page>
<#if page == pageNum && !(username)??>
<a class="item" style=" background-color: #7d827d;" href="/?pageNum=${page}">
${page}
</a>
</#if>
<#if page != pageNum && !(username)??>
<a class="item" href="/?pageNum=${page}">
${page}
</a>
</#if>
<#if page == pageNum && username??>
<a class="item" style=" background-color: #7d827d;" href="/main?pageNum=${page}">
${page}
</a>
</#if>
<#if page != pageNum && username??>
<a class="item" href="/main?pageNum=${page}">
${page}
</a>
<#assign pageInt = page?number>
<#if pageInt == pageNum>
<a class="active item" href="${baseUrl}&pageNum=${page}">${page}</a>
<#else>
<a class="item" href="${baseUrl}&pageNum=${page}">${page}</a>
</#if>
</#list>
<a class="icon item" id="nextPage"> <i class="right chevron icon"></i>
</a>
<#if pageNum lt pageTotalPages>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum + 1}">
<i class="right chevron icon"></i>
</a>
<#else>
<div class="disabled icon item"><i class="right chevron icon"></i></div>
</#if>
</div>
<!--pager-->
<#--<div class="ui borderless menu">
<ul class="pagination">
<#import "./comm/page.ftl" as page />
<@page.fpage page=pageNum pagesize=pageSize totalpages=pageTotalPages totalrecords=pageTotal url="/" />
</ul>
</div>-->
</div>
<div class="mobile only sixteen wide column">
<div class="ui segment">Jiscuss手机可见，内容正在编写中，pc端可正常访问</div>
<div class="ui large feed">
<#list allDiscussions as discussions>
<div class="event">
<div class="content">
<div class="summary">
<a href="/getdiscussionsbyid?id=${discussions.id}">
${discussions.title}
</a>
<div class="date">${discussions.startTime}</div>
</div>
<div class="meta">
<a><b>${discussions.username}</b></a>&nbsp;•&nbsp;
<i class="comment icon"></i>${discussions.commentsCount!0} 回复&nbsp;
<i class="eye icon"></i>${discussions.viewCount!0} 浏览
</div>
</div>
</div>
<div class="ui fitted divider"></div>
</#list>
</div>
<div class="ui borderless menu">
<a class="icon item">
<i class="left chevron icon"></i>
</a>
<a class="item">
1
</a>
<a class="item">
2
</a>
<div class="disabled item">
...
</div>
<a class="item">
10
</a>
<a class="item">
11
</a>
<a class="icon item"> <i class="right chevron icon"></i>
</a>
<#if pageNum gt 1>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum - 1}"><i class="left chevron icon"></i></a>
<#else>
<div class="disabled icon item"><i class="left chevron icon"></i></div>
</#if>
<span class="item">${pageNum} / ${pageTotalPages}</span>
<#if pageNum lt pageTotalPages>
<a class="icon item" href="${baseUrl}&pageNum=${pageNum + 1}"><i class="right chevron icon"></i></a>
<#else>
<div class="disabled icon item"><i class="right chevron icon"></i></div>
</#if>
</div>
</div>