diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/FictionController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/FictionController.java new file mode 100644 index 0000000..144ffd9 --- /dev/null +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/FictionController.java @@ -0,0 +1,77 @@ +package com.zhangmeng.admin.manager.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.zhangmeng.admin.manager.feign.FictionFeign; +import com.zhangmeng.model.base.baseController.BaseController; +import com.zhangmeng.model.dto.system.SysConstant; +import com.zhangmeng.model.entity.Fiction; +import com.zhangmeng.model.entity.FictionChapter; +import com.zhangmeng.model.entity.FictionDetails; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import java.util.List; + +@RestController +@RequestMapping("/fiction") +public class FictionController extends BaseController { + + @Autowired + private FictionFeign fictionFeign; + + @GetMapping("/index") + public ModelAndView fiction_index(Model model, Integer pageNum, Integer pageSize) { + + if (pageNum == null || pageSize == null) { + pageNum = pageNum == null ? 1 : pageNum; + pageSize = pageSize == null ? 10 : pageSize; + } + + PageHelper.startPage(pageNum, pageSize, "addTime desc"); + List fictionList = this.fictionFeign.findAll(); + PageInfo pageInfo = new PageInfo<>(fictionList); + + if (pageInfo.getPrePage() == 0) { + pageInfo.setPrePage(1); + } + if (pageInfo.getNextPage() == 0) { + pageInfo.setNextPage(1); + } + + model.addAttribute("pageInfo", pageInfo); + return this.jumpPage("xiaoshuo/index"); + } + + @GetMapping("/chapter/{id}") + public ModelAndView chapter(Model model, @PathVariable Long id) { + Fiction fiction = this.fictionFeign.findById(id); + model.addAttribute("fiction", fiction); + List fictionChapterList = this.fictionFeign.findByFictionId(id); + model.addAttribute("fictionChapter", fictionChapterList.get(0)); + model.addAttribute("fictionChapterList", fictionChapterList); + return this.jumpPage("xiaoshuo/fiction_chapter"); + } + + @GetMapping("/details/{chapter_id}") + public ModelAndView details(Model model, @PathVariable String chapter_id) { + + String replace = chapter_id.replace(",", ""); + Long id = Long.parseLong(replace); + List fictionDetailsList = this.fictionFeign.fictionDetailsId(id); + if (fictionDetailsList.size() > 0) { + FictionDetails fictionDetails = fictionDetailsList.get(0); + String content = fictionDetails.getContent(); + content = "
    " + content; + String replace1 = content.replace(" ", "


    "); + fictionDetails.setContent(replace1); + model.addAttribute("fictionDetails", fictionDetails); + } + return this.jumpPage("xiaoshuo/fiction_details"); + } +} diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java index db689f8..88933aa 100644 --- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java @@ -175,57 +175,7 @@ public class UrlRequestController extends BaseController { return this.jumpPage("admin/fiction/fiction_add"); } - @GetMapping(SysConstant.fiction_prefix + "/chapter/{id}") - public ModelAndView chapter(Model model, @PathVariable Long id) { - Fiction fiction = this.fictionFeign.findById(id); - model.addAttribute("fiction", fiction); - List fictionChapterList = this.fictionFeign.findByFictionId(id); - model.addAttribute("fictionChapter", fictionChapterList.get(0)); - model.addAttribute("fictionChapterList", fictionChapterList); - return this.jumpPage("xiaoshuo/fiction_chapter"); - } - - @GetMapping(SysConstant.fiction_prefix + "/details/{chapter_id}") - public ModelAndView details(Model model, @PathVariable String chapter_id) { - - String replace = chapter_id.replace(",", ""); - Long id = Long.parseLong(replace); - List fictionDetailsList = this.fictionFeign.fictionDetailsId(id); - if (fictionDetailsList.size() > 0) { - FictionDetails fictionDetails = fictionDetailsList.get(0); - String content = fictionDetails.getContent(); - content = "
    " + content; - String replace1 = content.replace(" ", "


    "); - fictionDetails.setContent(replace1); - model.addAttribute("fictionDetails", fictionDetails); - } - return this.jumpPage("xiaoshuo/fiction_details"); - } - - @ApiIgnore - @GetMapping(SysConstant.fiction_prefix + "/index") - public ModelAndView fiction_index(Model model, Integer pageNum, Integer pageSize) { - - if (pageNum == null || pageSize == null) { - pageNum = pageNum == null ? 1 : pageNum; - pageSize = pageSize == null ? 10 : pageSize; - } - - PageHelper.startPage(pageNum, pageSize, "addTime desc"); - List fictionList = this.fictionFeign.findAll(); - PageInfo pageInfo = new PageInfo<>(fictionList); - - if (pageInfo.getPrePage() == 0) { - pageInfo.setPrePage(1); - } - if (pageInfo.getNextPage() == 0) { - pageInfo.setNextPage(1); - } - - model.addAttribute("pageInfo", pageInfo); - return this.jumpPage("xiaoshuo/index"); - } @GetMapping(SysConstant.fictionCollection_prefix + "/index") public ModelAndView fictionCollection_index() { diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/blog/css/index.css b/mystyle-cloud-admin-manager/src/main/resources/static/blog/css/index.css index 656618a..f17db35 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/blog/css/index.css +++ b/mystyle-cloud-admin-manager/src/main/resources/static/blog/css/index.css @@ -169,7 +169,7 @@ body{ } .blog-author{ text-align: right; - margin: 5px 0px; + margin: 70px 0px; } .blog-des{ margin-top: -10%; diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/index.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/index.ftl index 2f4d663..5679bfa 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/index.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/blog/v1/index.ftl @@ -8,6 +8,7 @@    首页    分类 +    小说    关于我 diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl index 8d0bb04..b597fad 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/fiction_chapter.ftl @@ -32,13 +32,13 @@
<#if fictionChapterList ??> <#list fictionChapterList as fictionChapter> -
  • ${fictionChapter.title!}
    • +
  • ${fictionChapter.title!}
    • - +
    diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl index 3143157..a01afe1 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/xiaoshuo/index.ftl @@ -35,7 +35,7 @@ <#if pageInfo.getList() ??> <#list pageInfo.getList() as fiction>
    -

    ${fiction.bookName!}

    +

    ${fiction.bookName!}

    —— ${fiction.author!} ${fiction.addTime?string('yyyy-MM-dd hh:mm:ss')}

    ${fiction.intro!}

    diff --git a/mystyle-cloud-fiction/src/main/java/com/zhangmeng/fiction/controller/FictionController.java b/mystyle-cloud-fiction/src/main/java/com/zhangmeng/fiction/controller/FictionController.java index d5ca2ff..7188112 100644 --- a/mystyle-cloud-fiction/src/main/java/com/zhangmeng/fiction/controller/FictionController.java +++ b/mystyle-cloud-fiction/src/main/java/com/zhangmeng/fiction/controller/FictionController.java @@ -104,7 +104,10 @@ public class FictionController extends BaseController implements FictionControll @Override @GetMapping("/findByFictionId") public List findByFictionId(@RequestParam("id") Long id) { - return null; + Condition condition = new Condition(FictionChapter.class); + Example.Criteria criteria = condition.createCriteria(); + criteria.andEqualTo("fiction_id",id); + return this.fictionChapterService.findByCondition(condition); } @Override