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 0018b44..ce532e7 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 @@ -1,10 +1,9 @@ package com.zhangmeng.admin.manager.controller; import com.alibaba.fastjson.JSONObject; -import com.zhangmeng.admin.manager.feign.ArticleFeign; -import com.zhangmeng.admin.manager.feign.CategoryFeign; -import com.zhangmeng.admin.manager.feign.MailFeign; -import com.zhangmeng.admin.manager.feign.QuartzFeign; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.zhangmeng.admin.manager.feign.*; import com.zhangmeng.admin.manager.service.PermissionService; import com.zhangmeng.admin.manager.service.RoleService; import com.zhangmeng.admin.manager.service.SysLogService; @@ -20,10 +19,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; 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.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import springfox.documentation.annotations.ApiIgnore; +import tk.mybatis.mapper.entity.Condition; +import tk.mybatis.mapper.entity.Example; import java.util.*; @@ -62,6 +64,9 @@ public class UrlRequestController extends BaseController { @Autowired private MailFeign mailFeign; + @Autowired + private FictionFeign fictionFeign; + //跳转首页 @GetMapping({"/login","/"}) public ModelAndView login (){ @@ -364,4 +369,69 @@ public class UrlRequestController extends BaseController { } return this.jumpPage("admin/mail/edit"); } + + @ApiIgnore + @GetMapping("/fiction/add") + public ModelAndView add() { + return this.jumpPage("admin/fiction/fiction_add"); + } + + @ApiIgnore + @GetMapping("/fiction/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"); + } + + @ApiIgnore + @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"); + } + + @ApiIgnore + @GetMapping("/fiction/index") + public ModelAndView 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("/fictionCollection/index") + public ModelAndView fictionCollection_index() { + return this.jumpPage("admin/fiction/fiction_list"); + } } \ No newline at end of file diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/FictionFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/FictionFeign.java new file mode 100644 index 0000000..da7128c --- /dev/null +++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/FictionFeign.java @@ -0,0 +1,29 @@ +package com.zhangmeng.admin.manager.feign; + +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.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient(SysConstant.mystyle_cloud_fiction) +public interface FictionFeign { + + @GetMapping(SysConstant.mystyle_cloud_fiction_prefix +"/findBy/{id}") + Fiction findById(@PathVariable("id") Long id); + + @GetMapping(SysConstant.mystyle_cloud_fiction_prefix + "/findByFictionId") + List findByFictionId(@RequestParam("id") Long id); + + @GetMapping(SysConstant.mystyle_cloud_fiction_prefix + "/fictionDetailsId") + List fictionDetailsId(@RequestParam("id") Long id); + + @GetMapping(SysConstant.mystyle_cloud_fiction_prefix + "/findAllToFiction") + List findAll(); + +} diff --git a/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js b/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js index 68c30f9..bd63542 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js +++ b/mystyle-cloud-admin-manager/src/main/resources/static/system/admin/js/mystyle-admin.js @@ -12,6 +12,8 @@ var file_url = "mystyle-cloud-file"; var quartz_url = "mystyle-cloud-quartz"; //邮件微服务 var mail_url = "mystyle-cloud-mail"; +//小说微服务 +var fiction_url = "mystyle-cloud-fiction"; //验证码 var v_code = gate_way_url + "/" + admin_manager_url + "/verificationCode/generate"; var access_token = localStorage.getItem("access_token"); @@ -126,6 +128,11 @@ var mail_save_url = gate_way_url + "/" + mail_url + "/mail/save"; var mail_edit_url = gate_way_url + "/" + admin_manager_url + "/mail/edit" + access_token_url; //邮件发送 var mail_send_url = gate_way_url + "/" + mail_url + "/mail/sendEmail"; +//--------------------------------------------------------------------------------------------------------------------- +//小说列表 +var fiction_list_url = gate_way_url + "/" + fiction_url + "/fiction/list"; +//小说集合列表 +var fictionCollection_list_url = gate_way_url + "/" + fiction_url + "/fictionCollection/list"; //页面跳转 function postToPage(url, token) { diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_list.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_list.ftl index 0000334..8fbaab6 100644 --- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_list.ftl +++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_list.ftl @@ -3,7 +3,7 @@ 小说集合 - +
@@ -64,8 +64,9 @@ {{layui.util.toDateString(d.addTime, 'yyyy-MM-dd HH:mm:ss')}} - - + + +