diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/mapper/UserRefBookMapper.java b/novel-front/src/main/java/xyz/zinglizingli/books/mapper/UserRefBookMapper.java index 34414b1..0c7020b 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/mapper/UserRefBookMapper.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/mapper/UserRefBookMapper.java @@ -28,4 +28,8 @@ public interface UserRefBookMapper { int updateByPrimaryKeySelective(UserRefBook record); int updateByPrimaryKey(UserRefBook record); + + void updateNewstIndex(@Param("bookId") Long bookId,@Param("userId") String userId,@Param("indexNum") Integer indexNum); + + Integer queryBookIndexNumber(@Param("userId") String userId,@Param("bookId") Long bookId); } \ No newline at end of file diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/service/BookService.java b/novel-front/src/main/java/xyz/zinglizingli/books/service/BookService.java index a7b30cd..4de3098 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/service/BookService.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/service/BookService.java @@ -17,10 +17,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; import tk.mybatis.orderbyhelper.OrderByHelper; import xyz.zinglizingli.books.constant.CacheKeyConstans; -import xyz.zinglizingli.books.mapper.BookContentMapper; -import xyz.zinglizingli.books.mapper.BookIndexMapper; -import xyz.zinglizingli.books.mapper.BookMapper; -import xyz.zinglizingli.books.mapper.ScreenBulletMapper; +import xyz.zinglizingli.books.mapper.*; import xyz.zinglizingli.books.po.*; import xyz.zinglizingli.common.cache.CommonCacheUtil; import xyz.zinglizingli.common.utils.RestTemplateUtil; @@ -45,6 +42,9 @@ public class BookService { @Autowired private ScreenBulletMapper screenBulletMapper; + @Autowired + private UserRefBookMapper userRefBookMapper; + @Autowired private CommonCacheUtil cacheUtil; @@ -330,9 +330,14 @@ public class BookService { return contentBuilder.toString(); } - public void addVisitCount(Long bookId) { + public void addVisitCount(Long bookId, String userId, Integer indexNum) { bookMapper.addVisitCount(bookId); + + if(org.apache.commons.lang3.StringUtils.isNotBlank(userId)) { + userRefBookMapper.updateNewstIndex(bookId, userId, indexNum); + } + } public String queryIndexNameByBookIdAndIndexNum(Long bookId, Integer indexNum) { diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/service/UserService.java b/novel-front/src/main/java/xyz/zinglizingli/books/service/UserService.java index 2444318..9f8f765 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/service/UserService.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/service/UserService.java @@ -83,4 +83,8 @@ public class UserService { addToCollect(bookId, userid); } } + + public Integer queryBookIndexNumber(String userId, Long bookId) { + return userRefBookMapper.queryBookIndexNumber(userId,bookId); + } } diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java b/novel-front/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java index e643dce..cf754b9 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java @@ -176,13 +176,13 @@ public class ApiBookController { return modelMap; } - @RequestMapping("addVisit") + /*@RequestMapping("addVisit") public String addVisit(@RequestParam("bookId") Long bookId) { - bookService.addVisitCount(bookId); + bookService.addVisitCount(bookId, userId, indexNum); return "ok"; - } + }*/ } diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java b/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java index e37ef74..a9e449e 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java @@ -17,6 +17,7 @@ import xyz.zinglizingli.books.po.BookContent; import xyz.zinglizingli.books.po.BookIndex; import xyz.zinglizingli.books.po.ScreenBullet; import xyz.zinglizingli.books.service.BookService; +import xyz.zinglizingli.books.service.UserService; import xyz.zinglizingli.books.vo.BookVO; import xyz.zinglizingli.common.cache.CommonCacheUtil; @@ -35,6 +36,9 @@ public class BookController { @Autowired private BookService bookService; + @Autowired + private UserService userService; + @Autowired private CommonCacheUtil commonCacheUtil; @@ -187,7 +191,16 @@ public class BookController { } @RequestMapping("{bookId}.html") - public String detail(@PathVariable("bookId") Long bookId, ModelMap modelMap) { + public String detail(@PathVariable("bookId") Long bookId, @RequestParam(value = "token",required = false)String token, ModelMap modelMap) { + String userId = commonCacheUtil.get(token); + if(org.apache.commons.lang3.StringUtils.isNotBlank(userId)){ + Integer indexNumber = userService.queryBookIndexNumber(userId,bookId); + if(indexNumber!=null){ + return "redirect:/book/"+bookId+"/"+indexNumber+".html"; + } + + } + //查询基本信息 Book book = bookService.queryBaseInfo(bookId); //查询最新目录信息 @@ -260,9 +273,10 @@ public class BookController { @RequestMapping("addVisit") @ResponseBody - public String addVisit(@RequestParam("bookId") Long bookId) { + public String addVisit(@RequestParam("bookId") Long bookId,@RequestParam("indexNum") Integer indexNum,@RequestParam("token") String token) { + String userId = commonCacheUtil.get(token); - bookService.addVisitCount(bookId); + bookService.addVisitCount(bookId,userId,indexNum); return "ok"; } diff --git a/novel-front/src/main/resources/mybatis/mapping/UserRefBookMapper.xml b/novel-front/src/main/resources/mybatis/mapping/UserRefBookMapper.xml index 89c23f8..f4911ac 100644 --- a/novel-front/src/main/resources/mybatis/mapping/UserRefBookMapper.xml +++ b/novel-front/src/main/resources/mybatis/mapping/UserRefBookMapper.xml @@ -178,4 +178,15 @@ book_id = #{bookId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} + + + update user_ref_book + set index_num = #{indexNum} + where book_id = #{bookId} and user_id = #{userId} + + + \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/books/book_content.html b/novel-front/src/main/resources/templates/books/book_content.html index a5ae916..971c767 100644 --- a/novel-front/src/main/resources/templates/books/book_content.html +++ b/novel-front/src/main/resources/templates/books/book_content.html @@ -375,6 +375,14 @@ + + + +
@@ -458,8 +466,7 @@ isMobile = isIphone || isAndroid; - $.get("/book/addVisit", {"bookId": $("#bookIdHidden").val()}, function () { - }); +